feat: cleanup

sioodmy · Nov 3, 2023 · bb7d2aa · bb7d2aa
1 parent eb0f4e3
commit bb7d2aa
Show file tree

Hide file tree

Showing 18 changed files with 40 additions and 24 deletions.
diff --git a/flake.nix b/flake.nix
@@ -186,7 +186,7 @@
       };
     });
 }
-# see also: 
+# see also:
 # - https://github.com/notashelf/nyx
 # - https://github.com/fufexan/dotfiles/
 
diff --git a/home/cli/bottom/default.nix → home/cli/bottom.nix b/home/cli/bottom/default.nix → home/cli/bottom.nix
diff --git a/home/cli/default.nix b/home/cli/default.nix
@@ -1,9 +1,9 @@
 {...}: {
   imports = [
-    ./helix
+    ./helix.nix
+    ./bottom.nix
+    ./git.nix
     ./shell
-    ./git
     ./tools
-    ./bottom
   ];
 }
diff --git a/home/cli/git/default.nix → home/cli/git.nix b/home/cli/git/default.nix → home/cli/git.nix
diff --git a/home/cli/helix/default.nix → home/cli/helix.nix b/home/cli/helix/default.nix → home/cli/helix.nix
diff --git a/home/impermanence.nix b/home/impermanence.nix
@@ -23,7 +23,7 @@ _: {
       ".local/share/Steam"
       ".ssh"
       ".local/share/direnv"
-      ".local/share/containers/"
+      ".local/share/distrobox"
       ".cache/containers"
       ".cache/flutter"
       ".config/syncthing"

diff --git a/home/misc/schizofox.nix b/home/misc/schizofox.nix
@@ -22,16 +22,16 @@
     };
     search = {
       defaultSearchEngine = "Google";
-      removeEngines = [ "Bing" "Amazon.com" "eBay" "Twitter" "Wikipedia"];
-         addEngines = [
-      {
-        Name = "LibreY";
-        Description = "femboy search :3";
-        Alias = "!ly";
-        Method = "GET";
-        URLTemplate = "https://search.ahwx.org/search.php?q={searchTerms}&p=0&t=0";
-      }
-    ];
+      removeEngines = ["Bing" "Amazon.com" "eBay" "Twitter" "Wikipedia"];
+      addEngines = [
+        {
+          Name = "LibreY";
+          Description = "femboy search :3";
+          Alias = "!ly";
+          Method = "GET";
+          URLTemplate = "https://search.ahwx.org/search.php?q={searchTerms}&p=0&t=0";
+        }
+      ];
     };
   };
 }
diff --git a/home/rice/anyrun/default.nix → home/rice/anyrun.nix b/home/rice/anyrun/default.nix → home/rice/anyrun.nix
diff --git a/home/rice/default.nix b/home/rice/default.nix
@@ -1,12 +1,12 @@
 {...}: {
   imports = [
-    ./anyrun
-    ./foot
-    ./gtklock
-    ./spotify
-    ./zathura
-    ./dunst
-    ./gtk
+    ./anyrun.nix
+    ./foot.nix
+    ./gtklock.nix
+    ./spotify.nix
+    ./zathura.nix
+    ./dunst.nix
+    ./gtk.nix
     ./hyprland
     ./waybar
   ];

diff --git a/home/rice/dunst/default.nix → home/rice/dunst.nix b/home/rice/dunst/default.nix → home/rice/dunst.nix
diff --git a/home/rice/foot/default.nix → home/rice/foot.nix b/home/rice/foot/default.nix → home/rice/foot.nix
diff --git a/home/rice/gtk/default.nix → home/rice/gtk.nix b/home/rice/gtk/default.nix → home/rice/gtk.nix
diff --git a/home/rice/gtklock/default.nix → home/rice/gtklock.nix b/home/rice/gtklock/default.nix → home/rice/gtklock.nix
diff --git a/home/rice/spotify/default.nix → home/rice/spotify.nix b/home/rice/spotify/default.nix → home/rice/spotify.nix
diff --git a/home/rice/zathura/default.nix → home/rice/zathura.nix b/home/rice/zathura/default.nix → home/rice/zathura.nix
diff --git a/hosts/anthe/hardware-configuration.nix b/hosts/anthe/hardware-configuration.nix
@@ -7,6 +7,11 @@
 }: {
   imports = [(modulesPath + "/installer/scan/not-detected.nix")];
 
+  fileSystems."/etc/ssh" = {
+    depends = ["/persist"];
+    neededForBoot = true;
+  };
+
   boot.initrd.luks.devices.luksroot = {
     device = "/dev/disk/by-label/NIXCRYPT";
     preLVM = true;

diff --git a/secrets/secrets.nix b/secrets/secrets.nix
@@ -1,7 +1,15 @@
-let
+{config, ...}: let
   sioodmy = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE9ExEl6WqtCI4yCqbSAhAGmzvVp/nYADbgy/Qi4AKQy sioodmy@anthe";
 
   anthe = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC3LBESPBY559NbAJ7KL/+K4S5InhWf5YDQgl2XjT5ZxTtPg0x24IDcEmxrPi+7nKSAvMJCkneTfWHPYoRYrNA/G15a+Pqr/9w1EtuK+D054qtz2q+oUM029JdTP/0qzbKxAV/qzUXyJyrgcGRnRYhFRKmg3Sl7G7mxhYN20RIYL3ENXnpfculGrnqX8yONda7YRQfjyEQAsLUIS4aEN7pQsUGO2lGzvXueHcRGRflbatVD59REWoD5kYE984EVhgbky092HHhDR5rIFnFJygrhl9irYk7x6Un98qsvKBeRKzpNMZ1iqs8EFdSbayNdRimooSyFLx83pUhx7SY01cJXxuVmW8Rec9xgnW8rrclz2H+ArQHSZQz/T/QPH2zZgtE3A2xX5HsmQnCu/h7yOpwD6ULTyR8/xK61jHgx4AM1hLyGGrMoPailSXyvT9OGnmXuvcIrx8R2oHy7e48DGWiTHoW8+nltWURkUjdolg373ruLxT+Rqf1JFgPcFwCEVSjVxtTz33ljFD31OOKjs5O2y/9jndwcx54twlgLr+H/6Y1SWIPNeuhNO3IiGuFkH3+JLrQLXVN9UIE1/qHyOIIJpR3ONd4uW6xDsnl8SBZUWuYf468FQGHkinWZxdYdi1SlHbulXxGPTiRjqSUBeR9fB+CND2WJEvfeSJccofk29w== root@anthe";
 in {
+  age.identityPaths =
+    if config.custom.impermanence.enable
+    then [
+      "/persist/home/sioodmy/.ssh/id_ed25519"
+    ]
+    else [
+      "/home/sioodmy/.ssh/id_ed25519"
+    ];
   "spotify.age".publicKeys = [sioodmy anthe];
 }
diff --git a/system/core/impermanence.nix b/system/core/impermanence.nix
@@ -5,6 +5,10 @@
   ...
 }: {
   imports = [inputs.impermanence.nixosModule];
+  fileSystems."/etc/ssh" = {
+    depends = ["/persist"];
+    neededForBoot = true;
+  };
   environment.persistence."/persist" = {
     hideMounts = true;
     directories = [
@@ -19,7 +23,6 @@
 
       "/etc/NetworkManager/system-connections"
       "/var/lib/flatpak"
-      "/run/agenix"
       "/var/lib/libvirt"
       "/var/lib/bluetooth"
       "/var/lib/nixos"