From af5ca69e027effc1267e122234f9d8bb369c2700 Mon Sep 17 00:00:00 2001
From: zastian-dev <zastian@methoddata.com>
Date: Fri, 12 Dec 2025 12:21:22 +0000
Subject: [PATCH] clean up the house a bit

---
 configuration.nix                     | 303 +++++---------------------
 dots/zsh.nix                          |   8 +-
 flake.lock                            |  48 ++--
 system/specialisation/main-system.nix | 108 +++++++++
 system/specialisation/steam.nix       | 112 ++++++++++
 5 files changed, 305 insertions(+), 274 deletions(-)
 create mode 100644 system/specialisation/main-system.nix
 create mode 100644 system/specialisation/steam.nix

diff --git a/configuration.nix b/configuration.nix
index 54853c2..b189a11 100755
--- a/configuration.nix
+++ b/configuration.nix
@@ -11,15 +11,6 @@
   ...
 }:
 
-let
-  oreo = pkgs.callPackage ./personalPKGS/oreo.nix { };
-
-  # Window manager toggles
-  wmAll = window_manager == "all";
-  useRiver = window_manager == "river" || wmAll;
-  useNiri = window_manager == "niri" || wmAll;
-  useHypr = window_manager == "hyprland" || wmAll;
-in
 {
   imports = [
     ./hardware-configuration.nix
@@ -50,59 +41,62 @@ in
   ##############################################################################
   programs.zsh.enable = true;
   users = {
-    users.mrfluffy = {
-      isNormalUser = true;
-      shell = pkgs.zsh;
-      createHome = true;
-      extraGroups = [
-        "wheel"
-        "networkmanager"
-        "video"
-        "render"
-        "docker"
-        "libvirt"
-        "input"
-        "seat"
-      ];
-      packages = with pkgs; [ ];
-    };
+    users = {
+      mrfluffy = {
+        isNormalUser = true;
+        shell = pkgs.zsh;
+        createHome = true;
+        extraGroups = [
+          "wheel"
+          "networkmanager"
+          "video"
+          "render"
+          "docker"
+          "libvirt"
+          "input"
+          "seat"
+        ];
+        packages = with pkgs; [ ];
+      };
 
-    users.work = {
-      isNormalUser = true;
-      shell = pkgs.zsh;
-      createHome = true;
-      extraGroups = [
-        "wheel"
-        "networkmanager"
-        "video"
-        "render"
-        "docker"
-        "libvirt"
-        "input"
-        "seat"
-      ];
-      packages = with pkgs; [ ];
+      work = {
+        isNormalUser = true;
+        shell = pkgs.zsh;
+        createHome = true;
+        extraGroups = [
+          "wheel"
+          "networkmanager"
+          "video"
+          "render"
+          "docker"
+          "libvirt"
+          "input"
+          "seat"
+        ];
+        packages = with pkgs; [ ];
+      };
+      game = {
+        isNormalUser = true;
+        description = "Dedicated gaming user (auto-login in Steam specialisation)";
+        shell = pkgs.bash;
+        createHome = true;
+        password = ""; # no password
+        extraGroups = [
+          "wheel"
+          "video"
+          "render"
+          "input"
+          "seat"
+          "networkmanager"
+        ];
+        home = "/home/game";
+      };
     };
-    users.game = {
-      isNormalUser = true;
-      description = "Dedicated gaming user (auto-login in Steam specialisation)";
-      shell = pkgs.bash;
-      createHome = true;
-      password = ""; # no password
-      extraGroups = [
-        "wheel"
-        "video"
-        "render"
-        "input"
-        "seat"
-        "networkmanager"
+      groups.libvirtd.members = [
+        "mrfluffy"
+        "work"
       ];
-      home = "/home/game";
-    };
-    groups.libvirtd.members = [
-      "mrfluffy"
-      "work"
-    ];
+
   };
   ##############################################################################
   # Home-Manager
@@ -173,106 +167,9 @@ in
   specialisation = {
     "01-steam" = {
       configuration = {
-
-        boot = {
-          kernelParams = lib.mkForce [ "ipv6e=1" "quiet" "splash"];
-          plymouth = {
-            enable = true;
-            themePackages = [ pkgs.adi1090x-plymouth-themes ];
-            theme = "abstract_ring_alt"; 
-          };
-
-        };
-
-        # ── HDMI-CEC: Turn on TV when Steam specialisation starts ─────────────────────
-        services.udev.packages = [ pkgs.libcec ]; # ensures cec-utils is in PATH
-        services.blueman.enable = true;
-        services.seatd.enable = true;
-
-        # A user service that runs once the graphical session (Steam/GameScope) is ready
-        #systemd.user.services.cec-tv-on = {
-        #  description = "Turn on TV via HDMI-CEC when entering Steam specialisation";
-        #  wantedBy = [ "graphical-session.target" ];
-        #  after = [ "graphical-session.target" ];
-        #  serviceConfig = {
-        #    Type = "oneshot";
-        #    RemainAfterExit = true;
-        #    ExecStart = toString (
-        #      pkgs.writeShellScript "cec-tv-on.sh" ''
-        #        # Wait a moment for the HDMI link to settle
-        #        sleep 3
-
-        #        # Turn on the TV and set it as active source (most TVs understand this)
-        #        ${pkgs.libcec}/bin/cec-client -s -d 1 <<EOF
-        #        on 0
-        #        as
-        #        EOF
-
-        #        # Alternative one-liner if the above somehow fails:
-        #        # echo 'on 0' | ${pkgs.libcec}/bin/cec-client -s -d 1
-        #        # echo 'as'  | ${pkgs.libcec}/bin/cec-client -s -d 1
-        #      ''
-        #    );
-        #  };
-        #};
-
-        # THIS is the important part – direct boot into the Gamescope Steam session
-        services.greetd = {
-          enable = true;
-          restart = true;
-          settings = {
-            # Tell greetd to auto-start the official gamescope steam session immediately
-            default_session = {
-              command = "${pkgs.gamescope}/bin/gamescope --prefer-outpu HDMI-A-2 --hdr-enabled --steam --mangoapp  -- steam -pipewire-dmabuf -gamepadui -steamos3 > /dev/null 2>&1";
-              user = "game";
-            };
-          };
-        };
-
-        # Auto-login the game user (no password prompt ever)
-        services.getty.autologinUser = "game";
-        # Make sure the user service starts automatically
-        systemd.user.targets.graphical-session = {
-          # This target already exists, we just ensure it’s active
-          unitConfig = {
-            RefuseManualStart = false;
-            RefuseManualStop = false;
-          };
-        };
-
-        environment = {
-          systemPackages = with pkgs; [
-            mangohud
-            gamemode
-            gamescope-wsi
-          ];
-          variables = {
-            #LIBSEAT_BACKEND = "logind";
-          };
-
-        };
-
-        programs = {
-          gamescope = {
-            enable = true;
-            capSysNice = true;
-          };
-
-          steam = {
-            enable = true;
-            remotePlay.openFirewall = true;
-            dedicatedServer.openFirewall = true;
-            extraCompatPackages = with pkgs; [
-              gamescope
-              mangohud
-              gamemode
-              gamescope-wsi
-            ];
-            gamescopeSession = {
-              enable = true;
-            };
-          };
-        };
+        imports = [
+          ./system/specialisation/steam.nix
+        ];
       };
     };
 
@@ -285,95 +182,9 @@ in
         imports = [
           ./system/services.nix
           ./system/nixOSPkgs.nix
+          ./system/specialisation/main-system.nix
           #inputs.niri.nixosModules.niri
         ];
-
-        # greetd + tuigreet
-        services.greetd = {
-          enable = true;
-          restart = true;
-          useTextGreeter = true;
-          settings.default_session = {
-            command = "${lib.getExe pkgs.tuigreet} --window-padding 1 --time --time-format '%R - %F' --remember --remember-session --asterisks";
-            user = "greeter";
-          };
-        };
-
-        ##############################################################################
-        # Desktop / WM
-        ##############################################################################
-        programs.river-classic.enable = useRiver;
-
-        qt = {
-          enable = true;
-          # style = "gtk2";
-          platformTheme = "qt5ct";
-        };
-
-        xdg.menus.enable = true;
-
-        # Work around Dolphin menu oddities: force Plasma menu definition
-        environment.etc."/xdg/menus/applications.menu".text =
-          builtins.readFile "${pkgs.kdePackages.plasma-workspace}/etc/xdg/menus/plasma-applications.menu";
-
-        # Niri (via overlay)
-        #nixpkgs.overlays = [ inputs.niri.overlays.niri ];
-        #programs.niri = {
-        #  enable = useNiri;
-        #  package = pkgs.niri-stable; # Only needed if not provided by the overlay
-        #};
-
-        # Hyprland
-        programs.hyprland = {
-          enable = useHypr;
-          package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
-        };
-
-        # X11 base (kept enabled for keymap + DM if needed)
-        services.xserver = {
-          enable = true;
-          xkb = {
-            layout = "ie";
-            variant = "";
-          };
-
-          # displayManager.lightdm = {
-          #   enable = true;
-          #   greeters.gtk = {
-          #     enable = true;
-          #     theme.package = pkgs.amarena-theme;
-          #     theme.name = "amarena";
-          #     cursorTheme.package = oreo.override { colors = [ "oreo_spark_pink_cursors" ]; };
-          #     cursorTheme.name = "oreo_spark_pink_cursors";
-          #     extraConfig = "background=${./assets/Wallpapers/138.png}";
-          #   };
-          # };
-        };
-
-        ##############################################################################
-        # Security / PolicyKit / PAM
-        ##############################################################################
-        security = {
-          rtkit.enable = true;
-          polkit.enable = true;
-          pam.services = {
-            swaylock = { };
-            greetd.enableGnomeKeyring = true;
-            greetd.kwallet.enable = true;
-          };
-        };
-
-        ##############################################################################
-        # Virtualisation
-        ##############################################################################
-        virtualisation = {
-          docker = {
-            enable = true;
-            storageDriver = lib.mkIf (systemName == "pc") "btrfs";
-          };
-          libvirtd.enable = true;
-        };
-
       };
     };
   };
diff --git a/dots/zsh.nix b/dots/zsh.nix
index 14f8f06..eaddf22 100755
--- a/dots/zsh.nix
+++ b/dots/zsh.nix
@@ -31,7 +31,7 @@
       GNUPGHOME           = "$XDG_DATA_HOME/gnupg";
       GOPATH              = "$XDG_DATA_HOME/go";
       GRADLE_USER_HOME    = "$XDG_DATA_HOME/gradle";
-      IPYTHONDIR          = "$XDG_CONFIG_HOMEipython";
+      IPYTHONDIR          = "$XDG_CONFIG_HOME/ipython";
       JUPYTER_CONFIG_DIR  = "$XDG_CONFIG_HOME/jupyter";
       LESSHISTFILE        = "$XDG_CACHE_HOME/less/history";
       NUGET_PACKAGES      = "$XDG_CACHE_HOME/NuGetPackages";
@@ -44,9 +44,9 @@
     };
 
     shellAliases = {
-      nix-switch  = "nh os switch --specialisation 00-main-system";
-      nix-upgrade = "(cd ~/nixos-dots && nix flake update) && echo 'flake.lock updated'";
-      nix-edit    = "sudo vim /etc/nixos/configuration.nix";
+      ns  = "nh os switch --specialisation 00-main-system";
+      nu = "(cd ~/nixos-dots && nix flake update) && echo 'flake.lock updated'";
+      ne    = "emacsclient -c ~/nixos-dots/configuration.nix";
 
       ls      = "exa -lag --icons";
       upload  = "~/.config/script/upload.sh";
diff --git a/flake.lock b/flake.lock
index e73f1a2..74fdc72 100644
--- a/flake.lock
+++ b/flake.lock
@@ -271,11 +271,11 @@
         "nixpkgs-lib": "nixpkgs-lib_2"
       },
       "locked": {
-        "lastModified": 1754091436,
-        "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=",
+        "lastModified": 1763759067,
+        "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd",
+        "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
         "type": "github"
       },
       "original": {
@@ -369,11 +369,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765337252,
-        "narHash": "sha256-HuWQp8fM25fyWflbuunQkQI62Hg0ecJxWD52FAgmxqY=",
+        "lastModified": 1765480374,
+        "narHash": "sha256-HlbvQAqLx7WqZFFQZ8nu5UUJAVlXiV/kqKbyueA8srw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "13cc1efd78b943b98c08d74c9060a5b59bf86921",
+        "rev": "39cb677ed9e908e90478aa9fe5f3383dfc1a63f3",
         "type": "github"
       },
       "original": {
@@ -459,11 +459,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1765456802,
-        "narHash": "sha256-KAwcM3w98TxiGlBnWYxhTdHM1vZZhzeeXaEE647REZ0=",
+        "lastModified": 1765497587,
+        "narHash": "sha256-5y9GUuRo3mjCk3gzR73kQy9trbS8vJ5fv7d7bGBSoyE=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "2ca7ad7efc1e20588af5c823ee46f23afad6cf91",
+        "rev": "8dfdcfb35385eabb821e668d327b30ea3e483ab8",
         "type": "github"
       },
       "original": {
@@ -762,11 +762,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765365489,
-        "narHash": "sha256-L0uvs+o8P5JzEcTPe2WPA48+0ZiO6+8nlfh7XSjQql4=",
+        "lastModified": 1765526639,
+        "narHash": "sha256-4U8crbUT3PDQdqhaMLnVaxnciBlcnDAw8XAJaXiS0pA=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "ddf5db234397043a8af5c38433b5ae933d660f27",
+        "rev": "457a55ed77a105088a47cb55b9eccf7768559451",
         "type": "github"
       },
       "original": {
@@ -903,11 +903,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765440299,
-        "narHash": "sha256-pFbREAtYotjEo059YRGsjn9+nOLuwuOEJQ9cOV9Kc5g=",
+        "lastModified": 1765526583,
+        "narHash": "sha256-bs2XpZoTssyKZ+nGRUNF1NeLO+a42bXYAEXpGD2GE0U=",
         "owner": "kaylorben",
         "repo": "nixcord",
-        "rev": "a68a319cbca0915da385b36b11f5aa2df8cf6e7a",
+        "rev": "d76f222b1339572df43441f39b4565afa3637b54",
         "type": "github"
       },
       "original": {
@@ -949,11 +949,11 @@
     },
     "nixpkgs-lib_2": {
       "locked": {
-        "lastModified": 1753579242,
-        "narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=",
+        "lastModified": 1761765539,
+        "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e",
+        "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc",
         "type": "github"
       },
       "original": {
@@ -1197,11 +1197,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1765386911,
-        "narHash": "sha256-YLjQpnTZCMjCho7ZDs5O1yFVw+fDlXq4lSJDuLWHHeA=",
+        "lastModified": 1765474444,
+        "narHash": "sha256-sDG+c73xEnIw1pFNRWffKDnTWiTuyZiEP+Iub0D3mWA=",
         "owner": "nix-community",
         "repo": "stylix",
-        "rev": "cb6bbed75eaca21deb8950c2ec0036ae5cde18ca",
+        "rev": "dd14de4432a94e93e10d0159f1d411487e435e1e",
         "type": "github"
       },
       "original": {
@@ -1406,11 +1406,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765430623,
-        "narHash": "sha256-YfJwnCXF3V+WFedx4RtrIdZ8XxF6zB1Oh2ij/EHzoWk=",
+        "lastModified": 1765514052,
+        "narHash": "sha256-YdwI+u4exAo0nRZsC9arapchD4Urt5Oeo+wZIrvlMa4=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "f2881ba36cbfc86ef1fe741cec871fe523aea5bd",
+        "rev": "3f55518bd994195cfdd835e86c41e984ac1241e8",
         "type": "github"
       },
       "original": {
diff --git a/system/specialisation/main-system.nix b/system/specialisation/main-system.nix
new file mode 100644
index 0000000..2197522
--- /dev/null
+++ b/system/specialisation/main-system.nix
@@ -0,0 +1,108 @@
+{
+  config,
+  lib,
+  pkgs,
+  window_manager,
+  systemName,
+  inputs,
+  ...
+}:
+
+let
+  oreo = pkgs.callPackage ./personalPKGS/oreo.nix { };
+
+  # Window manager toggles
+  wmAll = window_manager == "all";
+  useRiver = window_manager == "river" || wmAll;
+  useNiri = window_manager == "niri" || wmAll;
+  useHypr = window_manager == "hyprland" || wmAll;
+in
+
+{
+  # greetd + tuigreet
+  services.greetd = {
+    enable = true;
+    restart = true;
+    useTextGreeter = true;
+    settings.default_session = {
+      command = "${lib.getExe pkgs.tuigreet} --window-padding 1 --time --time-format '%R - %F' --remember --remember-session --asterisks";
+      user = "greeter";
+    };
+  };
+
+  ##############################################################################
+  # Desktop / WM
+  ##############################################################################
+  programs.river-classic.enable = useRiver;
+
+  qt = {
+    enable = true;
+    # style = "gtk2";
+    platformTheme = "qt5ct";
+  };
+
+  xdg.menus.enable = true;
+
+  # Work around Dolphin menu oddities: force Plasma menu definition
+  environment.etc."/xdg/menus/applications.menu".text =
+    builtins.readFile "${pkgs.kdePackages.plasma-workspace}/etc/xdg/menus/plasma-applications.menu";
+
+  # Niri (via overlay)
+  #nixpkgs.overlays = [ inputs.niri.overlays.niri ];
+  #programs.niri = {
+  #  enable = useNiri;
+  #  package = pkgs.niri-stable; # Only needed if not provided by the overlay
+  #};
+
+  # Hyprland
+  programs.hyprland = {
+    enable = useHypr;
+    package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
+  };
+
+  # X11 base (kept enabled for keymap + DM if needed)
+  services.xserver = {
+    enable = true;
+    xkb = {
+      layout = "ie";
+      variant = "";
+    };
+
+    # displayManager.lightdm = {
+    #   enable = true;
+    #   greeters.gtk = {
+    #     enable = true;
+    #     theme.package = pkgs.amarena-theme;
+    #     theme.name = "amarena";
+    #     cursorTheme.package = oreo.override { colors = [ "oreo_spark_pink_cursors" ]; };
+    #     cursorTheme.name = "oreo_spark_pink_cursors";
+    #     extraConfig = "background=${./assets/Wallpapers/138.png}";
+    #   };
+    # };
+  };
+
+  ##############################################################################
+  # Security / PolicyKit / PAM
+  ##############################################################################
+  security = {
+    rtkit.enable = true;
+    polkit.enable = true;
+    pam.services = {
+      swaylock = { };
+      greetd.enableGnomeKeyring = true;
+      greetd.kwallet.enable = true;
+    };
+  };
+
+  ##############################################################################
+  # Virtualisation
+  ##############################################################################
+  virtualisation = {
+    docker = {
+      enable = true;
+      storageDriver = lib.mkIf (systemName == "pc") "btrfs";
+    };
+    libvirtd.enable = true;
+  };
+
+}
diff --git a/system/specialisation/steam.nix b/system/specialisation/steam.nix
new file mode 100644
index 0000000..d58b2d2
--- /dev/null
+++ b/system/specialisation/steam.nix
@@ -0,0 +1,112 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  boot = {
+    kernelParams = lib.mkForce [
+      "ipv6e=1"
+      "quiet"
+      "splash"
+    ];
+    plymouth = {
+      enable = true;
+      themePackages = [ pkgs.adi1090x-plymouth-themes ];
+      theme = "abstract_ring_alt";
+    };
+
+  };
+
+  # ── HDMI-CEC: Turn on TV when Steam specialisation starts ─────────────────────
+  services.udev.packages = [ pkgs.libcec ]; # ensures cec-utils is in PATH
+  services.blueman.enable = true;
+  services.seatd.enable = true;
+
+  # A user service that runs once the graphical session (Steam/GameScope) is ready
+  #systemd.user.services.cec-tv-on = {
+  #  description = "Turn on TV via HDMI-CEC when entering Steam specialisation";
+  #  wantedBy = [ "graphical-session.target" ];
+  #  after = [ "graphical-session.target" ];
+  #  serviceConfig = {
+  #    Type = "oneshot";
+  #    RemainAfterExit = true;
+  #    ExecStart = toString (
+  #      pkgs.writeShellScript "cec-tv-on.sh" ''
+  #        # Wait a moment for the HDMI link to settle
+  #        sleep 3
+
+  #        # Turn on the TV and set it as active source (most TVs understand this)
+  #        ${pkgs.libcec}/bin/cec-client -s -d 1 <<EOF
+  #        on 0
+  #        as
+  #        EOF
+
+  #        # Alternative one-liner if the above somehow fails:
+  #        # echo 'on 0' | ${pkgs.libcec}/bin/cec-client -s -d 1
+  #        # echo 'as'  | ${pkgs.libcec}/bin/cec-client -s -d 1
+  #      ''
+  #    );
+  #  };
+  #};
+
+  # THIS is the important part – direct boot into the Gamescope Steam session
+  services.greetd = {
+    enable = true;
+    restart = true;
+    settings = {
+      # Tell greetd to auto-start the official gamescope steam session immediately
+      default_session = {
+        command = "${pkgs.gamescope}/bin/gamescope --prefer-outpu HDMI-A-2 --hdr-enabled --steam --mangoapp  -- steam -pipewire-dmabuf -gamepadui -steamos3 > /dev/null 2>&1";
+        user = "game";
+      };
+    };
+  };
+
+  # Auto-login the game user (no password prompt ever)
+  services.getty.autologinUser = "game";
+  # Make sure the user service starts automatically
+  systemd.user.targets.graphical-session = {
+    # This target already exists, we just ensure it’s active
+    unitConfig = {
+      RefuseManualStart = false;
+      RefuseManualStop = false;
+    };
+  };
+
+  environment = {
+    systemPackages = with pkgs; [
+      mangohud
+      gamemode
+      gamescope-wsi
+    ];
+    variables = {
+      #LIBSEAT_BACKEND = "logind";
+    };
+
+  };
+
+  programs = {
+    gamescope = {
+      enable = true;
+      capSysNice = true;
+    };
+
+    steam = {
+      enable = true;
+      remotePlay.openFirewall = true;
+      dedicatedServer.openFirewall = true;
+      extraCompatPackages = with pkgs; [
+        gamescope
+        mangohud
+        gamemode
+        gamescope-wsi
+      ];
+      gamescopeSession = {
+        enable = true;
+      };
+    };
+  };
+}