Add separate settings for user and host in Hyprland

flake.nix

@@ -2,8 +2,6 @@
   description = "My system configuration";
 
   nixConfig = {
-    allowUnfree = true;
-
     extra-substituters = [
       "https://nix-community.cachix.org"
       # "https://cache.garnix.io"
@@ -44,24 +42,79 @@
 
   outputs = { self, nixpkgs, nixpkgs-stable, nixpkgs-fixed, home-manager, ... }@inputs: let
     system = "x86_64-linux";
-    config = { allowUnfree = true; };
-    mkHost = hostname: nixpkgs-stable.lib.nixosSystem {
-      specialArgs = {
-        inherit
-          inputs
-          system
-        ;
-        pkgs-unstable = import nixpkgs { inherit system config; };
-        pkgs-fixed = import nixpkgs-fixed { inherit system config; };
-      };
-      modules = [ ./host/${hostname}/configuration.nix ];
-    };
   in {
     nixosConfigurations = {
-      Rias = mkHost "Rias";
-      Senko = mkHost "Senko";
-      Eclipse = mkHost "Eclipse";
-      Impreza = mkHost "Impreza";
+      Rias = nixpkgs-stable.lib.nixosSystem {
+        specialArgs = {
+          pkgs-unstable = import nixpkgs {
+            inherit system;
+            config.allowUnfree = true;
+          };
+          pkgs-fixed = import nixpkgs-fixed {
+            inherit system;
+            config.allowUnfree = true;
+          };
+          inherit inputs system;
+        };
+        modules = [ ./host/Rias/configuration.nix ];
+      };
+
+      Senko = nixpkgs-stable.lib.nixosSystem {
+        specialArgs = {
+          pkgs-unstable = import nixpkgs {
+            inherit system;
+            config.allowUnfree = true;
+          };
+          pkgs-fixed = import nixpkgs-fixed {
+            inherit system;
+            config.allowUnfree = true;
+          };
+          inherit inputs system;
+        };
+        modules = [ ./host/Senko/configuration.nix ];
+      };
+
+      Eclipse = nixpkgs-stable.lib.nixosSystem {
+        specialArgs = {
+          pkgs-unstable = import nixpkgs {
+            inherit system;
+            config.allowUnfree = true;
+          };
+          pkgs-fixed = import nixpkgs-fixed {
+            inherit system;
+            config.allowUnfree = true;
+          };
+          inherit inputs system;
+        };
+        modules = [ ./host/Eclipse/configuration.nix ];
+      };
+
+      Impreza = nixpkgs-stable.lib.nixosSystem {
+        specialArgs = {
+          pkgs-unstable = import nixpkgs {
+            inherit system;
+            config.allowUnfree = true;
+          };
+          pkgs-fixed = import nixpkgs-fixed {
+            inherit system;
+            config.allowUnfree = true;
+          };
+          inherit inputs system;
+        };
+        modules = [ ./host/Impreza/configuration.nix ];
+      };
+    };
+
+    devShells."${system}".default = let
+      pkgs = import nixpkgs { inherit system; };
+    in pkgs.mkShell {
+      shellHook = "zsh";
+      packages = with pkgs; [
+        cargo
+        rustc
+        rust-analyzer
+        lldb
+      ];
     };
   };
 }

host/Eclipse/modules/hyprland.nix

@@ -1,15 +0,0 @@
-{
-  wayland.windowManager.hyprland = {
-    settings = {
-      monitor = [
-        "DP-3    , 1920x1080@165, 0x0    , 1"
-        "HDMI-A-1, preferred    , -1080x0, 1, transform, 1"
-      ];
-
-      workspace = [
-        "1,  monitor:DP-3,     default:true"
-        "10, monitor:HDMI-A-1, default:true"
-      ];
-    };
-  };
-}

host/Senko/modules/hyprland.nix

@@ -1,4 +1,4 @@
-{
+{ pkgs, lib, ...}: {
   wayland.windowManager.hyprland = {
     settings = {
       monitor = [

modules/user/zsh.nix

@@ -51,12 +51,23 @@
       autosuggestion.enable = true;
       syntaxHighlighting.enable = true;
 
-      shellAliases = let
+      shellAliases =
+        let
           flakeDir = "~/nix";
         in {
         rb = "nh os switch ${flakeDir}";
         upd = "nix flake update --flake ${flakeDir}";
+        upg = "sudo nixos-rebuild switch --upgrade --flake ${flakeDir}";
 
+        hms = "nh home switch ${flakeDir}";
+        rhms = ''${pkgs.bash} $(home-manager generations | fzf | awk -F '-> ' '{print $2 "/activate"}')'';  #https://github.com/nix-community/home-manager/issues/1114#issuecomment-2067785129
+
+        conf = "$EDITOR ${flakeDir}/nixos/hosts/$(hostname)/configuration.nix";
+        pkgs = "$EDITOR ${flakeDir}/nixos/packages.nix";
+
+        ll = "ls -l";
+        se = "sudoedit";
+        ff = "fastfetch";
         cat = "${pkgs.lib.getExe pkgs.bat}";
         cd = "z";
         lg = "lazygit";
@@ -73,12 +84,8 @@
         TERM=xterm-256color
       '';
 
-      history = {
-        size = 10000;
-        path = "${config.xdg.dataHome}/zsh/history";
-        expireDuplicatesFirst = true;
-        ignoreDups = true;
-      };
+      history.size = 10000;
+      history.path = "${config.xdg.dataHome}/zsh/history";
 
       oh-my-zsh.enable = true;
     };