more refactor

flake.nix

@@ -42,7 +42,7 @@
               sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ];
               useGlobalPkgs = true;
               useUserPackages = true;
-              users.rachel = import ./home/all.nix {
+              users.rachel = import ./home-manager/all.nix {
                 pkgs = import nixpkgs {
                   system = system;
                   config.allowUnfree = true;
@@ -74,9 +74,9 @@
     nixosConfigurations.lambda = nixpkgs.lib.nixosSystem rec {
       system = "x86_64-linux";
       modules = base-modules ++ [
-        ./lambda/configuration.nix
+        ./nixos/lambda/configuration.nix
-        ./shared/user-system.nix
+        ./nixos/shared/user-system.nix
-        ./shared/graphical.nix
+        ./nixos/shared/graphical.nix
         (rachel-home-module system)
       ];
     };
@@ -84,14 +84,15 @@
     nixosConfigurations.computational = nixpkgs.lib.nixosSystem rec {
       system = "x86_64-linux";
       modules = base-modules ++ [
-        ./computational/configuration.nix
+        ./nixos/computational/configuration.nix
-        ./shared/user-system.nix
+        ./nixos/shared/user-system.nix
-        ./shared/graphical.nix
+        ./nixos/shared/graphical.nix
         (rachel-home-module system)
       ];
     };
 
-    keyboardLayouts.fox = ./shared/fox.xkb;
+    keyboardLayouts.fox = ./resources/fox.xkb;
+    keyboardLayouts.sus = ./resources/fox.xkb;
 
   } // flake-utils.lib.eachDefaultSystem (system:
     let pkgs =  nixpkgs.legacyPackages.${system}; 

nixos/lambda/configuration.nix

@@ -36,7 +36,7 @@
     device = "nodev";
     efiSupport = true;
     enableCryptodisk = true;
-    theme = ../shared/sayonara;
+    theme = ../../resources/grub-theme;
   };
 
   boot.loader.efi.efiSysMountPoint = "/boot/efi";

nixos/shared/user-system.nix

@@ -39,7 +39,7 @@
   };
 
   fileSystems."/mnt/eta" =
-  let secrets = import ../secrets/eta.nix;
+  let secrets = import ../../secrets/eta.nix;
   in {
     device = "//192.168.30.33/users";
     fsType = "cifs";
@@ -53,12 +53,12 @@
       extraLayouts.sus = {
         description = "Swedish US";
         languages = [ "se" ];
-        symbolsFile = ../shared/sus.xkb;
+        symbolsFile = ../../resources/sus.xkb;
       };
       extraLayouts.fox = {
         description = "Layout suitable to be used by a fox";
         languages = [ "se" ];
-        symbolsFile = ../shared/fox.xkb;
+        symbolsFile = ../../resources/fox.xkb;
       };
     };
   };

shared/.gitignore

@@ -1 +0,0 @@
-secrets.nix