From 4a8274bd59714f22648e26a9adf7db295dcfe503 Mon Sep 17 00:00:00 2001
From: mrfluffy <zastian@mrfluffy.xyz>
Date: Thu, 11 Dec 2025 12:14:43 +0000
Subject: [PATCH] setting up the cumsole

---
 configuration.nix          | 96 +++++++++++++++++++++++++++++++-------
 dots/hyprland.nix          | 18 ++++---
 dots/zsh.nix               |  4 +-
 flake.lock                 |  6 +--
 hardware-configuration.nix | 58 ++++++++++++++---------
 home/homePkgs.nix          |  1 +
 system/boot.nix            | 24 ++++++----
 system/hardware.nix        | 22 ++++-----
 system/nixOSPkgs.nix       |  3 +-
 system/services.nix        | 67 ++++++++++++++++++--------
 10 files changed, 203 insertions(+), 96 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index fa5e5ca..c9a334f 100755
--- a/configuration.nix
+++ b/configuration.nix
@@ -23,7 +23,6 @@ in
 {
   imports = [
     ./hardware-configuration.nix
-    ./system/hardware.nix
     ./system/boot.nix
     ./system/network.nix
     ./system/inputMethods.nix
@@ -147,8 +146,74 @@ in
   system.stateVersion = "24.11"; # Did you read the comment?
 
   specialisation = {
-    steam = {
+    "01-steam" = {
       configuration = {
+        # ── HDMI-CEC: Turn on TV when Steam specialisation starts ─────────────────────
+        services.udev.packages = [ pkgs.libcec ]; # ensures cec-utils is in PATH
+
+        # 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
+              ''
+            );
+          };
+        };
+
+        # 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;
+          };
+        };
+
+        #boot.loader.systemd-boot.sortKey = lib.mkForce "00000000001-steam";
+        hardware.graphics = {
+          enable = true;
+          enable32Bit = true;
+          extraPackages = with pkgs; [
+            libva
+            libva-vdpau-driver
+            libvdpau-va-gl
+
+          ];
+        };
+        # ── Bluetooth ────────────────────────────────────────────────────────────────
+        hardware.bluetooth = {
+          enable = true; # Enable Bluetooth support
+          powerOnBoot = true; # Power up controller on boot
+          settings.General = {
+            #Enable = "Source,Sink,Media,Socket";
+            # Experimental = true;
+          };
+        };
+
+        # ── Tablets ─────────────────────────────────────────────────────────────────
+        hardware.enableRedistributableFirmware = true;
+        hardware.firmware = [
+          pkgs.linux-firmware
+        ];
+
         environment = {
           systemPackages = with pkgs; [
             mangohud
@@ -159,22 +224,11 @@ in
           };
 
         };
-        services.ananicy = {
-          enable = true;
-          package = pkgs.ananicy-cpp;
-          rulesProvider = pkgs.ananicy-cpp;
-          extraRules = [
-            {
-              "name" = "gamescope";
-              "nice" = -20;
-            }
-          ];
-        };
 
         programs = {
           gamescope = {
             enable = true;
-            capSysNice = false;
+            capSysNice = true;
           };
 
           steam = {
@@ -186,20 +240,28 @@ in
               mangohud
               gamemode
             ];
-            gamescopeSession.enable = true;
+            gamescopeSession = {
+              enable = true;
+              args = [
+                "--prefer-output"
+                "HDMI-A-2"
+                "--hdr-enabled"
+              ];
+            };
           };
         };
       };
     };
 
-    main-system = {
+    "00-main-system" = {
       configuration = {
+        #boot.loader.systemd-boot.sortKey = lib.mkDefault "00000000000-main";
         ##############################################################################
         # Imports
         ##############################################################################
         imports = [
           ./system/services.nix
-
+          ./system/hardware.nix
           ./system/nixOSPkgs.nix
           #inputs.niri.nixosModules.niri
         ];
diff --git a/dots/hyprland.nix b/dots/hyprland.nix
index f9a3ea8..2cd5bb8 100755
--- a/dots/hyprland.nix
+++ b/dots/hyprland.nix
@@ -39,14 +39,12 @@ in
       ##########################################################################
 
       # See https://wiki.hyprland.org/Configuring/Monitors/
-      # monitor = lib.mkMerge [
-      #   (lib.mkIf (systemName == "laptop") [ "eDP-1,1920x1080@59.99700,0x0,1" ])
-      #   (lib.mkIf (systemName == "pc") [
-      #     "DP-2,2560x1440@144,0x0,1"
-      #     "DP-1,2560x1440@239.97,2569x0,1"
-      #     #"DP-1,2560x1440@144,1920x0,1,bitdepth,10,cm,hdr"
-      #   ])
-      # ];
+      monitor = lib.mkMerge [
+        #(lib.mkIf (systemName == "laptop") [ "eDP-1,1920x1080@59.99700,0x0,1" ])
+        (lib.mkIf (systemName == "pc") [
+          "HDMI-A-2, disable"
+        ])
+      ];
 
       monitorv2 =
         [ ]
@@ -227,8 +225,8 @@ in
       # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
       master = {
         new_status = "master";
-	mfact = 0.5;
-	new_on_top = true;
+        mfact = 0.5;
+        new_on_top = true;
       };
 
       ##########################################################################
diff --git a/dots/zsh.nix b/dots/zsh.nix
index 7a2ce81..14f8f06 100755
--- a/dots/zsh.nix
+++ b/dots/zsh.nix
@@ -44,8 +44,8 @@
     };
 
     shellAliases = {
-      nix-switch  = "sudo nixos-rebuild switch";
-      nix-upgrade = "sudo nixos-rebuild switch --upgrade";
+      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";
 
       ls      = "exa -lag --icons";
diff --git a/flake.lock b/flake.lock
index 88699b0..5f7da97 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1426,11 +1426,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1765047449,
-        "narHash": "sha256-VQcqjJ2g0kT9TW4ENwA2HBQJzfbCUd5s1Wm3K+R2QZY=",
+        "lastModified": 1765386911,
+        "narHash": "sha256-YLjQpnTZCMjCho7ZDs5O1yFVw+fDlXq4lSJDuLWHHeA=",
         "owner": "nix-community",
         "repo": "stylix",
-        "rev": "bd00e01aab676aee88e6cc5c9238b4a5a7d6639a",
+        "rev": "cb6bbed75eaca21deb8950c2ec0036ae5cde18ca",
         "type": "github"
       },
       "original": {
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index e100595..ac2f88d 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -35,9 +35,14 @@
   boot.initrd.kernelModules = [ ];
   boot.kernelModules =
     [ ]
-    ++ (lib.optionals (systemName == "pc") [ "kvm-amd" ])
+    ++ (lib.optionals (systemName == "pc") [ "kvm-amd" "btusb"])
     ++ (lib.optionals (systemName == "laptop") [ "kvm-intel" ]);
   boot.extraModulePackages = [ ];
+  boot.kernelParams = [
+  # Most common working combination in 2024/2025
+  "btusb.enable_autosuspend=0"
+  "btusb.reset=1"
+];
 
   fileSystems."/" = lib.mkMerge [
     (lib.mkIf (systemName == "pc") {
@@ -71,29 +76,36 @@
       fsType = "btrfs";
     })
   ];
+  fileSystems."/home/mrfluffy/Games" = lib.mkMerge [
+    (lib.mkIf (systemName == "pc") {
+      device = "/dev/disk/by-uuid/54188f21-d525-4681-a9d4-b798363eef17";
+      fsType = "ext4";
+    })
+  ];
 
-  fileSystems."/server" = lib.mkIf (systemName == "pc") {   # or remove the mkIf if you want it on both
-    device = "//192.168.1.8/mrfluffy";   # adjust the share name if it’s not the home share
-    fsType = "cifs";
-    options = let
-      # Separate credentials from the Nix store (very important for security)
-      credFile = "/etc/nixos/smb-credentials-mrfluffy";
-    in [
-      # Basic recommended options
-      "credentials=${credFile}"
-      "gid=users"                  # make files belong to the "users" group (or your preferred group)
-      "uid=1000"                   # replace with your user’s UID, or use "uid=${config.users.users.yourname.uid}"
-      "file_mode=0664"
-      "dir_mode=0775"
-      "nofail"                     # ← this makes the mount OPTIONAL (boot continues if unreachable)
-      "noauto"                     # don’t mount automatically at boot (optional, combine with x-systemd.automount)
-      "x-systemd.automount"        # creates a systemd automount unit → mounts on first access
-      "x-systemd.mount-timeout=15" # don’t wait forever
-      "vers=3.0"                   # force SMB3 if the server supports it (recommended)
-      # "iocharset=utf8"           # usually not needed with modern servers
-      # "cache=loose"              # improves performance for some workloads
-    ];
-  };
+
+  #fileSystems."/server" = lib.mkIf (systemName == "pc") {   # or remove the mkIf if you want it on both
+  #  device = "//192.168.1.8/mrfluffy";   # adjust the share name if it’s not the home share
+  #  fsType = "cifs";
+  #  options = let
+  #    # Separate credentials from the Nix store (very important for security)
+  #    credFile = "/etc/nixos/smb-credentials-mrfluffy";
+  #  in [
+  #    # Basic recommended options
+  #    "credentials=${credFile}"
+  #    "gid=users"                  # make files belong to the "users" group (or your preferred group)
+  #    "uid=1000"                   # replace with your user’s UID, or use "uid=${config.users.users.yourname.uid}"
+  #    "file_mode=0664"
+  #    "dir_mode=0775"
+  #    "nofail"                     # ← this makes the mount OPTIONAL (boot continues if unreachable)
+  #    "noauto"                     # don’t mount automatically at boot (optional, combine with x-systemd.automount)
+  #    "x-systemd.automount"        # creates a systemd automount unit → mounts on first access
+  #    "x-systemd.mount-timeout=15" # don’t wait forever
+  #    "vers=3.0"                   # force SMB3 if the server supports it (recommended)
+  #    # "iocharset=utf8"           # usually not needed with modern servers
+  #    # "cache=loose"              # improves performance for some workloads
+  #  ];
+  #};
 
   swapDevices =
     [ ]
diff --git a/home/homePkgs.nix b/home/homePkgs.nix
index 0b0c292..c0f2dbb 100755
--- a/home/homePkgs.nix
+++ b/home/homePkgs.nix
@@ -247,6 +247,7 @@ in
     wineWowPackages.stable
     mangayomi
     rink
+    protontricks
 
     ############################
     # KDE / File Management
diff --git a/system/boot.nix b/system/boot.nix
index fad72bc..2f4d115 100755
--- a/system/boot.nix
+++ b/system/boot.nix
@@ -8,22 +8,28 @@
 
 let
   isLaptop = systemName == "laptop";
-  isPc     = systemName == "pc";
+  isPc = systemName == "pc";
 
   initrdBaseModules = [ "btusb" ];
-  initrdLPModules   = [ "kvm" ];                # for laptop & pc
+  initrdLPModules = [ "kvm" ]; # for laptop & pc
 
   kernelBaseModules = [ "v4l2loopback" ];
 
-  kernelBaseParams  = [ ];
-  kernelLPParams    = [ "ipv6e=1" ];            # for laptop & pc
-  kernelLaptopOnly  = [ "i915.force_probe=46a6" ];
-  kernelPcOnly      = [ "video=2560x1440x32" ];
+  kernelBaseParams = [ ];
+  kernelLPParams = [ "ipv6e=1" ]; # for laptop & pc
+  kernelLaptopOnly = [ "i915.force_probe=46a6" ];
+  kernelPcOnly = [ "video=2560x1440x32" ];
 in
 {
   boot = {
     loader = {
-      systemd-boot.enable = true;
+      systemd-boot = {
+        enable = true;
+extraInstallCommands = ''
+    ${lib.getExe pkgs.gnused} -i 's/default .*/default *-specialisation-00-main-system.conf/' /boot/loader/loader.conf
+  '';
+        #sortKey = "z-normal";
+      };
       efi.canTouchEfiVariables = true;
     };
 
@@ -33,7 +39,7 @@ in
     ];
 
     kernelPackages = pkgs.linuxPackages_latest;
-    kernelModules  = kernelBaseModules;
+    kernelModules = kernelBaseModules;
 
     extraModulePackages = [
       pkgs.linuxPackages_latest.v4l2loopback
@@ -42,7 +48,7 @@ in
     kernelParams = lib.mkMerge [
       (lib.mkIf (isLaptop || isPc) kernelLPParams)
       (lib.mkIf isLaptop kernelLaptopOnly)
-      (lib.mkIf isPc     kernelPcOnly)
+      (lib.mkIf isPc kernelPcOnly)
     ];
 
     extraModprobeConfig = ''
diff --git a/system/hardware.nix b/system/hardware.nix
index abac9c6..8788bc3 100755
--- a/system/hardware.nix
+++ b/system/hardware.nix
@@ -33,17 +33,17 @@ in
       enable = true;
       enable32Bit = true;
       extraPackages = with pkgs; [
-        rocmPackages.rocm-core
-        rocmPackages.rocminfo
-        rocmPackages.rocm-runtime
-        rocmPackages.clr.icd
-        rocmPackages.rocm-smi
-        rocmPackages.clr
-        #rocmPackages.hipblas
-        rocmPackages.rocblas
-        rocmPackages.rocsolver
-        rocmPackages.rocm-comgr
-        rocmPackages.rocsparse
+        #rocmPackages.rocm-core
+        #rocmPackages.rocminfo
+        #rocmPackages.rocm-runtime
+        #rocmPackages.clr.icd
+        #rocmPackages.rocm-smi
+        #rocmPackages.clr
+        ##rocmPackages.hipblas
+        #rocmPackages.rocblas
+        #rocmPackages.rocsolver
+        #rocmPackages.rocm-comgr
+        #rocmPackages.rocsparse
         # amdvlk
         # driversi686Linux.amdvlk
         # mesa
diff --git a/system/nixOSPkgs.nix b/system/nixOSPkgs.nix
index af1d50d..6964a85 100755
--- a/system/nixOSPkgs.nix
+++ b/system/nixOSPkgs.nix
@@ -70,6 +70,7 @@ in
   # Core programs
   ############################
   programs = {
+    dconf.enable = true;
 
     appimage = {
       enable = true;
@@ -84,7 +85,7 @@ in
     };
     gamescope = {
       enable = true;
-      capSysNice = true;
+      capSysNice = false;
     };
 
     nix-index-database = {
diff --git a/system/services.nix b/system/services.nix
index 8336a31..ee1efc2 100755
--- a/system/services.nix
+++ b/system/services.nix
@@ -1,4 +1,10 @@
-{ config, lib, pkgs, systemName, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  systemName,
+  ...
+}:
 
 {
   ###############################################
@@ -54,13 +60,32 @@
         "92-low-latency" = {
           "context.properties" = {
             "default.clock.rate" = 96000;
-            "default.clock.allowed-rates" = [ 44100 48000 96000 ];
+            "default.clock.allowed-rates" = [
+              44100
+              48000
+              96000
+            ];
           };
         };
       };
     })
   ];
 
+  ###############################################
+  # nice shit
+  ###############################################
+  services.ananicy = {
+    enable = true;
+    package = pkgs.ananicy-cpp;
+    rulesProvider = pkgs.ananicy-cpp;
+    extraRules = [
+      {
+        "name" = "gamescope";
+        "nice" = -20;
+      }
+    ];
+  };
+
   services.blueman.enable = true;
 
   ###############################################
@@ -154,7 +179,7 @@
       OLLAMA_MMAP = "0";
       OLLAMA_NUM_CTX = "40000";
       OLLAMA_NUM_GPU = "20";
-      OLLAMA_FLASH_ATTENTION="true";
+      OLLAMA_FLASH_ATTENTION = "true";
       # HSA_OVERRIDE_GFX_VERSION = "11.0.0";
       OLLAMA_KV_CACHE_TYPE = "f16";
     };
@@ -167,24 +192,26 @@
     description = "Service to launch Steam URLs via FIFO";
     wantedBy = [ "default.target" ];
     serviceConfig = {
-      ExecStart = let
-        script = pkgs.writeShellScript "steam-run-url-service.sh" ''
-          #!/usr/bin/env bash
-          FIFO="/run/user/$(id --user)/steam-run-url.fifo"
-          if [ ! -p "$FIFO" ]; then
-            mkfifo "$FIFO"
-          fi
-          while true; do
-            if read line <"$FIFO"; then
-              steam_env=();
-              if [ "$XDG_SESSION_DESKTOP" = "sway" ] || [ "$XDG_SESSION_DESKTOP" = "Hyprland" ] || [ "$DESKTOP_SESSION" = "sway" ] || [ "$DESKTOP_SESSION" = "Hyprland" ]; then
-                steam_env+=("QT_QPA_PLATFORM=wayland");
-              fi
-              steam "$line"
+      ExecStart =
+        let
+          script = pkgs.writeShellScript "steam-run-url-service.sh" ''
+            #!/usr/bin/env bash
+            FIFO="/run/user/$(id --user)/steam-run-url.fifo"
+            if [ ! -p "$FIFO" ]; then
+              mkfifo "$FIFO"
             fi
-          done
-        '';
-      in "${script}";
+            while true; do
+              if read line <"$FIFO"; then
+                steam_env=();
+                if [ "$XDG_SESSION_DESKTOP" = "sway" ] || [ "$XDG_SESSION_DESKTOP" = "Hyprland" ] || [ "$DESKTOP_SESSION" = "sway" ] || [ "$DESKTOP_SESSION" = "Hyprland" ]; then
+                  steam_env+=("QT_QPA_PLATFORM=wayland");
+                fi
+                steam "$line"
+              fi
+            done
+          '';
+        in
+        "${script}";
       Restart = "always";
     };
     path = [ pkgs.steam ];