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"
       },
@@ -790,6 +790,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_12": {
+      "locked": {
+        "lastModified": 1781577229,
+        "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1784356753,
@@ -856,11 +872,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1785104993,
-        "narHash": "sha256-eKbrvPoAOFutbYMdbB3r5EQVmFxKv24iKqHPPUXA0gM=",
+        "lastModified": 1785386831,
+        "narHash": "sha256-sPS3CaXH8RAT3FZRuy4VcV47iuYIWMMfa0GbyJKC3o4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8623c4c20aa4ca2f5fb81510d2944066c3fb0d96",
+        "rev": "21ea275a7c46aef9d4d6ddc962e6d562e9d94183",
         "type": "github"
       },
       "original": {
@@ -924,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"
       },
@@ -1031,11 +1047,11 @@
     "quickshell": {
       "flake": false,
       "locked": {
-        "lastModified": 1783436659,
-        "narHash": "sha256-rh0BJlcRM8nFet9aYIaZMxe7M6BMNJOrSgJi3cPQ+Tc=",
+        "lastModified": 1786547899,
+        "narHash": "sha256-QxLEKq1R455FlEmaarx3cq9mk4jSBxHg3CyseLiOick=",
         "ref": "refs/heads/main",
-        "rev": "68d4240fcbc605ee36a0e71797c04c0ac33f3e19",
-        "revCount": 25,
+        "rev": "e33041b66c66a1b68930bfd3bb58746ffbd5f4b2",
+        "revCount": 72,
         "type": "git",
         "url": "https://git.voidarc.co.uk/voidarc/quickshell"
       },
@@ -1086,11 +1102,11 @@
         "nixpkgs": "nixpkgs_9"
       },
       "locked": {
-        "lastModified": 1785224226,
-        "narHash": "sha256-Aj0ZA0boiYSPrvN+5ECpcYmx8OFEF+M1OoVY7ko0H/E=",
+        "lastModified": 1785411317,
+        "narHash": "sha256-r/YV6psmPZj9aSMydTmOooTBLFiwMJoCWnaKkUlXiss=",
         "owner": "AceSLS",
         "repo": "SLSsteam",
-        "rev": "4f7b79143a47a8ecb97c323745c7593d55fd6f20",
+        "rev": "b3da36b024f565f79ee19b44bea493af3f48ea95",
         "type": "github"
       },
       "original": {
@@ -1395,9 +1411,7 @@
     "wshowkeys_2": {
       "inputs": {
         "flake-utils": "flake-utils_3",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs_12"
       },
       "locked": {
         "lastModified": 1781708685,

flake.nix

@@ -32,10 +32,7 @@
       url = "github:coffeeispower/woomer";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    wshowkeys = {
-      url = "github:voidarclabs/wshowkeys";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    wshowkeys.url = "github:voidarclabs/wshowkeys";
     weylus = {
       url = "github:voidarclabs/WeylusCommunityEdition";
       inputs.nixpkgs.follows = "nixpkgs";

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/features/zsh/config.toml

@@ -34,6 +34,11 @@ template = '''
 {{- end -}}
 '''
 
+	[[blocks.segments]] # Hostname
+  type = 'text'
+  style = 'plain'
+  template = '{{ if eq .HostName "server02" }}<green>󰒋 {{.HostName}}</> <#7f849c>|</> {{ end }}'
+
 	[[blocks.segments]] # Python venv
   type = 'text'
   style = 'plain'

modules/features/zsh/default.nix

@@ -33,71 +33,77 @@
       zsh = let
         flakeLocation = builtins.getEnv "PWD";
       in
-        assert flakeLocation != "";
-          inputs.wrappers.wrappers.zsh.wrap {
-            inherit pkgs;
-            runtimePkgs = [pkgs.carapace pkgs.devenv pkgs.fzf];
-            zshAliases = {
-              ls = "${lib.getExe pkgs.lsd} -l";
-              v = lib.getExe self'.packages.nvim;
-              cat = lib.getExe pkgs.bat;
-              lg = lib.getExe pkgs.lazygit;
-              man = "man -P \"${lib.getExe pkgs.bat} -p\"";
-              nsh = "nix-shell -p";
-              nrs = "( cd ${flakeLocation} && sudo nixos-rebuild switch --impure --flake . )";
-              vinix = "nvim --cmd 'cd ${flakeLocation}'";
-            };
-            zshrc.content = ''
-              	source ${./devenv.zsh}
-
-              if (( ''${+terminfo[smkx]} )) && (( ''${+terminfo[rmkx]} )); then
-              	function zle-line-init() { echoti smkx }
-              function zle-line-finish() { echoti rmkx }
-              zle -N zle-line-init
-              	zle -N zle-line-finish
-              	fi
-
-              	autoload -U compinit && compinit
-              	export CARAPACE_BRIDGES='zsh,fish,bash,inshellisense' # optional
-              	zstyle ':completion:*' format $'\e[2;37mCompleting %d\e[m'
-              	source <(${lib.getExe pkgs.carapace} _carapace)
-              	zstyle ':completion:*' matcher-list 'm:{[:lower:]}={[:upper:]}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
-
-              	autoload -U select-word-style
-              	select-word-style bash
-
-              	autoload -U up-line-or-beginning-search down-line-or-beginning-search
-              	zle -N up-line-or-beginning-search
-              	zle -N down-line-or-beginning-search
-              	bindkey "^[OA" up-line-or-beginning-search
-              	bindkey "^[OB" down-line-or-beginning-search
-
-              	bindkey "^[[1;5C" forward-word
-              	bindkey "^[[1;5D" backward-word
-              	bindkey "^[[3;5~" kill-word
-              	bindkey "^H" backward-kill-word
-
-              	source <(${lib.getExe pkgs.fzf} --zsh)
-
-              	setopt NO_CASE_GLOB
-
-              	${lib.getExe pkgs.any-nix-shell} zsh --info-right | source /dev/stdin
-
-              	export EDITOR=nvim
-
-              	eval "$(${lib.getExe self'.packages.ohMyPosh} init zsh)"
-
-								eval "$(${lib.getExe pkgs.devenv} hook zsh)"
-
-              	typeset -ag precmd_functions
-              	if (( ! ''${precmd_functions[(I)__devenv_reload_apply]} )); then
-              		precmd_functions+=(__devenv_reload_apply)
-              			fi
-              			if (( ! ''${precmd_functions[(I)__devenv_restore_path]} )); then
-              				precmd_functions+=(__devenv_restore_path)
-              					fi
-            '';
+        lib.warnIf (flakeLocation == "") "Flake Location is undefined. Are you building in the right directory?"
+        inputs.wrappers.wrappers.zsh.wrap {
+          inherit pkgs;
+          runtimePkgs = [pkgs.carapace pkgs.devenv pkgs.fzf];
+          zshAliases = {
+            ls = "${lib.getExe pkgs.lsd} -l";
+            v = lib.getExe self'.packages.nvim;
+            cat = lib.getExe pkgs.bat;
+            lg = lib.getExe pkgs.lazygit;
+            man = "man -P \"${lib.getExe pkgs.bat} -p\"";
+            nsh = "nix-shell -p";
+            nrs =
+              if flakeLocation != ""
+              then "( cd ${flakeLocation} && sudo nixos-rebuild switch --impure --flake . )"
+              else "echo 'Flake location not specified. Did you build with --impure?'";
+            vinix =
+              if flakeLocation != ""
+              then "nvim --cmd 'cd ${flakeLocation}'"
+              else "echo 'Flake location not specified. Did you build with --impure?'";
           };
+          zshrc.content = ''
+                  	source ${./devenv.zsh}
+
+                  if (( ''${+terminfo[smkx]} )) && (( ''${+terminfo[rmkx]} )); then
+                  	function zle-line-init() { echoti smkx }
+                  function zle-line-finish() { echoti rmkx }
+                  zle -N zle-line-init
+                  	zle -N zle-line-finish
+                  	fi
+
+                  	autoload -U compinit && compinit
+                  	export CARAPACE_BRIDGES='zsh,fish,bash,inshellisense' # optional
+                  	zstyle ':completion:*' format $'\e[2;37mCompleting %d\e[m'
+                  	source <(${lib.getExe pkgs.carapace} _carapace)
+                  	zstyle ':completion:*' matcher-list 'm:{[:lower:]}={[:upper:]}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
+
+                  	autoload -U select-word-style
+                  	select-word-style bash
+
+                  	autoload -U up-line-or-beginning-search down-line-or-beginning-search
+                  	zle -N up-line-or-beginning-search
+                  	zle -N down-line-or-beginning-search
+                  	bindkey "^[OA" up-line-or-beginning-search
+                  	bindkey "^[OB" down-line-or-beginning-search
+
+                  	bindkey "^[[1;5C" forward-word
+                  	bindkey "^[[1;5D" backward-word
+                  	bindkey "^[[3;5~" kill-word
+                  	bindkey "^H" backward-kill-word
+
+                  	source <(${lib.getExe pkgs.fzf} --zsh)
+
+                  	setopt NO_CASE_GLOB
+
+                  	${lib.getExe pkgs.any-nix-shell} zsh --info-right | source /dev/stdin
+
+                  	export EDITOR=nvim
+
+                  	eval "$(${lib.getExe self'.packages.ohMyPosh} init zsh)"
+
+            eval "$(${lib.getExe pkgs.devenv} hook zsh)"
+
+                  	typeset -ag precmd_functions
+                  	if (( ! ''${precmd_functions[(I)__devenv_reload_apply]} )); then
+                  		precmd_functions+=(__devenv_reload_apply)
+                  			fi
+                  			if (( ! ''${precmd_functions[(I)__devenv_restore_path]} )); then
+                  				precmd_functions+=(__devenv_restore_path)
+                  					fi
+          '';
+        };
       ohMyPosh = inputs.wrappers.wrappers.oh-my-posh.wrap {
         inherit pkgs;
         configFile = ./config.toml;

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/audio/default.nix

@@ -8,12 +8,16 @@
     lib,
     ...
   }: {
-		environment.systemPackages = with pkgs; [
-		playerctl
-		pavucontrol
-		];
+    environment.systemPackages = with pkgs; [
+      playerctl
+      pavucontrol
+			pulseaudioFull
+    ];
     services.pulseaudio.enable = false;
     security.rtkit.enable = true;
+
+    nixpkgs.config.pulseaudio = true;
+
     services.pipewire = {
       enable = true;
       alsa.enable = true;

modules/system/desktop/default.nix

@@ -3,15 +3,19 @@
   moduleWithSystem,
   ...
 }: {
-  flake.nixosModules.desktop = moduleWithSystem ({...}: let
+  flake.nixosModules.desktop = moduleWithSystem ({pkgs, ...}: let
     modules = with self.nixosModules; [
       core
       hyprland
       sddm
       network
       omnisearch
+			tailscale
     ];
   in {
     imports = modules;
+    environment.systemPackages = with pkgs; [
+      mpv
+    ];
   });
 }

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;
+    };
+  };
+}