Move a bunch of things around

hosts/nixos/common/optional/hyprland.nix

@@ -1,5 +1,5 @@
+# The main configuration is specified by home-manager
 { inputs, pkgs, ... }: {
-
   programs.hyprland.enable = true;
   programs.hyprland.package =
     inputs.hyprland.packages.${pkgs.system}.hyprland;

hosts/nixos/common/optional/lightdm.nix

@@ -2,7 +2,8 @@
 let greeter = "enso";
 in
 {
-  services.xserver.enable = true;
+  imports = [ ./xserver.nix ];
+
   services.xserver.displayManager.lightdm = {
     enable = true;
 
@@ -22,6 +23,7 @@ in
   # services.xserver.displayManager.defaultSession = lib.mkDefault "hyprland";
   services.xserver.displayManager.defaultSession = lib.mkDefault "none+xmonad";
 
+  # Enable base16 styling
   stylix.targets.lightdm.enable = true;
 }
 

hosts/nixos/common/optional/pipewire.nix

@@ -1,3 +1,4 @@
+# This handles audio stuff
 { pkgs, ... }: {
   security.rtkit.enable = true;
   hardware.pulseaudio.enable = false;
@@ -12,16 +13,20 @@
 
   # Volume controls
   environment.shellAliases =
-    let pactl = "${pkgs.pulseaudio}/bin/pactl";
+    let
+      pactl = "${pkgs.pulseaudio}/bin/pactl";
+      volume = amount: "${pactl} set-sink-volume @DEFAULT_SINK@ ${amount}";
     in
     {
       # Relative 
-      "v-up" = "${pactl} set-sink-volume @DEFAULT_SINK@ +5%";
-      "v-down" = "${pactl} set-sink-volume @DEFAULT_SINK@ +5%";
+      "v-down" = volume "-5%";
+      "v-up" = volume "+5%";
 
       # Absolute
-      "v-min" = "${pactl} set-sink-volume @DEFAULT_SINK@ 0%";
-      "v-mid" = "${pactl} set-sink-volume @DEFAULT_SINK@ 50%";
-      "v-max" = "${pactl} set-sink-volume @DEFAULT_SINK@ 100%";
+      "v-min" = volume "0%";
+      "v-low" = volume "25%";
+      "v-mid" = volume "50%";
+      "v-high" = volume "75%";
+      "v-max" = volume "100%";
     };
 }

hosts/nixos/common/optional/touchpad.nix

@@ -1,5 +1,7 @@
 # My touchpad configuration
 { ... }: {
+  imports = [ ./xserver.nix ];
+
   services.xserver.libinput = {
     enable = true;
 

hosts/nixos/common/optional/xdg-portal.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }: {
+{ pkgs, ... }: {
   services.dbus.enable = true;
   xdg.portal = {
     enable = true;

hosts/nixos/common/optional/xmonad/Main.hs

@@ -36,15 +36,14 @@ main =
     myWorkspaces =
       ["1:dev", "2:browser", "3:chat", "4:terminal", "5:reading", "6:music", "7:gaming"]
 
-    myTerminal = "alacritty"
+    myTerminal = "xmonad"
     myBrowser = "firefox"
 
     keymap =
       [ ("M-p", spawn "rofi -show drun"),
-        ("M-w", spawn "rofi -show window"),
         ("M-g", spawn myBrowser),
         ("M-d", spawn "Discord"),
-        ("M-v", spawn "alacritty -e 'vimclip'"),
+        ("M-v", spawn "wezterm start vimclip"),
         ("M-s", spawn "spectacle -rcb"),
         ("M-S-s", spawn "spectacle -mcb"),
         ("M-C-s", spawn "spectacle -ucb"),
@@ -62,8 +61,8 @@ main =
     myLayoutHook = spacingHook layouts
 
     startupApps = []
-    -- [ (0, "alacritty"),
-    --   (1, "google-chrome-stable"),
+    -- [ (0, "wezterm"),
+    --   (1, "firefox"),
     --   (2, "Discord")
     -- ]
 

hosts/nixos/common/optional/xmonad/default.nix

@@ -1,6 +1,6 @@
 { config, ... }:
 {
-  imports = [ ../touchpad.nix ];
+  imports = [ ../xserver.nix ../touchpad.nix ];
   services.xserver = {
     enable = true;