refactor, prep

flake.nix

@@ -72,29 +72,34 @@
 
                 till = {
                   imports = [
-                    ./home/desktop-full.nix
+                    ./home/profiles/desktop-full.nix
                     ./users/till/home.nix
                   ];
                 };
 
                 alt = {
                   imports = [
-                    ./home/desktop-slim.nix
+                    ./home/profiles/desktop-slim.nix
                     ./users/alt/home.nix
                   ];
                 };
 
                 guest = {
                   imports = [
-                    ./home/desktop-slim.nix
+                    ./home/profiles/desktop-slim.nix
                     ./users/guest/home.nix
                   ];
                 };
               };
             };
           }
-
           {
+
+            # firefox-addons.config.allowUnfreePredicate = pkg:
+            #   builtins.elem (nixpkgs.lib.getName pkg) [
+            #     "tampermonkey"
+            #   ];
+
             nixpkgs.config.allowUnfreePredicate = pkg:
               builtins.elem (nixpkgs.lib.getName pkg) [
                 "corefonts"
@@ -102,6 +107,7 @@
                 "keymapp"
                 "steam"
                 "steam-unwrapped"
+                # "tampermonkey"
               ];
           }
         ];

home/profiles/desktop-slim.nix

@@ -7,7 +7,7 @@
     ../devel.nix
     ../firefox.nix
     ../fonts.nix
-    ../foot.nix
+    # ../foot.nix
     ../media.nix
     ../user-dirs.nix
     ../gpg.nix

home/profiles/minimal.nix

@@ -25,7 +25,6 @@
     ../vifm.nix
     ../nvim
     ../tmux.nix
-    ../ssh.nix
   ];
 
   programs.nix-index = {

users/guest/system.nix

@@ -7,7 +7,7 @@
     extraGroups = [ "networkmanager" ];
     shell = pkgs.fish;
     openssh.authorizedKeys.keyFiles = [
-      ../till/ssh/till${"@"}nova.pub
+      ../till/pubkeys/till${"@"}nova.pub
     ];
   };
 }

users/till/home.nix

@@ -6,4 +6,9 @@
     name = "Till";
     email = "till@ktiu.net";
   };
+
+  imports = [
+    ./ssh.nix
+  ];
+
 }

users/till/ssh.nix

@@ -41,7 +41,7 @@ in
         identityFile = certs.uni;
       };
 
-      "arielle arielle.ktiu.net" = {
+      "arielle (arielle|git).ktiu.net" = {
         hostname = "arielle.ktiu.net";
         user = "till";
         identityFile = certs.personal;
@@ -65,11 +65,11 @@ in
         identityFile = certs.personal;
       };
 
-      # "mila" = {
+      "mila" = {
-      #   hostname = "mila";
+        hostname = "mila";
-      #   user = "till";
+        user = "tstraube";
-      #   identityFile = certs.personal;
+        identityFile = certs.uni;
-      # };
+      };
 
     };
   };

users/till/system.nix

@@ -10,7 +10,7 @@
     ];
     shell = pkgs.fish;
     openssh.authorizedKeys.keyFiles = [
-      ./ssh/till${"@"}nova.pub
+      ./pubkeys/till${"@"}nova.pub
     ];
   };
 }