From 7e3cbdf0cb9913ac18fb2de64cc7f8035c9bb7d5 Mon Sep 17 00:00:00 2001 From: Ethan Simmons Date: Fri, 18 Oct 2024 12:02:58 -0500 Subject: [PATCH] Update alpheratz and add new key --- .sops.yaml | 6 +++-- flake.lock | 24 +++++++++---------- hosts/alpheratz/dotfiles/sway/config | 2 +- hosts/alpheratz/system.nix | 4 ++-- .../dotfiles/nvim/lua/config/settings.lua | 10 ++++++++ modules/home/sway.nix | 10 ++++---- secrets/alpheratz/secrets.yaml | 19 +++++++++++---- 7 files changed, 49 insertions(+), 26 deletions(-) diff --git a/.sops.yaml b/.sops.yaml index bf81976..e2e30fc 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -1,7 +1,8 @@ keys: - &admin_ankaa age1079fszreaakwf6xnwu9kra8xcsp4e8q8ed3y99yrhjnz9n3t9pnsj05m97 - &admin_alpheratz age1gdtjn3jgvvvspa86q3lnklflnvyf3s75y2rw23l7nk7hwcsfpg7qkq7msr - - &server_diphda age1rxqyz6watg05r3rzlme7grpgfgezhlt535gdl7psqys2ec8eegmqchfk4d + - &diphda age1rxqyz6watg05r3rzlme7grpgfgezhlt535gdl7psqys2ec8eegmqchfk4d + - &alpheratz age13ganuxy7r6fe53xaqm7k9pp07adlvk4hm4s2xkmwdwqs8xrdr3xquw0d73 creation_rules: - path_regex: secrets/[^/]+\.yaml$ key_groups: @@ -16,9 +17,10 @@ creation_rules: key_groups: - age: - *admin_alpheratz + - *alpheratz - path_regex: secrets/diphda/[^/]+\.(yaml|keytab)$ key_groups: - age: - *admin_ankaa - *admin_alpheratz - - *server_diphda + - *diphda diff --git a/flake.lock b/flake.lock index fc7ef7f..b20fd62 100644 --- a/flake.lock +++ b/flake.lock @@ -64,11 +64,11 @@ ] }, "locked": { - "lastModified": 1729027341, - "narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=", + "lastModified": 1728726232, + "narHash": "sha256-8ZWr1HpciQsrFjvPMvZl0W+b0dilZOqXPoKa2Ux36bc=", "owner": "nix-community", "repo": "home-manager", - "rev": "2a4fd1cfd8ed5648583dadef86966a8231024221", + "rev": "d57112db877f07387ce7104b5ac346ede556d2d7", "type": "github" }, "original": { @@ -83,11 +83,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1729126018, - "narHash": "sha256-+nZCHEWNV7yBJjYYR4+SZMh+A7Gxy8FrVFWA1C99bWQ=", + "lastModified": 1728789086, + "narHash": "sha256-xynAUQXdsjZaGh/oS4p65zTQhMzs87cAlHyzMYLlG0I=", "owner": "ggerganov", "repo": "llama.cpp", - "rev": "f010b77a372ffcfaf4338c670d6d3ecd89aa4eb6", + "rev": "92be9f12164f18ce845a5bab60cefa5f7fec6836", "type": "github" }, "original": { @@ -126,11 +126,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1728909085, - "narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=", + "lastModified": 1728627514, + "narHash": "sha256-r+SF9AnHrTg+bk6YszoKfV9lgyw+yaFUQe0dOjI0Z2o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8", + "rev": "c505ebf777526041d792a49d5f6dd4095ea391a7", "type": "github" }, "original": { @@ -158,11 +158,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { diff --git a/hosts/alpheratz/dotfiles/sway/config b/hosts/alpheratz/dotfiles/sway/config index f30e096..ee4770b 100644 --- a/hosts/alpheratz/dotfiles/sway/config +++ b/hosts/alpheratz/dotfiles/sway/config @@ -120,7 +120,7 @@ bindsym $mod+Shift+9 move container to workspace number 9 bindsym $mod+Shift+0 move container to workspace number 10 for_window [app_id="simmer505.waywrite"] floating enable -for_window [app_id="org.speedcrunch.speedcrunch"] floating enable +for_window [app_id="org.speedcrunch."] floating enable # Horizontal and vertical splits bindsym $mod+b splith diff --git a/hosts/alpheratz/system.nix b/hosts/alpheratz/system.nix index be5f83a..23a1d57 100644 --- a/hosts/alpheratz/system.nix +++ b/hosts/alpheratz/system.nix @@ -25,7 +25,7 @@ sops = { defaultSopsFile = ../../secrets/alpheratz/secrets.yaml; - age.keyFile = "/home/eesim/.config/sops/age/keys.txt"; + age.sshKeyPaths = [ "/etc/ssh/host_key_ed25519" ]; secrets."wireguard/private" = {}; secrets."wireguard/preshared" = {}; @@ -63,7 +63,7 @@ address = [ "10.0.0.2/32" ]; listenPort = 51820; privateKeyFile = "/run/secrets/wireguard/private"; - dns = [ "192.168.1.1" ]; + dns = [ "10.0.0.1" ]; autostart = false; peers = [ diff --git a/hosts/shared/dotfiles/nvim/lua/config/settings.lua b/hosts/shared/dotfiles/nvim/lua/config/settings.lua index 8efff64..3ed203c 100644 --- a/hosts/shared/dotfiles/nvim/lua/config/settings.lua +++ b/hosts/shared/dotfiles/nvim/lua/config/settings.lua @@ -10,6 +10,16 @@ vim.opt.softtabstop=4 vim.opt.shiftwidth=4 vim.opt.shiftround=true +vim.api.nvim_create_autocmd( + { "FileType" }, + { pattern = "nix", + callback = function() + vim.opt.softtabstop=2 + vim.opt.shiftwidth=2 + end + } +) + vim.opt.backspace={'indent','eol','start'} vim.opt.hidden=true vim.opt.laststatus=2 diff --git a/modules/home/sway.nix b/modules/home/sway.nix index dc32d53..5f14120 100644 --- a/modules/home/sway.nix +++ b/modules/home/sway.nix @@ -69,10 +69,10 @@ in "${modifier}+Down" = "focus down"; "${modifier}+Up" = "focus up"; "${modifier}+Right" = "focus right"; - "${modifier}+Shift+h" = "move left"; - "${modifier}+Shift+j" = "move down"; - "${modifier}+Shift+k" = "move up"; - "${modifier}+Shift+l" = "move right"; + "${modifier}+Shift+h" = "move left 30px"; + "${modifier}+Shift+j" = "move down 30px"; + "${modifier}+Shift+k" = "move up 30px"; + "${modifier}+Shift+l" = "move right 30px"; "${modifier}+Shift+Left" = "move left"; "${modifier}+Shift+Down" = "move down"; "${modifier}+Shift+Up" = "move up"; @@ -110,6 +110,7 @@ in "${modifier}+Shift+c" = "reload"; "${modifier}+Shift+s" = "exec ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" \"/home/eesim/Pictures/$(date +'%s_grim.png')\""; "${modifier}+Shift+q" = "kill"; + "${modifier}+p" = "focus mode_toggle"; "XF86AudioPause" = "exec playerctl play-pause"; "XF86AudioNext" = "exec playerctl next"; "XF86AudioPrev" = "exec playerctl previous"; @@ -212,6 +213,7 @@ in { criteria = { class = "gamescope"; }; command = "fullscreen"; } { criteria = { app_id = "gamescope"; }; command = "fullscreen"; } { criteria = { app_id = "mpv"; }; command = "fullscreen"; } + { criteria = { app_id = "org.speedcrunch."; }; command = "floating enable"; } ]; }; diff --git a/secrets/alpheratz/secrets.yaml b/secrets/alpheratz/secrets.yaml index 202d953..2ee6bae 100644 --- a/secrets/alpheratz/secrets.yaml +++ b/secrets/alpheratz/secrets.yaml @@ -10,11 +10,20 @@ sops: - recipient: age1gdtjn3jgvvvspa86q3lnklflnvyf3s75y2rw23l7nk7hwcsfpg7qkq7msr enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVUzZyL2hHT0ZKUUViMmNP - eXluSTFpOUlPdmVoS2VoTGNKcnhFUzFRbVVzCmU3aDQ0SElqdkxySnNYUzd6TmJy - QnkwSXAyT3BmUktBWVp5eGMyeXg5bXMKLS0tIGh1S1cwUGU3dW9xRS9iQzMxZnRF - ZytUUE9YZDZjcDFvU1lkRk5hYWJscTQKQrNSlwVHQVwN1QKkF7Hh5wbDWWSLfutm - l8YTbx1rHFxakK16+HXcmRleA+qvjlmpflbq+CyZQmIkwARazT7rUQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqSDJwNGhmTDZSemN1OEJw + cEV3SnFTSm5lVGZ1T1FyRGp5M0hEb2VCdFFZCkxEWDZsR2QwUXFKYnlHUEFIYW44 + ajRGQmtsV3k2S0JGNG5scDZYOWpDMFUKLS0tICtub2xTZDdQOGtFYmxFakVpNnJV + Q050UXZRMHEwTW5lNjZZZjMwOWpoZ1EKvuz3NRJWIxp7zUpMBF+Y9IY1X6qYJPuY + Z8WdgV4fPijgGU0a3JmKAdKI+Nm9fmMSJi32Z6r828UIDHdVufG44g== + -----END AGE ENCRYPTED FILE----- + - recipient: age13ganuxy7r6fe53xaqm7k9pp07adlvk4hm4s2xkmwdwqs8xrdr3xquw0d73 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJN0RxOFlaTWZrNkE5d3RW + K0NPYmVvTFhmV1hkL3crdXJ3TnoxTUYzOVNRCjRONGtSVkN1OFF1NXpjNkZwUjdQ + TzhoLzlUcDJKQ0k2d3BUSTBZZzFSWnMKLS0tIDBIUVpkaU1pb0pkM2NORXpZeUtB + bDNmamRIL25SaXlaY0pLTDdGQ1J0eEEK/sOMBBefA4Nlzv/benmTrciT4b8P2cGC + Wlu7zQtQeuomdQJyVfjSqlGbcouO9jfdp5odlvP5thsxJiqV+xOA9g== -----END AGE ENCRYPTED FILE----- lastmodified: "2024-06-24T00:52:56Z" mac: ENC[AES256_GCM,data:4eHx1JEmFa9ugyjsJYYvIJ85EYQOsxThKtFzL9Aiw16NOl58B0CNFAwVSL1KryjjmsRxxDQoAFldkfpxzKuERoUPMsRlFXlNgApXqkaH2aJBH2VCFd7jBTvqALXgWv5Gjh8yTD3qySUAeWN8F44HjGg1cx8Poxp5xOPk5VlzyXA=,iv:LrjjSM8hC8ujfXM9W+rgGLo1muDR+CIo1UfnNJcr2TE=,tag:Oosqkn1XnEpnoNH31ghL5w==,type:str]