i3 feature

flake.lock

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

modules/features/i3/config

@@ -2,7 +2,7 @@ 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
+exec_always --no-startup-id xrandr --output DP-1 --mode 1920x1080 --rate 60 --pos 0x0 --rotate normal --output DP-2 --mode 1920x1080 --rate 60 --pos 1920x0 --rotate normal --output HDMI-A-1 --mode 1920x1080 --rate 60 --pos -1920x0 --rotate normal
 
 font pango:FiraMono Nerd Font 10
 
@@ -58,14 +58,3 @@ 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

@@ -1,4 +1,5 @@
 {
+  self,
   inputs,
   moduleWithSystem,
   ...
@@ -6,6 +7,7 @@
   flake.nixosModules.i3 = moduleWithSystem ({
     pkgs,
     self',
+    inputs',
     ...
   }: {
     services.xserver = {
@@ -18,8 +20,7 @@
       windowManager.i3 = {
         enable = true;
         package = self'.packages.i3;
-        extraPackages = with pkgs;
+        extraPackages = with pkgs; [
-          [
           dmenu
           i3status
           xinit
@@ -27,19 +28,10 @@
       };
     };
   });
-  perSystem = {pkgs, self', ...}: {
+  perSystem = {pkgs, ...}: {
     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,7 +29,6 @@
         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,11 +3,7 @@
   inputs,
   ...
 }: {
-  flake.nixosModules.quickshell = moduleWithSystem ({
+  flake.nixosModules.quickshell = moduleWithSystem ({self', ...}: {
-    self',
-    pkgs,
-    ...
-  }: {
     environment.systemPackages = with self'.packages; [
       quickshell
     ];

modules/features/tailscale/default.nix

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

modules/hosts/HACKSTATION/default.nix

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

modules/hosts/mobile02/default.nix

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

modules/system/desktop/default.nix

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

modules/system/drivers/amd.nix

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

modules/system/drivers/upower.nix

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