fibe fixed my dude

2026-01-15 18:31:30 +00:00
parent 0edd66d61a
commit b2504fde35
29 changed files with 483 additions and 717 deletions
--- a/system/boot.nix
+++ b/system/boot.nix
@@ -25,9 +25,9 @@ in
    loader = {
      systemd-boot = {
        enable = true;
-extraInstallCommands = ''
-    ${lib.getExe pkgs.gnused} -i 's/default .*/default *-specialisation-00-main-system.conf/' /boot/loader/loader.conf
-  '';
+        extraInstallCommands = ''
+          ${lib.getExe pkgs.gnused} -i 's/default .*/default *-specialisation-00-main-system.conf/' /boot/loader/loader.conf
+        '';
        #sortKey = "z-normal";
      };
      efi.canTouchEfiVariables = true;
--- a/system/hardware.nix
+++ b/system/hardware.nix
@@ -7,6 +7,9 @@
 }:

 let
+  isLaptop = systemName == "laptop";
+  isPc = systemName == "pc";
+
  # Shared VA-API / VDPAU bits across both machines
  commonVA = with pkgs; [
    libva
@@ -18,7 +21,7 @@ in
  # ── Graphics ─────────────────────────────────────────────────────────────────
  hardware.graphics = lib.mkMerge [
    # Laptop: Intel stack
-    (lib.mkIf (systemName == "laptop") {
+    (lib.mkIf isLaptop {
      enable = true;
      enable32Bit = true;
      extraPackages = with pkgs; [
@@ -29,7 +32,7 @@ in
    })

    # PC: AMD/ROCm stack
-    (lib.mkIf (systemName == "pc") {
+    (lib.mkIf isPc {
      enable = true;
      enable32Bit = true;
      extraPackages = with pkgs; [
--- a/system/inputMethods.nix
+++ b/system/inputMethods.nix
@@ -1,18 +1,35 @@
-{ config, lib, pkgs, systemName, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  systemName,
+  ...
+}:

+let
+  isLaptop = systemName == "laptop";
+  isPc = systemName == "pc";
+in
 {
  # Set console keymap based on systemName
-  console.keyMap = if systemName == "laptop" then "ie" else "us";
+  console.keyMap =
+    if isLaptop
+    then "ie"
+    else "us";

  # Locale settings
  i18n.defaultLocale =
-    if systemName == "laptop"
+    if isLaptop
    then "en_IE.UTF-8"
    else "en_US.UTF-8";

-  i18n.extraLocaleSettings = let
-    locale = if systemName == "laptop" then "en_IE.UTF-8" else "en_US.UTF-8";
-  in {
+  i18n.extraLocaleSettings =
+    let
+      locale =
+        if isLaptop
+        then "en_IE.UTF-8"
+        else "en_US.UTF-8";
+    in {
    LC_ADDRESS = locale;
    LC_IDENTIFICATION = locale;
    LC_MEASUREMENT = locale;
--- a/system/network.nix
+++ b/system/network.nix
@@ -7,13 +7,13 @@
 }:
 let
  isLaptop = systemName == "laptop";
-  isPc     = systemName == "pc";
+  isPc = systemName == "pc";
 in
 {
  networking = lib.mkMerge [
    # Hostname per system type
    (lib.mkIf isLaptop { hostName = "mrfluffyLaptop"; })
-    (lib.mkIf isPc     { hostName = "mrfluffyPC";     })
+    (lib.mkIf isPc { hostName = "mrfluffyPC"; })

    # Common networking config
    {
--- a/system/nixOSPkgs.nix
+++ b/system/nixOSPkgs.nix
@@ -1,8 +1,8 @@
 {
  config,
  lib,
-  inputs,
  pkgs,
+  inputs,
  pkgs-stable,
  ...
 }:
@@ -29,8 +29,8 @@ let
    -- HQ shader map
    local shader_map = {
      [1080] = "${anime4k}/Anime4K_Clamp_Highlights.glsl:${anime4k}/Anime4K_Restore_CNN_VL.glsl:${anime4k}/Anime4K_Upscale_CNN_x2_VL.glsl:${anime4k}/Anime4K_AutoDownscalePre_x2.glsl:${anime4k}/Anime4K_AutoDownscalePre_x4.glsl:${anime4k}/Anime4K_Upscale_CNN_x2_M.glsl",
-      [720]  = "${anime4k}/Anime4K_Clamp_Highlights.glsl:${anime4k}/Anime4K_Restore_CNN_Soft_VL.glsl:${anime4k}/Anime4K_Upscale_CNN_x2_VL.glsl:${anime4k}/Anime4K_AutoDownscalePre_x2.glsl:${anime4k}/Anime4K_AutoDownscalePre_x4.glsl:${anime4k}/Anime4K_Upscale_CNN_x2_M.glsl",
-      [480]  = "${anime4k}/Anime4K_Clamp_Highlights.glsl:${anime4k}/Anime4K_Upscale_Denoise_CNN_x2_VL.glsl:${anime4k}/Anime4K_AutoDownscalePre_x2.glsl:${anime4k}/Anime4K_AutoDownscalePre_x4.glsl:${anime4k}/Anime4K_Upscale_CNN_x2_M.glsl"
+      [720] = "${anime4k}/Anime4K_Clamp_Highlights.glsl:${anime4k}/Anime4K_Restore_CNN_Soft_VL.glsl:${anime4k}/Anime4K_Upscale_CNN_x2_VL.glsl:${anime4k}/Anime4K_AutoDownscalePre_x2.glsl:${anime4k}/Anime4K_AutoDownscalePre_x4.glsl:${anime4k}/Anime4K_Upscale_CNN_x2_M.glsl",
+      [480] = "${anime4k}/Anime4K_Clamp_Highlights.glsl:${anime4k}/Anime4K_Upscale_Denoise_CNN_x2_VL.glsl:${anime4k}/Anime4K_AutoDownscalePre_x2.glsl:${anime4k}/Anime4K_AutoDownscalePre_x4.glsl:${anime4k}/Anime4K_Upscale_CNN_x2_M.glsl"
    }

    local resolutions = { 1080, 720, 480 }
--- a/system/services.nix
+++ b/system/services.nix
@@ -6,10 +6,12 @@
  ...
 }:

+let
+  isLaptop = systemName == "laptop";
+  isPc = systemName == "pc";
+in
 {
-  ###############################################
-  # Desktop & Input
-  ###############################################
+  # ─── Desktop & Input ───────────────────────────────────────────────────────
  services.xserver.windowManager.fvwm2.gestures = true;

  # Enable touchpad support (enabled by default in most desktop managers).
@@ -31,49 +33,26 @@
  # services.xserver.displayManager.gdm.enable = true;
  # services.xserver.desktopManager.gnome.enable = true;

-  ###############################################
-  # Audio / Bluetooth
-  ###############################################
-  services.pipewire = lib.mkMerge [
-    (lib.mkIf (systemName == "laptop") {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-      jack.enable = true;
-      extraConfig.pipewire = {
-        "92-low-latency" = {
-          "context.properties" = {
-            "default.clock.rate" = 48000;
-            "default.clock.allowed-rates" = [ 48000 ];
-          };
-        };
+  # ─── Audio / Bluetooth ──────────────────────────────────────────────────────
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    jack.enable = true;
+    extraConfig.pipewire."92-low-latency"."context.properties" =
+      if isLaptop
+      then {
+        "default.clock.rate" = 48000;
+        "default.clock.allowed-rates" = [ 48000 ];
+      }
+      else {
+        "default.clock.rate" = 96000;
+        "default.clock.allowed-rates" = [ 44100 48000 96000 ];
      };
-    })
-    (lib.mkIf (systemName == "pc") {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-      jack.enable = true;
-      extraConfig.pipewire = {
-        "92-low-latency" = {
-          "context.properties" = {
-            "default.clock.rate" = 96000;
-            "default.clock.allowed-rates" = [
-              44100
-              48000
-              96000
-            ];
-          };
-        };
-      };
-    })
-  ];
+  };

-  ###############################################
-  # nice shit
-  ###############################################
+  # ─── Nice Shit ──────────────────────────────────────────────────────────────
  services.ananicy = {
    enable = true;
    package = pkgs.ananicy-cpp;
@@ -88,18 +67,14 @@

  services.blueman.enable = true;

-  ###############################################
-  # Printing & Files
-  ###############################################
+  # ─── Printing & Files ───────────────────────────────────────────────────────
  # Enable CUPS to print documents.
  services.printing.enable = true;

  services.gvfs.enable = true;
  services.tumbler.enable = true;

-  ###############################################
-  # Time & Power
-  ###############################################
+  # ─── Time & Power ───────────────────────────────────────────────────────────
  services.automatic-timezoned.enable = true;

  # Power management
@@ -109,20 +84,18 @@
  };

  # Laptop-specific lid and sleep behavior
-  services.logind.settings.Login = lib.mkIf (systemName == "laptop") {
+  services.logind.settings.Login = lib.mkIf isLaptop {
    HandleLidSwitch = "suspend-then-hibernate";
    HandleLidSwitchExternalPower = "suspend-then-hibernate";
    HandleLidSwitchDocked = "suspend-then-hibernate";
  };

-  systemd.sleep.extraConfig = lib.mkIf (systemName == "laptop") ''
+  systemd.sleep.extraConfig = lib.mkIf isLaptop ''
    HibernateDelaySec=120min
    SuspendState=mem
  '';

-  ###############################################
-  # Developer Tools & Services
-  ###############################################
+  # ─── Developer Tools & Services ─────────────────────────────────────────────
  # direnv speedup
  services.lorri.enable = true;

@@ -135,7 +108,7 @@
  #services.flatpak.enable = true;

  # Sunshine (only on PC)
-  services.sunshine = lib.mkIf (systemName == "pc") {
+  services.sunshine = lib.mkIf isPc {
    enable = false;
    settings = {
      sunshine_name = "nixos";
@@ -168,11 +141,11 @@
  };

  # Ollama (only on PC)
-  services.ollama = lib.mkIf (systemName == "pc") {
+  services.ollama = lib.mkIf isPc {
    enable = true;
    package = pkgs.ollama-rocm;
    port = 11434;
-    host = "0.0.0.0";
+    host = "127.0.0.1"; # Bind to localhost only for security
    rocmOverrideGfx = "11.0.0";
    environmentVariables = {
      OLLAMA_DEBUG = "1";
@@ -180,14 +153,11 @@
      OLLAMA_NUM_CTX = "40000";
      OLLAMA_NUM_GPU = "20";
      OLLAMA_FLASH_ATTENTION = "true";
-      # HSA_OVERRIDE_GFX_VERSION = "11.0.0";
      OLLAMA_KV_CACHE_TYPE = "f16";
    };
  };

-  ###############################################
-  # Systemd User Services
-  ###############################################
+  # ─── Systemd User Services ──────────────────────────────────────────────────
  systemd.user.services.steam-run-url-service = {
    description = "Service to launch Steam URLs via FIFO";
    wantedBy = [ "default.target" ];
@@ -217,9 +187,7 @@
    path = [ pkgs.steam ];
  };

-  ###############################################
-  # Networking & Remote
-  ###############################################
+  # ─── Networking & Remote ────────────────────────────────────────────────────
  # services.resolved = {
  #   enable = true;
  #   dnssec = "true";
@@ -231,14 +199,10 @@
  # Enable the OpenSSH daemon.
  services.openssh.enable = true;

-  ###############################################
-  # Virtualization
-  ###############################################
+  # ─── Virtualization ─────────────────────────────────────────────────────────
  virtualisation.libvirtd.enable = true;

-  ###############################################
-  # Udev Rules
-  ###############################################
+  # ─── Udev Rules ─────────────────────────────────────────────────────────────
  services.udev.packages = [
    pkgs.platformio-core
    pkgs.platformio
--- a/system/specialisation/main-system.nix
+++ b/system/specialisation/main-system.nix
@@ -9,6 +9,9 @@
 }:

 let
+  isLaptop = systemName == "laptop";
+  isPc = systemName == "pc";
+
  oreo = pkgs.callPackage ./personalPKGS/oreo.nix { };

  # Window manager toggles
@@ -36,9 +39,7 @@ in
  #};
  #services.displayManager.cosmic-greeter.enable = true;

-  ##############################################################################
-  # Desktop / WM
-  ##############################################################################
+  # ─── Desktop / WM ───────────────────────────────────────────────────────────
  programs.river-classic.enable = useRiver;

  qt = {
@@ -89,9 +90,7 @@ in
    # };
  };

-  ##############################################################################
-  # Security / PolicyKit / PAM
-  ##############################################################################
+  # ─── Security / PolicyKit / PAM ─────────────────────────────────────────────
  security = {
    rtkit.enable = true;
    polkit.enable = true;
@@ -102,13 +101,11 @@ in
    };
  };

-  ##############################################################################
-  # Virtualisation
-  ##############################################################################
+  # ─── Virtualisation ─────────────────────────────────────────────────────────
  virtualisation = {
    docker = {
      enable = true;
-      storageDriver = lib.mkIf (systemName == "pc") "btrfs";
+      storageDriver = lib.mkIf isPc "btrfs";
    };
    libvirtd.enable = true;
  };
--- a/system/wm.nix
+++ b/system/wm.nix
@@ -1,5 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-
-}