pined doom emacs so nix lsp doesnt break

config/base.nix

@@ -78,6 +78,7 @@
     ];
   };
   nix = {
+    nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
     distributedBuilds = true;
     optimise.automatic = true;
     settings = {

config/home-manager.nix

@@ -46,8 +46,13 @@ in
     };
     git = {
       enable = true;
+      delta.enable = true;
       userName = "Danilo Reyes";
       userEmail = "CaptainJawZ@protonmail.com";
+      extraConfig = {
+        init.defaultBranch = "main";
+        pull.rebase = true;
+      };
     };
     bash = lib.mkIf (shellType == "bash") {
       enable = true;

config/overlay.nix

@@ -38,5 +38,11 @@ _final: prev: {
   waybar = prev.waybar.overrideAttrs (old: {
     mesonFlags = old.mesonFlags ++ [ "-Dexperimental=true" ];
   });
-  inherit (pkgsU) symbola mealie flaresolver;
+  inherit (pkgsU)
+    symbola
+    mealie
+    flaresolver
+    nixd
+    nix-statix
+    ;
 }

environments/gnome.nix

@@ -4,6 +4,7 @@
   ...
 }:
 {
+  qt.enable = true;
   services = {
     gvfs.enable = true;
     libinput.enable = true;
@@ -32,7 +33,6 @@
       totem
       ;
   };
-  qt.enable = true;
   users.users.jawz.packages = builtins.attrValues {
     inherit (pkgs.gnomeExtensions)
       tactile # window manager

environments/hyprland.nix

@@ -1,13 +1,36 @@
 {
   pkgs,
+  config,
   ...
 }:
 let
-  startupScript = pkgs.pkgs.writeShellScriptBin "start" ''
+  # misc
-    ${pkgs.waybar}/bin/waybar &
+  mod = "SUPER";
-    ${pkgs.swww}/bin/swww init &
+  # waybar
-    sleep 1
+  inherit (config.lib.stylix) colors;
-  '';
+  net-icons = [
+    "󰣾"
+    "󰣴"
+    "󰣶"
+    "󰣸"
+    "󰣺"
+  ];
+  generic-percent-icons = [
+    "▁"
+    "▂"
+    "▃"
+    "▄"
+    "▅"
+    "▆"
+    "▇"
+    "█"
+  ];
+  temp-icons = [
+    ""
+    ""
+    ""
+    ""
+  ];
 in
 {
   programs.hyprland.enable = true;
@@ -22,35 +45,144 @@ in
     enable = true;
     extraPortals = [
       pkgs.xdg-desktop-portal-hyprland
-      # pkgs.xdg-desktop-portal-gtk
     ];
   };
   users.users.jawz.packages = builtins.attrValues {
     inherit (pkgs)
       # Wayland utilities
-      wl-clipboard
+      wl-clipboard-rs
       wf-recorder
-      grim
+      grimblast # screenshots
-      slurp
 
-      wofi # Application launcher
+      mako # notification daemon
-      mako # Notification daemon
       libnotify # dependency of mako
-      swaylock-effects # Screen locker
+      swaylock-effects # screen locker
-      # nautilus # File manager
+      yazi # file manager
+      imv # images
       ;
   };
   home-manager.users.jawz = {
-    programs.kitty.enable = true;
+    programs = {
+      wofi = {
+        enable = true;
+        settings = {
+          allow_images = true;
+          allow_markup = true;
+          insensitive = true;
+          width = "30%";
+        };
+      };
+      waybar = {
+        enable = true;
+        systemd.enable = true;
+        settings.main-bar = {
+          layer = "top";
+          tray.spacing = 5;
+          clock.format = "{:%H:%M %F}";
+          modules-left = [
+            "niri/workspaces"
+            "custom/sep"
+            "niri/window"
+          ];
+          modules-center = [
+            "mpris"
+          ];
+          modules-right = [
+            "cpu"
+            "temperature"
+            "memory"
+            "backlight"
+            "pulseaudio"
+            "battery"
+            "custom/recorder"
+            "clock"
+            "tray"
+          ];
+          "hyprland/window".icon = true;
+          "niri/window".icon = true;
+          "niri/workspaces" = {
+            format = "{icon}";
+            format-icons = {
+              active = "";
+              default = "";
+            };
+          };
+          cava = {
+            format-icons = generic-percent-icons;
+            bars = 14;
+            method = "pulse";
+            framerate = 20;
+            bar_delimiter = 0;
+            stereo = false;
+          };
+          network = {
+            format = "{icon}  {ipaddr}";
+            format-icons = net-icons;
+          };
+          # pulseaudio = {
+          #   format = "{icon}  {volume}%";
+          #   format-muted = "vol: muted";
+          #   format-icons.default = audio-icons;
+          #   on-click = "pavucontrol";
+          #   scroll-step = 1;
+          # };
+          cpu = {
+            interval = 1;
+            format = " {icon}";
+            format-icons = generic-percent-icons;
+            tooltip-format = "usage: {usage}%\nload: {load}";
+          };
+          memory = {
+            interval = 1;
+            format = "  {icon}";
+            format-icons = generic-percent-icons;
+            tooltip-format = "{used} GiB / {total} GiB \n{percentage}%";
+          };
+          temperature = {
+            interval = 1;
+            critical-threshold = 80;
+            format = "{temperatureC}°C";
+            format-icons = temp-icons;
+          };
+          mpris = {
+            format = "{status_icon} {dynamic}";
+            dynamic-len = 60;
+            interval = 5;
+            status-icons = {
+              paused = "";
+              playing = "";
+            };
+          };
+        };
+        style = ''
+          * {
+            border: none;
+            font-family: "${config.stylix.fonts.monospace.name}";
+            font-size: ${toString config.stylix.fonts.sizes.desktop}pt;
+            color: #${colors.base04};
+          }
+          window#waybar {
+            background: #${colors.base00};
+          }
+          .module {
+            background: #${colors.base00};
+            margin: 0px 5px 0px 5px;
+            padding: 0px 0px 0px 5px;
+          }
+          #workspaces button {
+            padding: 0px;
+            border-bottom: 0px none transparent;
+          }
+        '';
+      };
+    };
     wayland.windowManager.hyprland = {
       enable = true;
       settings = {
-        "$mainMod" = "SUPER";
-        exec-once = "${startupScript}/bin/start";
         general = {
           gaps_in = 5;
           gaps_out = 10;
-          border_size = 2;
+          border_size = 3;
           layout = "dwindle";
         };
         dwindle = {
@@ -59,49 +191,78 @@ in
           force_split = 2;
         };
         bind = [
-          "$mainMod, return, exec, kitty"
+          "${mod}, return, exec, ghostty"
-          "$mainMod, Q, killactive,"
+          "${mod}, Q, killactive,"
-          "$mainMod SHIFT, F, togglefloating,"
+          "${mod} SHIFT, F, togglefloating,"
-          "$mainMod, F, fullscreen,"
+          "${mod}, F, fullscreen,"
-          "$mainMod, T, pin,"
+          "${mod}, T, pin,"
-          "$mainMod, G, togglegroup,"
+          "${mod}, G, togglegroup,"
-          "$mainMod, bracketleft, changegroupactive, b"
+          "${mod}, bracketleft, changegroupactive, b"
-          "$mainMod, bracketright, changegroupactive, f"
+          "${mod}, bracketright, changegroupactive, f"
-          "$mainMod, S, exec, wofi --show drun icons"
+          "${mod}, S, exec, wofi --show drun icons"
-          "$mainMod, P, pin, active"
+          "${mod}, P, pin, active"
+
+          "${mod}, left, movefocus, l"
+          "${mod}, right, movefocus, r"
+          "${mod}, up, movefocus, u"
+          "${mod}, down, movefocus, d"
+
+          "${mod}, h, movefocus, l"
+          "${mod}, l, movefocus, r"
+          "${mod}, k, movefocus, u"
+          "${mod}, j, movefocus, d"
+
+          "${mod} SHIFT, left, movewindow, l"
+          "${mod} SHIFT, right, movewindow, r"
+          "${mod} SHIFT, up, movewindow, u"
+          "${mod} SHIFT, down, movewindow, d"
+
+          "${mod} SHIFT, h, movewindow, l"
+          "${mod} SHIFT, l, movewindow, r"
+          "${mod} SHIFT, k, movewindow, u"
+          "${mod} SHIFT, j, movewindow, d"
+
+          "${mod}, 1, workspace, 1"
+          "${mod}, 2, workspace, 2"
+          "${mod}, 3, workspace, 3"
+          "${mod}, 4, workspace, 4"
+          "${mod}, 5, workspace, 5"
+          "${mod}, 6, workspace, 6"
+          "${mod}, 7, workspace, 7"
+          "${mod}, 8, workspace, 8"
+          "${mod}, 9, workspace, 9"
+          "${mod}, 0, workspace, 10"
+          "${mod} SHIFT, 1, movetoworkspace, 1"
+          "${mod} SHIFT, 2, movetoworkspace, 2"
+          "${mod} SHIFT, 3, movetoworkspace, 3"
+          "${mod} SHIFT, 4, movetoworkspace, 4"
+          "${mod} SHIFT, 5, movetoworkspace, 5"
+          "${mod} SHIFT, 6, movetoworkspace, 6"
+          "${mod} SHIFT, 7, movetoworkspace, 7"
+          "${mod} SHIFT, 8, movetoworkspace, 8"
+          "${mod} SHIFT, 9, movetoworkspace, 9"
+          "${mod} SHIFT, 0, movetoworkspace, 10"
+
+          "${mod}, F3, exec, grimblast save area ~/Pictures/screenshots/$(date +'%Y-%m-%d_%H-%M-%S').png"
+          "${mod} SHIFT, F3, exec, grimblast save screen ~/Pictures/screenshots/$(date +'%Y-%m-%d_%H-%M-%S').png"
+        ];
+        binde = [
+          "${mod} SHIFT, h, moveactive, -20 0"
+          "${mod} SHIFT, l, moveactive, 20 0"
+          "${mod} SHIFT, k, moveactive, 0 -20"
+          "${mod} SHIFT, j, moveactive, 0 20"
+
+          "${mod} CTRL, l, resizeactive, 30 0"
+          "${mod} CTRL, h, resizeactive, -30 0"
+          "${mod} CTRL, k, resizeactive, 0 -10"
+          "${mod} CTRL, j, resizeactive, 0 10"
 
           ",XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%+"
           ",XF86AudioLowerVolume, exec, wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%-"
-
-          "$mainMod, left, movefocus, l"
-          "$mainMod, right, movefocus, r"
-          "$mainMod, up, movefocus, u"
-          "$mainMod, down, movefocus, d"
-
-          "$mainMod, h, movefocus, l"
-          "$mainMod, l, movefocus, r"
-          "$mainMod, k, movefocus, u"
-          "$mainMod, j, movefocus, d"
-
-          "$mainMod SHIFT, h, movewindow, l"
-          "$mainMod SHIFT, l, movewindow, r"
-          "$mainMod SHIFT, k, movewindow, u"
-          "$mainMod SHIFT, j, movewindow, d"
-        ];
-        binde = [
-          "$mainMod SHIFT, h, moveactive, -20 0"
-          "$mainMod SHIFT, l, moveactive, 20 0"
-          "$mainMod SHIFT, k, moveactive, 0 -20"
-          "$mainMod SHIFT, j, moveactive, 0 20"
-
-          "$mainMod CTRL, l, resizeactive, 30 0"
-          "$mainMod CTRL, h, resizeactive, -30 0"
-          "$mainMod CTRL, k, resizeactive, 0 -10"
-          "$mainMod CTRL, j, resizeactive, 0 10"
         ];
         bindm = [
-          "$mainMod, mouse:272, movewindow"
+          "${mod}, mouse:272, movewindow"
-          "$mainMod, mouse:273, resizewindow"
+          "${mod}, mouse:273, resizewindow"
         ];
       };
     };

flake.lock

@@ -125,27 +125,28 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1759221805,
+        "lastModified": 1757147654,
-        "narHash": "sha256-gKne7A7DWffiqdfUPdX4TK1/a4FU942LM7e6E8ORsTY=",
+        "narHash": "sha256-mGoonbnnd38MZS/H80/vbXCHCxl6KlFup/XKK+zcAuY=",
         "owner": "marienz",
         "repo": "nix-doom-emacs-unstraightened",
-        "rev": "5697968fa38469d12012706d9322211de10309c9",
+        "rev": "ad01165af00765af07989b6ad14115960ac675f8",
         "type": "github"
       },
       "original": {
         "owner": "marienz",
         "repo": "nix-doom-emacs-unstraightened",
+        "rev": "ad01165af00765af07989b6ad14115960ac675f8",
         "type": "github"
       }
     },
     "doomemacs": {
       "flake": false,
       "locked": {
-        "lastModified": 1759180402,
+        "lastModified": 1757106921,
-        "narHash": "sha256-Y67ooUjDMWjPk+/IjMRnhe+OPn19Q0wF73prtExwyiI=",
+        "narHash": "sha256-vHwgENjip2+AFzs4oZfnKEAJKwf5Zid7fakImvxxQUw=",
         "owner": "doomemacs",
         "repo": "doomemacs",
-        "rev": "5e7e93beb9f2b5a81768aaf4950203ceea21c4f6",
+        "rev": "8f55404781edacf66fa330205533b002de3fb5ee",
         "type": "github"
       },
       "original": {
@@ -164,11 +165,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759221279,
+        "lastModified": 1757124175,
-        "narHash": "sha256-7EAByrl70kQ2gV0opDiNhySsk9KcJiRpnnL+BEaNOhc=",
+        "narHash": "sha256-drA0+kWXGrTgvhlsCiEE7VJ+vFsPi74p32n/7L5L5aU=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "6bbda1ce5dc002b22c95323b01d40518e843a00d",
+        "rev": "802b82be7856f6350d5e9ccb536fb4e20cb82069",
         "type": "github"
       },
       "original": {

flake.nix

@@ -6,7 +6,7 @@
     nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable";
     ucodenix.url = "github:e-tho/ucodenix";
     doom-emacs = {
-      url = "github:marienz/nix-doom-emacs-unstraightened";
+      url = "github:marienz/nix-doom-emacs-unstraightened/ad01165af00765af07989b6ad14115960ac675f8";
       inputs.nixpkgs.follows = "";
     };
     jawz-scripts = {

hosts/workstation/configuration.nix

@@ -21,6 +21,7 @@ in
     ./hardware-configuration.nix
     ../../config/base.nix
     ../../config/stylix.nix
+    ../../environments/gnome.nix
   ];
   my = import ./toggles.nix // {
     nix.cores = 8;
@@ -47,16 +48,6 @@ in
       };
     };
   };
-  specialisation = {
-    gnome.configuration = {
-      imports = [ ../../environments/gnome.nix ];
-      services.flatpak.enable = true;
-    };
-    hyprland.configuration = {
-      imports = [ ../../environments/hyprland.nix ];
-      services.flatpak.enable = true;
-    };
-  };
   networking = {
     hostName = "workstation";
     firewall =
@@ -164,7 +155,7 @@ in
     };
     sunshine = {
       enable = true;
-      autoStart = true;
+      autoStart = false;
       capSysAdmin = true;
       openFirewall = true;
     };

hosts/workstation/hardware-configuration.nix

@@ -34,7 +34,7 @@ in
   boot = {
     plymouth.enable = true;
     consoleLogLevel = 0;
-    loader.timeout = 5;
+    loader.timeout = 3;
     kernelParams = [
       "splash"
       "boot.shell_on_fail"

modules/dev/nix.nix

@@ -9,8 +9,10 @@ let
   packages = builtins.attrValues {
     inherit (pkgs)
       nixfmt-rfc-style # formatting
+      nixfmt-tree # formatting
       cachix # binary cache management
       nixd # language server for Nix
+      deadnix # detext unused/uneeded dependencies
       statix # linter for Nix expressions
       ;
   };
@@ -34,9 +36,9 @@ in
     users.users.jawz = { inherit packages; };
     home-manager.users.jawz.programs.${shellType}.shellAliases = {
       nixformat = ''
-        nix run unstable#deadnix -- -e && \
+        deadnix -- -e && \
-        nix run unstable#nixfmt-tree && \
+        nixfmt-tree && \
-        nix run unstable#statix fix
+        statix fix
       '';
     };
   };

modules/shell/tools.nix

@@ -17,11 +17,45 @@ in
         enable = true;
         package = pkgs.htop-vim;
       };
+      eza = {
+        enable = true;
+        git = true;
+        icons = "auto";
+      };
       zoxide = {
         enable = true;
         enableBashIntegration = shellType == "bash";
         enableZshIntegration = shellType == "zsh";
       };
+      bat = {
+        enable = true;
+        config.pager = "less -FR";
+        extraPackages = builtins.attrValues {
+          inherit (pkgs.bat-extras)
+            batman # man pages
+            batpipe # piping
+            batgrep # ripgrep
+            batdiff # this is getting crazy!
+            batwatch # probably my next best friend
+            prettybat # trans your sourcecode!
+            ;
+        };
+      };
+      password-store = {
+        enable = false;
+        package = pkgs.gopass;
+        settings = {
+          PASSWORD_STORE_AUTOCLIP = "true";
+          PASSWORD_STORE_AUTOIMPORT = "false";
+          PASSWORD_STORE_CLIPTIMEOUT = "45";
+          PASSWORD_STORE_EXPORTKEYS = "false";
+          PASSWORD_STORE_NOPAGER = "false";
+          PASSWORD_STORE_NOTIFICATIONS = "false";
+          PASSWORD_STORE_PARSING = "true";
+          PASSWORD_STORE_PATH = "/home/jawz/.local/share/pass";
+          PASSWORD_STORE_SAFECONTENT = "true";
+        };
+      };
       ${shellType} = {
         shellAliases = {
           cd = "z";
@@ -56,35 +90,6 @@ in
             '';
           }
       );
-      bat = {
-        enable = true;
-        config.pager = "less -FR";
-        extraPackages = builtins.attrValues {
-          inherit (pkgs.bat-extras)
-            batman # man pages
-            batpipe # piping
-            batgrep # ripgrep
-            batdiff # this is getting crazy!
-            batwatch # probably my next best friend
-            prettybat # trans your sourcecode!
-            ;
-        };
-      };
-      password-store = {
-        enable = false;
-        package = pkgs.gopass;
-        settings = {
-          PASSWORD_STORE_AUTOCLIP = "true";
-          PASSWORD_STORE_AUTOIMPORT = "false";
-          PASSWORD_STORE_CLIPTIMEOUT = "45";
-          PASSWORD_STORE_EXPORTKEYS = "false";
-          PASSWORD_STORE_NOPAGER = "false";
-          PASSWORD_STORE_NOTIFICATIONS = "false";
-          PASSWORD_STORE_PARSING = "true";
-          PASSWORD_STORE_PATH = "/home/jawz/.local/share/pass";
-          PASSWORD_STORE_SAFECONTENT = "true";
-        };
-      };
     };
     programs = {
       starship.enable = true;
@@ -99,7 +104,6 @@ in
       inherit (pkgs)
         ripgrep # modern grep
         du-dust # rusty du similar to gdu
-        eza # like ls but with colors
         fd # modern find, faster searches
         fzf # fuzzy finder! super cool and useful
         gdu # disk-space utility checker, somewhat useful