test

flake.nix

@@ -48,7 +48,10 @@
         home-manager.nixosModules.home-manager
         {
           home-manager.useGlobalPkgs = true;
-          home-manager.users."tacocat" = ./users/tacocat/home.nix;
+          home-manager.users."tacocat".modules = [
+            ./users/tacocat/home.nix
+            ./users/tacocat/wayland
+          ];
           home-manager.extraSpecialArgs = {inherit inputs;};
         }
       ];
@@ -60,6 +63,7 @@
       extraSpecialArgs = {inherit inputs;}; # Pass flake inputs to our config
       modules = [
         ./users/tacocat/home.nix
+        ./users/tacocat/wayland
       ];
     };
 

users/tacocat/home.nix

@@ -11,7 +11,6 @@
     sessionPath = [
       "$HOME/.local/bin"
       "$HOME/.dotnet"
-      "$HOME/.cargo/bin"
     ];
     shellAliases = {
       # cat = "bat";
@@ -31,12 +30,12 @@
       jdk20
       pdftk
       git
-      git-crypt
-      (writeShellScriptBin "hs-way" ''
-        home-manager --flake $HOME/nix-config/#tacocat build
-        # GEN=$(home-manager generations | head -1 | awk '{print $NF}')
-        "$HOME/nix-config/result/specialisation/wayland/activate"
-      '')
+      # git-crypt
+      # (writeShellScriptBin "hs-way" ''
+      #   home-manager --flake $HOME/nix-config/#tacocat build
+      #   # GEN=$(home-manager generations | head -1 | awk '{print $NF}')
+      #   "$HOME/nix-config/result/specialisation/wayland/activate"
+      # '')
     ];
   };
 
@@ -50,7 +49,6 @@
     ./shell
     ./helix
     ./emacs
-    ./wayland
   ];
 
   # Let Home Manager install and manage itself.

users/tacocat/wayland/default.nix

@@ -1,10 +1,8 @@
 {pkgs, ...}:
 {
-  specialisation.wayland.configuration = {
-    imports = [
-      ./waybar
-    ];
-  };
+  imports = [
+    ./waybar
+  ];
 
   xdg.configFile."river" = {
     source = ./river;