fix some stuff that was very broken

vivlim · Mar 17, 2024 · 9e9193e · 9e9193e
1 parent f0306c1
commit 9e9193e
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 20 deletions.
diff --git a/flake.nix b/flake.nix
@@ -121,7 +121,7 @@
             inherit system;
             bonusShellAliases = {
               nixrb = nixHomeManagerRebuildCommand {
-                configName = "vivlim@generic-nixos";
+                configName = "vivlim@icebreaker-prime";
                 repoPath = "/home/vivlim/git/nix-home";
               };
             };
@@ -140,8 +140,9 @@
             ./modules/editors_helix.nix
             ./modules/dev.nix
             ./modules/dev_nix.nix
-            inputs.sops-nix.homeManagerModules.sops
+            ./modules/atuin.nix
             ./modules/sops.nix
+            inputs.sops-nix.homeManagerModules.sops
             overlayModule
           ];
         };
@@ -282,6 +283,9 @@
             ./modules/editors_helix.nix
             ./modules/dev.nix
             ./modules/dev_nix.nix
+            ./modules/atuin.nix
+            ./modules/sops.nix
+            inputs.sops-nix.homeManagerModules.sops
             overlayModule
           ];
         };

diff --git a/modules/atuin.nix b/modules/atuin.nix
@@ -8,7 +8,7 @@
       keymap_mode = "vim-insert"; # esc switches to 'normal' mode
       style = "auto";
       inline_height = 40;
-      key_path = config.sops.secrets.atuin_key.path;
+      key_path = "$XDG_RUNTIME_DIR/secrets/atuin_key"; #config.sops.secrets.atuin_key.path;
     };
   };
 

diff --git a/modules/shell_common.nix b/modules/shell_common.nix
@@ -42,16 +42,6 @@
     enableBashIntegration = true;
     enableZshIntegration = true;
   };
-  programs.atuin = {
-    enable = true;
-    settings = {
-      update_check = false;
-      prefers_reduced_motion = true;
-      keymap_mode = "vim-insert"; # esc switches to 'normal' mode
-      style = "auto";
-      inline_height = 40;
-    };
-  };
   home.file.".nix_hm/bashrc" = {
     text = ''
       if [ x"''${STARSHIP_SUPPRESS}" == "x" ]; then

diff --git a/modules/sops.nix b/modules/sops.nix
@@ -1,7 +1,7 @@
 { config, pkgs, lib, system, bonusShellAliases ? {}, ... }: {
   sops = {
     age.sshKeyPaths = [ "/home/vivlim/.ssh/id_ed25519_sops" ];
-    defaultSopsFile = ../secrets.yaml;
+    defaultSopsFile = ../secrets/secrets.yaml;
     secrets.test = {
       # sopsFile = ./secrets.yml.enc; # optionally define per-secret files
 

diff --git a/secrets/atuin.yaml b/secrets/atuin.yaml
@@ -1,4 +1,4 @@
-atuin_key: ENC[AES256_GCM,data:X3me0K5elwT8wh3ny8tyuK3nR98Eoa6ZRKjAXJcTIsho+axwSJvpbxZ1C/stKevwyLqlMqptGQGvOChM9BqeMdXqIzE2pd0edlZgj6JWKmSZKqApZ9ZKcucbI+c3cGilQnR+uoBdrzls5kloMR2gK8aW0PdPyoVFGUN8Id1iviavW+qdUN+/9CDloPwr4N2wYBcPpRyBAwE=,iv:zfiOUuu4Fm11dA1KPcbaacytz/4r7Zb9LT+6ern5j8Q=,tag:7KAfwIhJPeWCYHcVl1jmTA==,type:str]
+atuin_key: ENC[AES256_GCM,data:OFzg9rYypINuYY1b3N52a58FTH0hjNFvsJ3wY9R//JOvD+GDP3suvAEe/lXsHdSA,iv:cQWdxQLJ3oBU+rp4oY90EfGfsNPTpRh++CwzJh5ZYbs=,tag:9Aw1OZ0Wrmr9OOJ/tcO6TA==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -14,8 +14,8 @@ sops:
             dTl5Q1hucFd6Y3BiLy9uNjJPZndJeDgKCtKDk28M61UEVG43uM0MxjvUjeAiWKEM
             ieJnccYaS1I8+tt1PT02hvSgwAF4ZDgeBVOv6zOw5IewoB7HdDfIaQ==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-03-17T05:18:04Z"
-    mac: ENC[AES256_GCM,data:EFT+y/pR8cGdciSa4wOzn54VW1SaIE3YnOukTfuo22+hQJsH6dZrOH3OLFkECpmHi2EG5kkH6dy+gAhrPdrp/PVauFGHsdSdR9Sp2jUqAsptD1Ln+Z/l0jdadFFbVX2BFRFK/tBNIiHSzChWXuKWKuiXGyLd9GECztYtgfSx7UE=,iv:Dulwh5no8Fo0nJgG/YPuNAxSTMneA7oljra3Jt2vUGg=,tag:kZVhZwAcw2MBRBZAQVaIGg==,type:str]
+    lastmodified: "2024-03-17T05:47:57Z"
+    mac: ENC[AES256_GCM,data:+EIospOgt3bkqv4+Emu2lEwDkUYDunz6ar+zRGJ31NQbS6qNlN9/KxGAmQSjl/0jJfPU9FR/IeuNzMCPo67C/wgBDGrvQRp9JTcmElJhRH01xmKxX64pMzxMuAf7z9UjMBBH6vgqhYtu+uvKQ043zhh+vQu7Xu7EN1rGNAOEXUk=,iv:Sg1zCVHBxRpE5Q8pfY6GkeDS+kZKp1Sebp132H2aT5o=,tag:iBJPvhi2f4PzanqiNL9a0g==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1
diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml
@@ -1,4 +1,4 @@
-hi: ENC[AES256_GCM,data:Ov4dYbl5f2hhDvBJ24FdmdteUtOc+w==,iv:oJ5dxJ2rx9aLuazrnf0INC+Z0uCx/hLuGF9MOljLyXU=,tag:UKa3JICsGTmsIULmen0QcQ==,type:str]
+test: ENC[AES256_GCM,data:VmClXZO6CB+GTYyrBQA506KajwpJGw==,iv:nrWbepXhAhSkotTjjtrUZuhUMsEOdSmmCxjtSdtMO7Y=,tag:eynjcdkDLbdYqTpP3t7rbw==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -14,8 +14,8 @@ sops:
             Y3hlQ1Y0d09xNEpHbE1EVVlZdkJoU00Knu0KyNB9bwsRG/1dtAwAdl7OTH6JyFPB
             6cXYlmnYUmFmO7SIQJGf9HvpBHiznZYPXI372vs+7/bfDsCPItoqKg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-03-17T05:27:42Z"
-    mac: ENC[AES256_GCM,data:4X9dOgJyM7b56ZoLDDLum4tBtJ0Ucnwd9oP4gkkOAVm2V9eHdMCJS2Vr7ub6F7MS/oEMq2URuDffIZtxPGD6gv0ep88+r76duU0lghC1S5VHQe3Udi8lrzAh31BeNd+QVYTMkwD+k2QqiHogpdgJ2a2WXtSKNlBvuw1c4ICw2Ns=,iv:gsbn1Hun5s0I2Mfkmz9TB8MmoIHAmUgaa9fMb0BebmE=,tag:ZlTy32rr30Qa6NOXLE0msw==,type:str]
+    lastmodified: "2024-03-17T05:36:17Z"
+    mac: ENC[AES256_GCM,data:hXa5wJokU5GqwuhFSBdYIC4T6DaBaobHUVCxHpQXdo1EZLVlQch0QCQf1sM31utZpEVP8BUIk8UQRgxrshGRdsC853BcQSGThvAJ61kz5KcPYGLKYE11BN9wvqERpdS1FbuE0CqTWbi8zM5tQEhvqK/N1wSQ8lJYeBw0cLqE1b8=,iv:fEUQIGQMhJrEnQwzlsuYyfbPHe3HSXCSs4USYwItyPI=,tag:ge54R9sJXo1iDieVkpFSkw==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1