merge

hosts/home/home_common.nix

@@ -17,24 +17,40 @@
     };
     tmux.enable = true;
     starship.enable = true;
-    zsh = {
+    nushell = {
       enable = true;
-      autosuggestion.enable = true;
-      enableCompletion = true;
-      syntaxHighlighting.enable = true;
-      autocd = true;
-      plugins = [
-        {
-          name = "zsh-nix-shell";
-          file = "nix-shell.plugin.zsh";
-          src = pkgs.fetchFromGitHub {
-            owner = "chisui";
-            repo = "zsh-nix-shell";
-            rev = "v0.8.0";
-            sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7";
-          };
-        }
-      ];
+      shellAliases = {
+        cat = "bat";
+      };
+      extraConfig = ''
+       $env.config = {
+        show_banner: false,
+       } 
+       '';
     };
+    carapace = {
+      enable = true;
+      enableNushellIntegration = true;
+    };
+    bat.enable = true;
+    # zsh = {
+    #   enable = true;
+    #   autosuggestion.enable = true;
+    #   enableCompletion = true;
+    #   syntaxHighlighting.enable = true;
+    #   autocd = true;
+    #   plugins = [
+    #     {
+    #       name = "zsh-nix-shell";
+    #       file = "nix-shell.plugin.zsh";
+    #       src = pkgs.fetchFromGitHub {
+    #         owner = "chisui";
+    #         repo = "zsh-nix-shell";
+    #         rev = "v0.8.0";
+    #         sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7";
+    #       };
+    #     }
+    #   ];
+    # };
   };
 }

hosts/home/hyprland.nix

@@ -6,16 +6,41 @@
 }: {
   imports = [./waybar.nix ./tile.nix];
   home.packages = with pkgs; [
-    hyprlock
-    hyprpaper
     iio-hyprland
-    batsignal
     jq #iio-hyprland needs this
   ];
 
+  programs = {
+    hyprlock.enable = true;
+  };
+
   services = {
-    hypridle.enable=true;
-    hyprpaper.enable=true;
+    hyprpaper.enable = true;
+    batsignal.enable = true;
+    hypridle = {
+      enable = true;
+      package = pkgs.hypridle;
+
+      settings = {
+        general = {
+          after_sleep_cmd = "hyprctl dispatch dpms on";
+          ignore_dbus_inhibit = false;
+          lock_cmd = "hyprlock";
+        };
+
+        listener = [
+          {
+            timeout = 900;
+            on-timeout = "hyprlock";
+          }
+          {
+            timeout = 1200;
+            on-timeout = "hyprctl dispatch dpms off";
+            on-resume = "hyprctl dispatch dpms on";
+          }
+        ];
+      };
+    };
   };
 
   wayland.windowManager.hyprland = {

hosts/home/tile.nix

@@ -4,12 +4,25 @@
   inputs,
   ...
 }: {
-  services = {mako = {enable = true;};};
+  services = {
+    mako = {
+      enable = true;
+      defaultTimeout = 4000;
+    };
+  };
   programs = {
     alacritty = {enable = true;};
     wofi = {enable = true;};
     zathura = {enable = true;};
     mpv = {enable = true;};
+    lf = {enable = true;};
   };
+  home.packages = with pkgs; [
+    brightnessctl
+    pulsemixer
+    unzip
+    zip
+    swayimg
+  ];
   stylix.targets.wofi.enable = true; #this dosnt follow auto enable for some reson
 }

hosts/laptop/configuration.nix

@@ -152,8 +152,8 @@
     isNormalUser = true;
     description = "k";
     extraGroups = ["networkmanager" "wheel"];
-    packages = with pkgs; [zsh];
-    shell = pkgs.zsh;
+    packages = with pkgs; [nushell];
+    shell = pkgs.nushell;
   };
 
   home-manager = {

hosts/server/configuration.nix

@@ -20,7 +20,7 @@
 
   nixpkgs.config = {
     allowUnfree = true;
-    vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
+    vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;};
   };
 
   programs = {