24.11 update

src/system/machines/desktop/hardware.nix

@@ -45,8 +45,6 @@
     };
   };
 
-  services.xserver.videoDrivers = ["nvidia"];
-
   hardware = {
     cpu = {
       intel = {
@@ -54,20 +52,14 @@
       };
     };
     nvidia = {
+      open = true;
       modesetting.enable = true;
       nvidiaSettings = true;
-      package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
-        version = "550.90.07";
-        sha256_64bit = "sha256-Uaz1edWpiE9XOh0/Ui5/r6XnhB4iqc7AtLvq4xsLlzM=";
-        openSha256 = "sha256-mRUTEWVsbjq+psVe+kAT6MjyZuLkG2yRDxCMvDJRL1I=";
-        settingsSha256 = "sha256-sX9dHEp9zH9t3RWp727lLCeJLo8QRAGhVb8iN6eX49g=";
-        persistencedSha256 = "sha256-11tLSY8uUIl4X/roNnxf5yS2PQvHvoNjnd2CB67e870=";
-      };
+      package = config.boot.kernelPackages.nvidiaPackages.stable;
     };
-    opengl = {
+    graphics = {
       enable = true;
-      driSupport = true;
-      driSupport32Bit = true;
+      enable32Bit = true;
     };
   };
 

src/system/machines/desktop/system.nix

@@ -13,7 +13,7 @@
 
   nix = {
     channel.enable = false;
-    package = pkgs.nixFlakes;
+    package = pkgs.nixVersions.stable;
     extraOptions = ''
       experimental-features = nix-command flakes
       keep-going = true

src/system/machines/server/system.nix

@@ -23,7 +23,7 @@
 
   nix = {
     channel.enable = false;
-    package = pkgs.nixFlakes;
+    package = pkgs.nixVersions.stable;
     extraOptions = "experimental-features = nix-command flakes";
     settings = {
       auto-optimise-store = true;

src/system/machines/vm/system.nix

@@ -14,7 +14,7 @@
 
   nix = {
     channel.enable = false;
-    package = pkgs.nixFlakes;
+    package = pkgs.nixVersions.stable;
     extraOptions = "experimental-features = nix-command flakes";
     settings = {
       auto-optimise-store = true;

src/system/machines/workstation/home.nix

@@ -17,7 +17,7 @@
   };
 
   nix = {
-    package = pkgs.nixFlakes;
+    package = pkgs.nixVersions.stable;
     extraOptions = "experimental-features = nix-command flakes";
     settings = {
       auto-optimise-store = true;

src/system/machines/wsl/system.nix

@@ -17,7 +17,7 @@
 
   nix = {
     channel.enable = false;
-    package = pkgs.nixFlakes;
+    package = pkgs.nixVersions.stable;
     extraOptions = ''
       experimental-features = nix-command flakes
     '';

src/user/modules/gui/wm/hyprland/config/waybar/config

@@ -10,7 +10,7 @@
   "custom/logo": {
     "format": "",
     "tooltip": false,
-    "on-click": "alacritty -e neofetch"
+    "on-click": "alacritty --class sys-specs -e bash -c 'fastfetch; read -n 1'"
   },
 
   "hyprland/workspaces": {

src/user/modules/gui/wm/hyprland/default.nix

@@ -28,6 +28,7 @@ in
 
         exec-once = [
           "waybar"
+          "hyprctl setcursor Vanilla-DMZ 24"
         ];
 
         bind = [
@@ -47,9 +48,9 @@ in
           "$mod, F, fullscreen"
 
           ", Print, exec, grim ~/Pictures/screenshot-$(date +'%Y%m%d-%H%M%S').png"
-          "SHIFT, Print, exec, grim -g \"$(slurp)\" ~/Pictures/screenshot-$(date +'%Y%m%d-%H%M%S').png"
+          "$mod&SHIFT, Print, exec, grim -g \"$(slurp)\" ~/Pictures/screenshot-$(date +'%Y%m%d-%H%M%S').png"
           "$mod&SHIFT, F, exec, alacritty -e sh -c 'EDITOR=nvim ranger'"
-          #''$mod&SHIFT, Print, exec, sh -c 'grim -g "$(swaymsg -t get_tree | jq -j '"'"'.. | select(.type?) | select(.focused).rect | "\(.x),\(.y) \(.width)x\(.height)"'"'"')" ~/Pictures/screenshot-$(date +'%Y%m%d-%H%M%S').png'"''
+          ''SHIFT, Print, exec, grim -g "$(hyprctl activewindow -j | jq -r '"\(.at[0]),\(.at[1]) \(.size[0])x\(.size[1])"')" ~/Pictures/screenshot-$(date +'%Y%m%d-%H%M%S').png''
 
           "$mod, D, exec, $menu"
           "$mod&SHIFT, D, exec, rofi -modi emoji -show emoji"
@@ -74,6 +75,7 @@ in
         windowrulev2 = [
           "float, title:(Android Emulator)"
           "float, title: Extension: (PassFF)"
+          "float, size 400 600, stayfocused, class:sys-specs"
         ];
 
         general = {
@@ -98,8 +100,9 @@ in
         };
 
         env = [
-          "HYPRCURSOR_SIZE, 24"
-          "GTK_THEME, Juno-ocean"
+          "HYPRCURSOR_THEME,Vanilla-DMZ"
+          "HYPRCURSOR_SIZE,24"
+          "GTK_THEME,Juno"
 
           "LIBVA_DRIVER_NAME,nvidia"
           "XDG_SESSION_TYPE,wayland"
@@ -148,7 +151,7 @@ in
 
         terminus-nerdfont
         noto-fonts
-        noto-fonts-cjk
+        noto-fonts-cjk-sans
         noto-fonts-emoji
       ];
 
@@ -180,13 +183,17 @@ in
     gtk = {
       enable = true;
       theme = {
-        name = "Juno-ocean";
+        name = "Juno";
         package = pkgs.juno-theme;
       };
       iconTheme = {
         name = "Qogir";
         package = pkgs.qogir-icon-theme;
       };
+      cursorTheme = {
+        package = pkgs.vanilla-dmz;
+        name = "Vanilla-DMZ";
+      };
       gtk3.extraConfig = {
         gtk-application-prefer-dark-theme = 1;
       };
@@ -198,7 +205,7 @@ in
     qt = {
       enable = true;
       style = {
-        name = "juno-ocean";
+        name = "juno";
         package = pkgs.juno-theme;
       };
       platformTheme.name = "gtk";

src/user/modules/gui/wm/sway/default.nix

@@ -140,7 +140,7 @@ in
 
       terminus-nerdfont
       noto-fonts
-      noto-fonts-cjk
+      noto-fonts-cjk-sans
       noto-fonts-emoji
     ];
 

src/user/modules/utils/modules/neovim/config/pkgs.nix

@@ -6,6 +6,7 @@ let
     marksman
     sumneko-lua-language-server stylua
     nodePackages."@tailwindcss/language-server"
+    pyright
     clang-tools
     #arduino-language-server
   ];
@@ -14,7 +15,6 @@ let
     typescript-language-server
     vscode-langservers-extracted
     bash-language-server
-    pyright
     vls
   ];