updated quickshell

flake.lock

@@ -366,11 +366,11 @@
         "wshowkeys": "wshowkeys"
       },
       "locked": {
-        "lastModified": 1785262861,
-        "narHash": "sha256-aSqAk+X2lcfWKICSTtVdramX5kkuUFy5MGOc58sl1NQ=",
+        "lastModified": 1786391152,
+        "narHash": "sha256-P+dUN0wWRYLop9lLsnCOEi5bYE/GC5LvzV2VZh520TM=",
         "ref": "refs/heads/main",
-        "rev": "b8677a83f0f796acfd7dd26832ef27214f5a431f",
-        "revCount": 50,
+        "rev": "b4426becc44de00e891098b9883eca2b2028f981",
+        "revCount": 53,
         "type": "git",
         "url": "https://git.voidarc.co.uk/voidarc/hypr"
       },
@@ -940,11 +940,11 @@
         "wrappers": "wrappers_2"
       },
       "locked": {
-        "lastModified": 1783352922,
-        "narHash": "sha256-59Kea6PaeTM6ZBEAWzdPnuLlij2emLd21JsPnobR3B0=",
+        "lastModified": 1786377545,
+        "narHash": "sha256-I5/PcFU0jlDw6+32MXpMGJxxHqWBUdYCt6DzFDctybw=",
         "ref": "refs/heads/main",
-        "rev": "970da906087f0691932418db8757803d64f60c28",
-        "revCount": 94,
+        "rev": "dc386a5f5cf31925c513a3a39f546d5364289095",
+        "revCount": 100,
         "type": "git",
         "url": "https://git.voidarc.co.uk/voidarc/nvim"
       },
@@ -1047,11 +1047,11 @@
     "quickshell": {
       "flake": false,
       "locked": {
-        "lastModified": 1785316762,
-        "narHash": "sha256-YDCoSJbBsugRcugBSh4mgwaQkz51RbMEjMxPgZPsNoA=",
+        "lastModified": 1786547899,
+        "narHash": "sha256-QxLEKq1R455FlEmaarx3cq9mk4jSBxHg3CyseLiOick=",
         "ref": "refs/heads/main",
-        "rev": "afbe360b080f349d27359b8507ce429aaa5a5a7e",
-        "revCount": 26,
+        "rev": "e33041b66c66a1b68930bfd3bb58746ffbd5f4b2",
+        "revCount": 72,
         "type": "git",
         "url": "https://git.voidarc.co.uk/voidarc/quickshell"
       },

modules/features/hyprland/default.nix

@@ -14,6 +14,7 @@
       audio
       systemTheme
     ];
+
     runtimePkgs = self'.packages.hyprland.passthru.runtimePackages;
     lib = pkgs.lib;
 
@@ -27,12 +28,16 @@
       enable = true;
       package = self'.packages.hyprland;
     };
+
+    services.displayManager.defaultSession = "hyprland";
     services.xserver.enable = true;
     security.polkit.enable = true;
+
     environment.systemPackages = with pkgs; [
       hyprlock
       gsettings-desktop-schemas
     ];
+
     system.activationScripts.hyprRuntimeEnv = lib.stringAfter ["specialfs"] ''
       mkdir -p /run/hypr-runtime-env/bin
       ${lib.concatStringsSep "\n" (lib.mapAttrsToList (name: pkg: ''
@@ -40,6 +45,7 @@
         '')
         runtimePkgs)}
     '';
+
     system.activationScripts.hyprConfig = lib.stringAfter ["specialfs"] ''
       mkdir -p /run/hypr/config
       ln -sfn ${inputs'.hyprland.packages.repo-files}/* /run/hypr/config
@@ -54,7 +60,7 @@
     packages = {
       hyprland = inputs'.hyprland.packages.default.override {
         flags."--config" = "/run/hypr/config/hyprland.lua";
-				env."MODULES_ROOT" = "/run/hypr/config/modules";
+        env."MODULES_ROOT" = "/run/hypr/config/modules";
         runtimePackages =
           inputs.hyprland.lib.defaultRuntimePkgs.${system}
           // {

modules/features/i3/config

@@ -0,0 +1,71 @@
+set $mod Mod4
+set $term kitty
+set $menu dmenu_run
+
+exec --no-startup-id xrandr --output HDMI-1 --mode 1920x1080 --rate 60 --pos -1920x0 --output DP-1 --mode 1920x1080 --rate 60 --pos 0x0 --output DP-2 --mode 1920x1080 --rate 60 --pos 1920x0
+
+font pango:FiraMono Nerd Font 10
+
+workspace 1 output DP-1
+workspace 2 output HDMI-A-1
+workspace 3 output DP-2
+
+# Window functions
+bindsym $mod+BackSpace kill
+bindsym $mod+b fullscreen toggle
+
+# Apps
+bindsym $mod+Return exec --no-startup-id $term
+bindsym $mod+d exec --no-startup-id $menu
+bindsym $mod+f exec --no-startup-id firefox
+bindsym $mod+s exec --no-startup-id nemo
+
+# Focus windows
+bindsym $mod+k focus up
+bindsym $mod+j focus down
+bindsym $mod+h focus left
+bindsym $mod+l focus right
+
+# Move windows
+bindsym $mod+Shift+h move left
+bindsym $mod+Shift+l move right
+bindsym $mod+Shift+k move up
+bindsym $mod+Shift+j move down
+
+# Workspaces
+bindsym $mod+q workspace number 1
+bindsym $mod+w workspace number 2
+bindsym $mod+e workspace number 3
+bindsym $mod+r workspace number 4
+bindsym $mod+t workspace number 5
+bindsym $mod+y workspace number 6
+bindsym $mod+u workspace number 7
+bindsym $mod+i workspace number 8
+bindsym $mod+o workspace number 9
+bindsym $mod+p workspace number 10
+
+# Move container to workspace
+bindsym $mod+Shift+q move container to workspace number 1
+bindsym $mod+Shift+w move container to workspace number 2
+bindsym $mod+Shift+e move container to workspace number 3
+bindsym $mod+Shift+r move container to workspace number 4
+bindsym $mod+Shift+t move container to workspace number 5
+bindsym $mod+Shift+y move container to workspace number 6
+bindsym $mod+Shift+u move container to workspace number 7
+bindsym $mod+Shift+i move container to workspace number 8
+bindsym $mod+Shift+o move container to workspace number 9
+bindsym $mod+Shift+p move container to workspace number 10
+
+# Logout menu
+bindsym $mod+Shift+a exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
+
+# Reload
+bindsym $mod+Shift+m reload
+
+# Drag windows with titlebar
+tiling_drag modifier titlebar
+
+# Bar
+bar {
+        status_command i3status
+}

modules/features/i3/default.nix

@@ -0,0 +1,48 @@
+{
+  inputs,
+  moduleWithSystem,
+  ...
+}: {
+  flake.nixosModules.i3 = moduleWithSystem ({
+    pkgs,
+    self',
+    ...
+  }: {
+    services.xserver = {
+      enable = true;
+
+      desktopManager = {
+        xterm.enable = false;
+      };
+
+      windowManager.i3 = {
+        enable = true;
+        package = self'.packages.i3;
+        extraPackages = with pkgs;
+          [
+            dmenu
+            i3status
+            xinit
+          ];
+      };
+    };
+  });
+  perSystem = {pkgs, self', ...}: {
+    packages.i3 = inputs.wrappers.lib.wrapPackage ({...}: {
+      inherit pkgs;
+      package = pkgs.i3;
+      runtimePkgs = with pkgs;
+        [
+          xrandr
+          firefox
+        ]
+        ++ (with self'.packages; [
+          kitty
+          nemo
+        ]);
+      flags = {
+        "-c" = ./config;
+      };
+    });
+  };
+}

modules/features/kitty/default.nix

@@ -29,6 +29,7 @@
         settings = {
           font_size = 11;
           scrollbar = "never";
+          pixel_scroll = false;
           window_padding_width = 9;
           background_opacity = 0.50;
           confirm_os_window_close = 0;

modules/features/quickshell/default.nix

@@ -3,7 +3,11 @@
   inputs,
   ...
 }: {
-  flake.nixosModules.quickshell = moduleWithSystem ({self', ...}: {
+  flake.nixosModules.quickshell = moduleWithSystem ({
+    self',
+    pkgs,
+    ...
+  }: {
     environment.systemPackages = with self'.packages; [
       quickshell
     ];

modules/features/tailscale/default.nix

@@ -0,0 +1,11 @@
+{
+  self,
+  moduleWithSystem,
+  ...
+}: {
+  flake.nixosModules.tailscale = moduleWithSystem ({...}: {
+    services.tailscale = {
+      enable = true;
+    };
+  });
+}

modules/hosts/HACKSTATION/default.nix

@@ -15,6 +15,8 @@
       davinci
       sddm-autologin
       nix-ld
+
+			i3
     ];
   };
 }

modules/hosts/mobile02/default.nix

@@ -9,6 +9,7 @@
       mobile02Configuration
       intelDrivers
 			development
+			upower
     ];
   };
 }

modules/system/desktop/default.nix

@@ -10,6 +10,7 @@
       sddm
       network
       omnisearch
+			tailscale
     ];
   in {
     imports = modules;

modules/system/drivers/amd.nix

@@ -1,13 +1,5 @@
-{
-  self,
-  inputs,
-  ...
-}: {
-  flake.nixosModules.amdDrivers = {
-    pkgs,
-    lib,
-    ...
-  }: {
+{...}: {
+  flake.nixosModules.amdDrivers = {pkgs, ...}: {
     environment.systemPackages = with pkgs; [
       mesa
       rocmPackages.rocm-smi

modules/system/drivers/upower.nix

@@ -0,0 +1,11 @@
+{...}: {
+  flake.nixosModules.upower = {pkgs, ...}: {
+    environment.systemPackages = with pkgs; [
+      upower
+    ];
+    services = {
+      upower.enable = true;
+      power-profiles-daemon.enable = true;
+    };
+  };
+}