Auto-commit: 2026-01-08 10:48:02

configuration.nix

@@ -2,10 +2,9 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ inputs, host, ... }:
+{ host, ... }:
 
 { 
-  
   imports =
     [
       ./hosts/${host}
@@ -13,63 +12,4 @@
       ./system
       ./modules
     ];
-
-  # Set your time zone.
-  time.timeZone = "Europe/Berlin";
-
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "en_US.UTF-8";
-    LC_IDENTIFICATION = "en_US.UTF-8";
-    LC_MEASUREMENT = "en_US.UTF-8";
-    LC_MONETARY = "en_US.UTF-8";
-    LC_NAME = "en_US.UTF-8";
-    LC_NUMERIC = "en_US.UTF-8";
-    LC_PAPER = "en_US.UTF-8";
-    LC_TELEPHONE = "en_US.UTF-8";
-    LC_TIME = "en_US.UTF-8";
-  };
-
-  # Configure keymap in X11
-  services.xserver.xkb = {
-    layout = "us";
-    variant = "euro";
-  };
-
-
-  # Allow unfree packages
-  nixpkgs.config.allowUnfree = true;
-  nixpkgs.overlays = [
-    inputs.nix-cachyos-kernel.overlays.pinned
-  ];
-
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  services.openssh.enable = true;
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "25.11"; # Did you read the comment?
-
 }

flake.lock

@@ -234,6 +234,20 @@
         "type": "github"
       }
     },
+    "flake-compat_4": {
+      "locked": {
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "revCount": 69,
+        "type": "tarball",
+        "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
@@ -252,6 +266,24 @@
         "type": "github"
       }
     },
+    "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib_2"
+      },
+      "locked": {
+        "lastModified": 1765835352,
+        "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -653,6 +685,26 @@
         "type": "github"
       }
     },
+    "nixcord": {
+      "inputs": {
+        "flake-compat": "flake-compat_4",
+        "flake-parts": "flake-parts_2",
+        "nixpkgs": "nixpkgs_6"
+      },
+      "locked": {
+        "lastModified": 1767660167,
+        "narHash": "sha256-g6buDZWOlKB1iWnFHIXiokRalDOXI7Ha0urMIOwCCow=",
+        "owner": "kaylorben",
+        "repo": "nixcord",
+        "rev": "166863303743fc0f07026bbcd5d6be2d7850ddcf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "kaylorben",
+        "repo": "nixcord",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1744536153,
@@ -684,6 +736,37 @@
         "type": "github"
       }
     },
+    "nixpkgs-lib_2": {
+      "locked": {
+        "lastModified": 1765674936,
+        "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1767767207,
+        "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "5912c1772a44e31bf1c63c0390b90501e5026886",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1767047869,
@@ -749,6 +832,22 @@
       }
     },
     "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1766885793,
+        "narHash": "sha256-P6RVkrM9JLCW6xBjSwHfgTOQ1JwBUma5xe5LI8xAPC0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9ef261221d1e72399f2036786498d78c38185c46",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1767081933,
         "narHash": "sha256-aFw7KQeFeAZ8Nz0uzHtpR3nykKxcDs7UxS5+Vknq0O4=",
@@ -764,7 +863,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_7": {
+    "nixpkgs_8": {
       "locked": {
         "lastModified": 1767047869,
         "narHash": "sha256-tzYsEzXEVa7op1LTnrLSiPGrcCY6948iD0EcNLWcmzo=",
@@ -780,7 +879,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_8": {
+    "nixpkgs_9": {
       "locked": {
         "lastModified": 1766651565,
         "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=",
@@ -798,7 +897,7 @@
     },
     "openlinkhub": {
       "inputs": {
-        "nixpkgs": "nixpkgs_7"
+        "nixpkgs": "nixpkgs_8"
       },
       "locked": {
         "path": "./services/openlinkhub",
@@ -866,7 +965,9 @@
         "hyprland": "hyprland",
         "nix-cachyos-kernel": "nix-cachyos-kernel",
         "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs_6",
+        "nixcord": "nixcord",
+        "nixpkgs": "nixpkgs_7",
+        "nixpkgs-unstable": "nixpkgs-unstable",
         "openlinkhub": "openlinkhub",
         "spicetify-nix": "spicetify-nix",
         "zen-browser": "zen-browser"
@@ -892,7 +993,7 @@
     },
     "spicetify-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_8",
+        "nixpkgs": "nixpkgs_9",
         "systems": "systems_2"
       },
       "locked": {

flake.nix

@@ -3,6 +3,9 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/release-25.11";
+    nixpkgs-unstable = {
+      url = "github:nixos/nixpkgs/nixos-unstable";
+    };
     home-manager = {
       url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -31,15 +34,17 @@
       url = "github:ezKEa/aagl-gtk-on-nix/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    nixcord = {
+      url = "github:kaylorben/nixcord";
+    };
   };
 
   outputs = {
-    self,
     nixpkgs,
     home-manager,
-    hyprland,
     nix-flatpak,
     catppuccin,
+    nixcord,
     ...
   } @inputs:
   let
@@ -50,7 +55,7 @@
     system = "x86_64-linux";
   in 
   {
-    nixosConfigurations.lillypc = nixpkgs.lib.nixosSystem {
+    nixosConfigurations.${host} = nixpkgs.lib.nixosSystem {
       inherit system;
       specialArgs = {
         inherit inputs host username prettyUsername;
@@ -73,6 +78,7 @@
               imports = [
                 ./home
                 catppuccin.homeModules.catppuccin
+                nixcord.homeModules.nixcord
               ];
               home = {
                 username = "${username}";
@@ -86,4 +92,3 @@
     };
   };
 }
-

home/catppuccin.nix

@@ -1,31 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-let
-  variant = "mocha";
-  accent = "mauve";
-in
-{
-  catppuccin = {
-    enable = true;
-    accent = "${accent}";
-    flavor = "${variant}";
-    vscode.profiles.default.enable = false;
-    cursors.enable = true;
-  };
-
-  gtk = {
-    enable = true;
-    theme = {
-      name = "Catppuccin-GTK-Dark";
-      package = pkgs.magnetic-catppuccin-gtk;
-    };
-  };
-
-  qt = {
-    enable = true;
-    platformTheme.name = "ct";
-    style.name = "kvantum";
-  };
-}

home/default.nix

@@ -16,5 +16,4 @@ let
 in
 {
   imports = module_files;
-  nixpkgs.config.allowUnfree = true;
 }

home/desktop/catppuccin.nix

@@ -0,0 +1,32 @@
+{ pkgs, nixosConfig, lib, ... }:
+let
+  variant = "mocha";
+  accent = "mauve";
+  cfg = nixosConfig.my.desktop;
+in
+{
+  config = lib.mkIf cfg.enable {
+    catppuccin = {
+      enable = true;
+      accent = "${accent}";
+      flavor = "${variant}";
+      vscode.profiles.default.enable = false;
+      cursors.enable = true;
+      thunderbird.profile = "default";
+    };
+
+    gtk = {
+      enable = true;
+      theme = {
+        name = "Catppuccin-GTK-Dark";
+        package = pkgs.magnetic-catppuccin-gtk;
+      };
+    };
+
+    qt = {
+      enable = true;
+      platformTheme.name = "ct";
+      style.name = "kvantum";
+    };
+  };
+}

home/desktop/general.nix

@@ -0,0 +1,13 @@
+{ nixosConfig, lib, pkgs, ... }:
+let
+  cfg = nixosConfig.my.desktop;
+in
+{
+  config = lib.mkIf cfg.enable {
+    services.gnome-keyring.enable = true;
+    services.easyeffects = {
+      enable = true;
+    };
+    home.packages = [ pkgs.gcr ]; # Provides org.gnome.keyring.SystemPrompter
+  };
+}

home/desktop/hyprland.nix

@@ -3,8 +3,7 @@ let
   cfg = nixosConfig.my.desktop;
 in
 {
-  programs.kitty.enable = cfg.enable; # required for the default Hyprland config
-  wayland.windowManager.hyprland = lib.mkIf cfg.hyprland.enable {
+  wayland.windowManager.hyprland = lib.mkIf (cfg.enable && cfg.hyprland.enable) {
     enable = true;
     # set the flake package
     package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;

home/desktop/hyprland/animations.nix

@@ -1,5 +1,9 @@
+{ lib, nixosConfig, ... }:
+let
+  cfg = nixosConfig.my.desktop;
+in
 {
-  wayland.windowManager.hyprland = {
+  wayland.windowManager.hyprland = lib.mkIf (cfg.enable && cfg.hyprland.enable) {
     settings = {
       animations = {
         enabled = true;

home/desktop/hyprland/default.nix

@@ -0,0 +1,19 @@
+{ lib, ... }:
+let
+  b = builtins;
+
+  module_files =
+    b.readDir ./. |>
+    lib.filterAttrs (name: type:
+      ( (lib.strings.hasSuffix ".nix" name
+        && name != "default.nix"
+        && type == "regular" )
+      || ( type == "directory"
+        && b.pathExists ./${name}/default.nix))
+    ) |>
+    b.attrNames |>
+    b.map (f: ./${f});
+in
+{
+  imports = module_files;
+}

home/desktop/hyprland/execs.nix

@@ -1,10 +1,14 @@
+{ lib, nixosConfig, ... }:
+let
+  cfg = nixosConfig.my.desktop;
+in
 {
-  wayland.windowManager.hyprland = {
+  wayland.windowManager.hyprland = lib.mkIf (cfg.enable && cfg.hyprland.enable) {
     settings = {
       exec-once = [
-        "sleep 2; uwsm-app -- vesktop-portable"
+        "sleep 2; uwsm-app -- equibop"
         # todo openrgb
-        "sleep 5; uwsm-app -- spotify"
+        "sleep 10; uwsm-app -- spotify"
         # "uwsm-app -- dms run"
         "sleep 5; uwsm-app -- Artemis.UI.Linux --minimized"
         "sleep 10; bash /home/lilly/Scripts/rgb-on.sh"

home/desktop/hyprland/general.nix

@@ -1,8 +1,10 @@
+{ lib, nixosConfig, ... }:
+let
+  cfg = nixosConfig.my.desktop;
+in
 {
-  wayland.windowManager.hyprland =
-  {
-    settings = 
-    {
+  wayland.windowManager.hyprland = lib.mkIf (cfg.enable && cfg.hyprland.enable) {
+    settings = {
       general = {
         no_focus_fallback = true;
         allow_tearing = true;
@@ -14,7 +16,6 @@
         };
       };
 
-
       dwindle = {
         preserve_split = true;
         smart_split = false;
@@ -22,16 +23,19 @@
         # precise_mouse_move = true;
       };
 
-      render = {
-        cm_enabled = true;
-        cm_fs_passthrough = 2;
-        direct_scanout = 2;
-        cm_auto_hdr = 1;
-      };
+      source = [
+        "hdr.conf"
+      ];
+      # render = {
+      #   cm_enabled = true;
+      #   cm_fs_passthrough = 2;
+      #   direct_scanout = 2;
+      #   cm_auto_hdr = 1;
+      # };
 
-      quirks = {
-        prefer_hdr = 2;
-      };
+      # quirks = {
+      #   prefer_hdr = 1;
+      # };
 
       debug = {
         disable_logs = false;

home/desktop/hyprland/hypridle.nix

@@ -1,5 +1,9 @@
+{ lib, nixosConfig, ... }:
+let
+  cfg = nixosConfig.my.desktop;
+in
 {
-  services.hypridle = {
+  services.hypridle = lib.mkIf (cfg.enable && cfg.hyprland.enable) {
     enable = true;
     systemdTarget = "hyprland-session.target";
     settings = {

home/desktop/hyprland/input.nix

@@ -1,5 +1,9 @@
+{ lib, nixosConfig, ... }:
+let
+  cfg = nixosConfig.my.desktop;
+in
 {
-  wayland.windowManager.hyprland = {
+  wayland.windowManager.hyprland = lib.mkIf (cfg.enable && cfg.hyprland.enable) {
     settings =  {
       input = {
         kb_layout = "us";

home/desktop/hyprland/keybinds.nix

@@ -1,5 +1,9 @@
+{ lib, nixosConfig, ... }:
+let
+  cfg = nixosConfig.my.desktop;
+in
 {
-  wayland.windowManager.hyprland = {
+  wayland.windowManager.hyprland = lib.mkIf (cfg.enable && cfg.hyprland.enable) {
     settings = {
       "$mod" = "SUPER";
 

home/desktop/hyprland/misc.nix

@@ -1,5 +1,9 @@
+{ lib, nixosConfig, ... }:
+let
+  cfg = nixosConfig.my.desktop;
+in
 {
-  wayland.windowManager.hyprland = {
+  wayland.windowManager.hyprland = lib.mkIf (cfg.enable && cfg.hyprland.enable) {
     settings = {
       misc = {
         disable_hyprland_logo = true;

home/desktop/hyprland/monitors.nix

@@ -1,5 +1,9 @@
+{ lib, nixosConfig, ... }:
+let
+  cfg = nixosConfig.my.desktop;
+in
 {
-  wayland.windowManager.hyprland = {
+  wayland.windowManager.hyprland = lib.mkIf (cfg.enable && cfg.hyprland.enable) {
     settings = {
       monitor = [
         ",preferred,auto,1"

home/desktop/hyprland/rules/windows.nix

@@ -1,8 +1,12 @@
+{ lib, nixosConfig, ... }:
+let
+  cfg = nixosConfig.my.desktop;
+in
 {
-  wayland.windowManager.hyprland = {
+  wayland.windowManager.hyprland = lib.mkIf (cfg.enable && cfg.hyprland.enable) {
     settings = {
       "$games" = "^(steam_app_.*|gamescope|starrail.exe|.*\.exe)$";
-      "$launch_on_second_monitor" = "^(vesktop|spotify)$";
+      "$launch_on_second_monitor" = "^(vesktop|spotify|equibop)$";
       "$utility_workspace" = 10;
 
       windowrule = [

home/desktop/hyprland/rules/workspaces.nix

@@ -1,5 +1,9 @@
+{ lib, nixosConfig, ... }:
+let
+  cfg = nixosConfig.my.desktop;
+in
 {
-  wayland.windowManager.hyprland = {
+  wayland.windowManager.hyprland = lib.mkIf (cfg.enable && cfg.hyprland.enable) {
     settings = {
       "$altscreenworkspace" = "11";
       "$mainmonitor" = "GIGA-BYTE TECHNOLOGY CO. LTD. AORUS FO32U2 24210B000546";

home/desktop/hyprland/theme.nix

@@ -1,5 +1,9 @@
+{ lib, nixosConfig, ... }:
+let
+  cfg = nixosConfig.my.desktop;
+in
 {
-  wayland.windowManager.hyprland = {
+  wayland.windowManager.hyprland = lib.mkIf (cfg.enable && cfg.hyprland.enable) {
     settings = {
       general = {
           gaps_in = 5;

home/desktop/kitty.nix

@@ -1,12 +1,6 @@
-{
-  pkgs,
-  ...
-}: {
-  programs.kitty = {
+{ nixosConfig, lib, ... }: {
+  programs.kitty = lib.mkIf nixosConfig.my.desktop.enable {
     enable = true;
-
-    # Upstream test failures resolved; use default kitty package (>= 0.44).
-    package = pkgs.kitty;
     settings = {
       font_family = "Maple Mono NF";
       font_size = 11;

home/desktop/nixcord.nix

@@ -1,31 +1,27 @@
-{ pkgs, username, ... }:
-{
-  home.packages = [
-    (pkgs.writeShellScriptBin "vesktop-portable" ''
-      exec /home/${username}/vesktop/vesktop --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --enable-blink-features=MiddleClickAutoscroll "$@"
-    '')
-  ];
-  xdg.desktopEntries.vesktop = {
-    name = "Vesktop";
-    genericName = "Discord Client";
-    exec = "vesktop-portable %U";
-    icon = "vesktop";
-    terminal = false;
-    categories = [ "Network" "InstantMessaging" "Chat" ];
-  };
 
-  programs.vesktop = {
+{ nixosConfig, lib, ... }:
+let
+  cfg = nixosConfig.my.desktop.nixcord;
+in
+{
+  config = lib.mkIf cfg.enable {
+    programs.nixcord = {
+      enable = true;          # Enable Nixcord (It also installs Discord)
+      discord = {
+        vencord.enable = false;  # Use Vencord (default)
+        equicord.enable = true;  # Or use Equicord instead (cannot enable both)
+      };
+      vesktop.enable = false;  # Vesktop
+      equibop = {
         enable = true;
-    package = pkgs.vesktop.override {
-      withMiddleClickScroll = true;
+      };  # Equibop
+      dorion.enable = false;   # Dorion
+      quickCss = "@import url(\"https://catppuccin.github.io/discord/dist/catppuccin-mocha-mauve.theme.css\");";  # quickCSS file
+      config = {
+        useQuickCss = true;   # use out quickCSS
+        frameless = true;                   # Set some Vencord/Equicord options
       };
-    settings = {
-      arRPC = true;
-      tray = true;
-      minimizeToTray = true;
-    };
-    vencord = {
-      settings = {
+      equibopConfig = {
         plugins = {
           AlwaysTrust.enabled = true;
           BetterSessions.enabled = true;
@@ -67,7 +63,7 @@
           NoUnblockToJump.enabled = true;
           OnePingPerDm.enabled = true;
           OpenInApp.enabled = true;
-          petpet.enabled = true;
+          PetPet.enabled = true;
           ReadAllNotificationsButton.enabled = true;
           RelationshipNotifier.enabled = true;
           ReverseImageSearch.enabled = true;
@@ -75,7 +71,10 @@
           ServerListIndicators.enabled = false;
           ShowHiddenChannels.enabled = true;
           ShowHiddenThings.enabled = true;
-          SpotifyControls.enabled = true;
+          MusicControls = {
+            enabled = true;
+            showSpotifyControls = true;
+          };
           ThemeAttributes.enabled = true;
           TypingIndicator.enabled = true;
           TypingTweaks.enabled = true;
@@ -97,7 +96,15 @@
           Settings.enabled = true;
           SupportHelper.enabled = true;
           WebContextMenus.enabled = true;
+          "WebRichPresence (arRPC)".enabled = true;
+          KeyboardSounds = {
+            enabled = false;
+            soundPack = "operagxnoch ";
           };
+          HomeTyping.enabled = true;
+        };
+      };
+      extraConfig = {
       };
     };
   };

home/desktop/spicetify.nix

@@ -0,0 +1,37 @@
+{ inputs, pkgs, nixosConfig, lib, ... }:
+let
+  cfg = nixosConfig.my.desktop.spicetify;
+in
+{
+  imports = [
+    inputs.spicetify-nix.homeManagerModules.default
+  ];
+  config = lib.mkIf cfg.enable {
+    programs.spicetify =
+    let
+      spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
+    in
+    {
+      enable = true;
+
+      enabledExtensions = with spicePkgs.extensions; [
+        hidePodcasts
+        shuffle # shuffle+ (special characters are sanitized out of extension names)
+        betterGenres
+        lastfm
+        adblock
+        beautifulLyrics
+        aiBandBlocker
+      ];
+      enabledCustomApps = with spicePkgs.apps; [
+        betterLibrary
+        newReleases
+      ];
+      enabledSnippets = with spicePkgs.snippets; [
+        pointer
+      ];
+      theme = spicePkgs.themes.catppuccin;
+      colorScheme = "mocha";
+    };
+  };
+}

home/desktop/thunderbird.nix

@@ -0,0 +1,11 @@
+{ nixosConfig, lib, ... }:
+{
+  programs.thunderbird = lib.mkIf nixosConfig.my.desktop.enable {
+    enable = true;
+    profiles = {
+      default = {
+        isDefault = true;
+      };
+    };
+  };
+}

home/desktop/vscode.nix

@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ pkgs, nixosConfig, lib, ... }:
 {
-  programs.vscode = {
+  programs.vscode = lib.mkIf nixosConfig.my.desktop.enable {
     enable = true;
     profiles.default.extensions = with pkgs.vscode-extensions; [
       jnoortheen.nix-ide

home/desktop/zen-browser.nix

@@ -0,0 +1,100 @@
+{ inputs, pkgs, nixosConfig, lib, ... }:
+{
+  imports = [
+    inputs.zen-browser.homeModules.beta
+  ];
+  config = lib.mkIf nixosConfig.my.desktop.enable {
+    home.file."catppuccin-zen" = {
+      target = ".zen/default/chrome/catppuccin-zen";
+      source = (
+        fetchTarball {
+          url = "https://github.com/catppuccin/zen-browser/tarball/c855685442c6040c4dda9c8d3ddc7b708de1cbaa";
+          sha256 = "sha256:03ky8s5h9vkw4cp3nm86b0bk5qbjmqgyqq9a95xqzard4wppn3p4";
+        });
+    };
+    programs.zen-browser = {
+      enable = true;
+      nativeMessagingHosts = [pkgs.firefoxpwa];
+      policies = {
+        AutofillAddressEnabled = false;
+        AutofillCreditCardEnabled = false;
+        DisableAppUpdate = true;
+        DisableFeedbackCommands = true;
+        DisableFirefoxStudies = true;
+        DisablePocket = true;
+        DisableTelemetry = true;
+        DontCheckDefaultBrowser = true;
+        NoDefaultBookmarks = true;
+        OfferToSaveLogins = false;
+        EnableTrackingProtection = {
+          Value = true;
+          Locked = true;
+          Cryptomining = true;
+          Fingerprinting = true;
+        };
+      };
+      profiles.default.settings = {
+        "zen.view.use-single-toolbar" = false;
+        "zen.urlbar.replace-newtab" = false;
+        "identity.fxaccounts.autoconfig.uri" = "https://www.fxa.hibana.me";
+        "general.autoScroll" = true;
+        "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
+      };
+      profiles.default.extensions.packages = 
+        with inputs.firefox-addons.packages.${pkgs.stdenv.hostPlatform.system}; [
+          ublock-origin
+          dearrow
+          bitwarden
+          istilldontcareaboutcookies
+          return-youtube-dislikes
+          sponsorblock
+          youtube-nonstop
+          youtube-high-definition
+          absolute-enable-right-click
+          augmented-steam
+          clearurls
+          darkreader
+          karakeep
+          newtab-adapter
+          steam-database
+          unpaywall
+          violentmonkey
+      ];
+      profiles.default.userChrome = ''
+        @import "catppuccin-zen/themes/Mocha/Mauve/userChrome.css";
+      '';
+      profiles.default.userContent = ''
+        @import "catppuccin-zen/themes/Mocha/Mauve/userContent.css";
+      '';
+    };
+    xdg.mimeApps = let
+      value = let
+        zen-browser = inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.beta; # or twilight
+      in
+        zen-browser.meta.desktopFileName;
+
+      associations = builtins.listToAttrs (map (name: {
+          inherit name value;
+        }) [
+          "application/x-extension-shtml"
+          "application/x-extension-xhtml"
+          "application/x-extension-html"
+          "application/x-extension-xht"
+          "application/x-extension-htm"
+          "x-scheme-handler/unknown"
+          "x-scheme-handler/mailto"
+          "x-scheme-handler/chrome"
+          "x-scheme-handler/about"
+          "x-scheme-handler/https"
+          "x-scheme-handler/http"
+          "application/xhtml+xml"
+          "application/json"
+          "text/plain"
+          "text/html"
+        ]);
+    in {
+      associations.added = associations;
+      defaultApplications = associations;
+    };
+  };
+}

home/gaming/default.nix

@@ -1,5 +1,19 @@
-_: {
-  imports = [
-    ./mangohud.nix
-  ];
+{ lib, ... }:
+let
+  b = builtins;
+
+  module_files =
+    b.readDir ./. |>
+    lib.filterAttrs (name: type:
+      ( (lib.strings.hasSuffix ".nix" name
+        && name != "default.nix"
+        && type == "regular" )
+      || ( type == "directory"
+        && b.pathExists ./${name}/default.nix))
+    ) |>
+    b.attrNames |>
+    b.map (f: ./${f});
+in
+{
+  imports = module_files;
 }

home/gaming/mangohud.nix

@@ -1,5 +1,6 @@
+{ nixosConfig, lib, ... }:
 {
-  programs.mangohud = {
+  programs.mangohud = lib.mkIf nixosConfig.my.desktop.gaming.enable {
     enable = true;
   };
 }

home/general.nix

@@ -1,8 +1,3 @@
-{ pkgs, ...}:
 {
-  services.gnome-keyring.enable = true;
-  services.easyeffects = {
-    enable = true;
-  };
-  home.packages = [ pkgs.gcr ]; # Provides org.gnome.keyring.SystemPrompter
+  nixpkgs.config.allowUnfree = true;
 }

home/spicetify.nix

@@ -1,33 +0,0 @@
-{ inputs, pkgs, ... }:
-{
-  imports = [
-    inputs.spicetify-nix.homeManagerModules.default
-  ];
-  programs.spicetify =
-  let
-    spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
-  in
-  {
-    enable = true;
-
-    enabledExtensions = with spicePkgs.extensions; [
-      hidePodcasts
-      shuffle # shuffle+ (special characters are sanitized out of extension names)
-      betterGenres
-      lastfm
-      adblock
-      beautifulLyrics
-      aiBandBlocker
-    ];
-    enabledCustomApps = with spicePkgs.apps; [
-      lyricsPlus
-      betterLibrary
-      newReleases
-    ];
-    enabledSnippets = with spicePkgs.snippets; [
-      pointer
-    ];
-    theme = spicePkgs.themes.catppuccin;
-    colorScheme = "mocha";
-  };
-}

home/terminal/default.nix

@@ -16,5 +16,4 @@ let
 in
 {
   imports = module_files;
-  nixpkgs.config.allowUnfree = true;
 }

home/terminal/fish.nix

@@ -1,12 +1,9 @@
-{
-  pkgs,
-  host,
-  ...
-}: {
-  programs.fish = {
+{ pkgs, host, nixosConfig, lib, ... }: {
+  programs.fish = lib.mkIf nixosConfig.my.desktop.enable {
     enable = true;
     shellAliases = {
-      fr = "sudo nixos-rebuild switch --flake ~/LillyOS/#${host}";
+      fr = "sudo nixos-rebuild switch --flake ~/LillyOS/#${host} --fallback";
+      br = "sudo nixos-rebuild boot --flake ~/LillyOS/#${host} --fallback";
     };
     interactiveShellInit = ''
       set fish_greeting # Disable greeting

home/terminal/git.nix

@@ -1,4 +1,4 @@
-{ email, prettyUsername, ... }:
+{ email, prettyUsername, username, ... }:
 {
   programs.git = {
     enable = true;
@@ -17,6 +17,9 @@
       log.date = "iso"; # ISO 8601 date format
       # Conflict resolution style for readable diffs
       merge.conflictStyle = "diff3";
+      safe = {
+        directory = [ "/home/${username}/LillyOS" "/home/${username}/.config" ];
+      };
     };
   };
 }

home/terminal/zoxide.nix

@@ -1,9 +1,10 @@
-_: {
+{
   programs = {
     zoxide = {
       enable = true;
       enableZshIntegration = true;
       enableBashIntegration = true;
+      enableFishIntegration = true;
       options = [
         "--cmd cd"
       ];

home/xdg-config/default.nix

@@ -16,5 +16,4 @@ let
 in
 {
   imports = module_files;
-  nixpkgs.config.allowUnfree = true;
 }

home/xdg-config/electron-flags.nix

@@ -1,10 +1,12 @@
+{ nixosConfig, lib, ... }:
 {
+  config = lib.mkIf nixosConfig.my.desktop.enable {
     xdg.configFile."electron-flags.conf".text = ''
 --enable-features=WaylandWindowDecorations
 --ozone-platform-hint=wayland
 --enable-blink-features=MiddleClickAutoscroll
 --ozone-platform=wayland
-  '';
+'';
     xdg.configFile."code-flags.conf".text = '' 
 --ozone-platform-hint=wayland
 --ozone-platform=wayland
@@ -13,5 +15,6 @@
 --enable-features=TouchpadOverscrollHistoryNavigation
 --enable-wayland-ime
 --password-store=gnome-libsecret
-  '';
+'';
+  };
 }

home/xdg-config/mime.nix

@@ -1,3 +1,4 @@
+{ nixosConfig, lib, ... }:
 let
   gwenview_desktop_file = "org.kde.gwenview.desktop";
 in
@@ -7,7 +8,8 @@ in
     };
   in
   {
-    xdg.mimeApps = {
+    xdg.mimeApps = lib.mkIf nixosConfig.my.desktop.enable {
+      enable = true;
       associations.added = associations;
       defaultApplications = associations;
     };

home/xdg-config/uwsm-env.nix

@@ -1,5 +1,6 @@
+{ nixosConfig, lib, ... }:
 {
-  xdg.configFile."uwsm/env".text = ''
+  xdg.configFile."uwsm/env".text = lib.mkIf nixosConfig.my.desktop.enable ''
 export GDK_BACKEND=wayland,x11,*
 export GDK_SCALE=2 # GDK Scaling Factor (no fractional scaling)
 
@@ -22,7 +23,6 @@ export QS_ICON_THEME=Papirus-Dark
 
 export LIBVA_DRIVER_NAME=nvidia
 export __GLX_VENDOR_LIBRARY_NAME=nvidia
-export XDG_SESSION_DESKTOP=Hyprland
 export GBM_BACKEND=nvidia-drm
 export TERMINAL=kitty
 
@@ -33,8 +33,10 @@ export EDITOR=code
 export STLEDITOR=code
 
 export XCURSOR_SIZE=16
+
+${lib.optionalString nixosConfig.my.desktop.hyprland.enable "export XDG_SESSION_DESKTOP=Hyprland"}
   '';
-  xdg.configFile."uwsm/env-hyprland".text = ''
+  xdg.configFile."uwsm/env-hyprland".text = lib.mkIf nixosConfig.my.desktop.hyprland.enable ''
 export AQ_DRM_DEVICES=/dev/dri/nvidia-dgpu
   '';
 }

home/xdg-config/xdg.nix

@@ -0,0 +1,24 @@
+{ pkgs, inputs, nixosConfig, lib, ...}:
+let
+  cfg = nixosConfig.my.desktop;
+in
+{
+  xdg = {
+    enable = true;
+    mime.enable = cfg.enable;
+    mimeApps.enable = cfg.enable;
+    portal = lib.mkIf cfg.enable {
+      enable = true;
+      extraPortals = [
+        pkgs.xdg-desktop-portal-gtk
+      ]
+      ++ lib.optionalAttrs cfg.hyprland.enable [
+        inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland
+      ];
+      configPackages = []
+      ++ lib.optionalAttrs cfg.hyprland.enable [
+        inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland
+      ];
+    };
+  };
+}

home/xdg.nix

@@ -1,17 +0,0 @@
-{ pkgs, inputs, ...}:
-
-{
-  xdg = {
-    enable = true;
-    mime.enable = true;
-    mimeApps.enable = true;
-    portal = {
-      enable = true;
-      extraPortals = [
-        inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland
-        pkgs.xdg-desktop-portal-gtk
-      ];
-      configPackages = [inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland];
-    };
-  };
-}

home/zen-browser.nix

@@ -1,98 +0,0 @@
-{ inputs, pkgs, ... }:
-{
-  imports = [
-    inputs.zen-browser.homeModules.beta
-  ];
-  home.file."catppuccin-zen" = {
-    target = ".zen/default/chrome/catppuccin-zen";
-    source = (
-      fetchTarball {
-        url = "https://github.com/catppuccin/zen-browser/tarball/c855685442c6040c4dda9c8d3ddc7b708de1cbaa";
-        sha256 = "sha256:03ky8s5h9vkw4cp3nm86b0bk5qbjmqgyqq9a95xqzard4wppn3p4";
-      });
-  };
-  programs.zen-browser = {
-    enable = true;
-    nativeMessagingHosts = [pkgs.firefoxpwa];
-    policies = {
-      AutofillAddressEnabled = false;
-      AutofillCreditCardEnabled = false;
-      DisableAppUpdate = true;
-      DisableFeedbackCommands = true;
-      DisableFirefoxStudies = true;
-      DisablePocket = true;
-      DisableTelemetry = true;
-      DontCheckDefaultBrowser = true;
-      NoDefaultBookmarks = true;
-      OfferToSaveLogins = false;
-      EnableTrackingProtection = {
-        Value = true;
-        Locked = true;
-        Cryptomining = true;
-        Fingerprinting = true;
-      };
-    };
-    profiles.default.settings = {
-      "zen.view.use-single-toolbar" = false;
-      "zen.urlbar.replace-newtab" = false;
-      "identity.fxaccounts.autoconfig.uri" = "https://www.fxa.hibana.me";
-      "general.autoScroll" = true;
-      "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
-    };
-    profiles.default.extensions.packages = 
-      with inputs.firefox-addons.packages.${pkgs.stdenv.hostPlatform.system}; [
-        ublock-origin
-        dearrow
-        bitwarden
-        istilldontcareaboutcookies
-        return-youtube-dislikes
-        sponsorblock
-        youtube-nonstop
-        youtube-high-definition
-        absolute-enable-right-click
-        augmented-steam
-        clearurls
-        darkreader
-        karakeep
-        newtab-adapter
-        steam-database
-        unpaywall
-        violentmonkey
-    ];
-    profiles.default.userChrome = ''
-      @import "catppuccin-zen/themes/Mocha/Mauve/userChrome.css";
-    '';
-    profiles.default.userContent = ''
-      @import "catppuccin-zen/themes/Mocha/Mauve/userContent.css";
-    '';
-  };
-  xdg.mimeApps = let
-    value = let
-      zen-browser = inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.beta; # or twilight
-    in
-      zen-browser.meta.desktopFileName;
-
-    associations = builtins.listToAttrs (map (name: {
-        inherit name value;
-      }) [
-        "application/x-extension-shtml"
-        "application/x-extension-xhtml"
-        "application/x-extension-html"
-        "application/x-extension-xht"
-        "application/x-extension-htm"
-        "x-scheme-handler/unknown"
-        "x-scheme-handler/mailto"
-        "x-scheme-handler/chrome"
-        "x-scheme-handler/about"
-        "x-scheme-handler/https"
-        "x-scheme-handler/http"
-        "application/xhtml+xml"
-        "application/json"
-        "text/plain"
-        "text/html"
-      ]);
-  in {
-    associations.added = associations;
-    defaultApplications = associations;
-  };
-}

hosts/lillypc/config.nix

@@ -1,24 +1,19 @@
 {
   my = {
 
-    gaming.enable = true;
-
     cachyosKernel.enable = true;
 
     desktop = {
       enable = true;
-      sddm = {
-        enable = true;
-        autoLogin.enable = true;
-      };
       hyprland.enable = true;
       flatpak.enable = true;
+      spicetify.enable = true;
+      nixcord.enable = true;
+      gaming.enable = true;
     };
 
     nvidia.enable = true;
     openlinkhub.enable = true;
     rgb.enable = true;
   };
-  openlinkhub.enable = true;
-  virtualisation.docker.enable = true;
 }

hosts/lillypc/gitwatch.nix

@@ -20,20 +20,21 @@
       "EXCLUDE_PATTERN" = "";
       "GIT_BRANCH" = "main";
       "GIT_REMOTE" = "origin";
-      "GIT_WATCH_DIR" = "/app/LillyOS";
+      "GIT_WATCH_DIR" = "/home/lilly/LillyOS";
       "PULL_BEFORE_PUSH" = "true";
       "SKIP_IF_MERGING" = "false";
-      "SLEEP_TIME" = "10";
+      "SLEEP_TIME" = "2";
       "VERBOSE" = "false";
     };
     volumes = [
-      "${/home/lilly/.config/git/config}:/root/.gitconfig:ro"
+      "/home/lilly/.config/git/config:/root/.gitconfig:ro"
+      "/home/lilly/.ssh/known_hosts:/root/.ssh/known_hosts"
       "/home/lilly/.ssh/id_ed25519:/root/.ssh/id_ed25519:ro"
-      "/home/lilly/LillyOS:/app/LillyOS:rw"
+      "/home/lilly/LillyOS:/home/lilly/LillyOS:rw"
     ];
     log-driver = "journald";
     extraOptions = [
-      "--network-alias=gitwatch"
+      "--network-alias=gitwatch-LillyOS"
       "--network=gitwatch_default"
     ];
   };
@@ -58,6 +59,54 @@
     ];
   };
 
+  virtualisation.oci-containers.containers."gitwatch-lilly-config" = {
+    image = "ghcr.io/gitwatch/gitwatch:latest";
+    environment = {
+      "COMMIT_MSG" = "Auto-commit: %d";
+      "COMMIT_ON_START" = "false";
+      "DATE_FMT" = "+%Y-%m-%d %H:%M:%S";
+      "EXCLUDE_PATTERN" = "vesktop/sessionData/*, Code/User/History/*";
+      "GIT_BRANCH" = "main";
+      "GIT_REMOTE" = "origin";
+      "GIT_WATCH_DIR" = "/home/lilly/.config";
+      "PULL_BEFORE_PUSH" = "true";
+      "SKIP_IF_MERGING" = "false";
+      "SLEEP_TIME" = "60";
+      "VERBOSE" = "false";
+    };
+    volumes = [
+      "/home/lilly/.config/git/config:/root/.gitconfig:ro"
+      "/home/lilly/.ssh/known_hosts:/root/.ssh/known_hosts"
+      "/home/lilly/.ssh/id_ed25519:/root/.ssh/id_ed25519:ro"
+      "/home/lilly/.config:/home/lilly/.config:rw"
+    ];
+    log-driver = "journald";
+    extraOptions = [
+      "--network-alias=gitwatch-lilly-config"
+      "--network=gitwatch_default"
+    ];
+  };
+  systemd.services."docker-gitwatch-lilly-config" = {
+    serviceConfig = {
+      Restart = lib.mkOverride 90 "always";
+      RestartMaxDelaySec = lib.mkOverride 90 "1m";
+      RestartSec = lib.mkOverride 90 "100ms";
+      RestartSteps = lib.mkOverride 90 9;
+    };
+    after = [
+      "docker-network-gitwatch_default.service"
+    ];
+    requires = [
+      "docker-network-gitwatch_default.service"
+    ];
+    partOf = [
+      "docker-compose-gitwatch-root.target"
+    ];
+    wantedBy = [
+      "docker-compose-gitwatch-root.target"
+    ];
+  };
+
   # Networks
   systemd.services."docker-network-gitwatch_default" = {
     path = [ pkgs.docker ];

hosts/lillypc/hardware.nix

@@ -14,13 +14,13 @@
   fileSystems."/" =
     { device = "/dev/disk/by-uuid/8ef1b753-7a4a-4062-a906-6a01ce7b6111";
       fsType = "btrfs";
-      options = [ "subvol=@" "rw" "relatime" "compress=zstd:3" "ssd" "discard=async" "space_cache=v2" ];
+      options = [ "subvol=@" "rw" "relatime" "compress=zstd:3" "ssd" "space_cache=v2" ];
     };
 
   fileSystems."/home" =
     { device = "/dev/disk/by-uuid/8ef1b753-7a4a-4062-a906-6a01ce7b6111";
       fsType = "btrfs";
-      options = [ "subvol=@home" "rw" "relatime" "compress=zstd:3" "ssd" "discard=async" "space_cache=v2" ];
+      options = [ "subvol=@home" "rw" "relatime" "compress=zstd:3" "ssd" "space_cache=v2" ];
     };
 
   fileSystems."/boot" =
@@ -32,7 +32,7 @@
   fileSystems."/data" =
     { device = "/dev/disk/by-uuid/5c58c3c4-2ce8-4ad9-8277-ff7503462f88";
       fsType = "btrfs";
-      options = [ "rw" "relatime" "compress=zstd:3" "ssd" "discard=async" "space_cache=v2" ];
+      options = [ "rw" "relatime" "compress=zstd:3" "ssd" "space_cache=v2" ];
     };
 
   swapDevices =

hosts/lillypc/openrgb.nix

@@ -1,5 +1,6 @@
+{ lib, config, ... }:
 {
-  systemd.tmpfiles.rules = [
+  systemd.tmpfiles.rules = lib.mkIf config.my.rgb.enable [
     "L+ /var/lib/OpenRGB/sizes.ors - - - - ${./openrgb/sizes.ors}"
   ];
 }

hosts/lillyserver/config.nix

@@ -0,0 +1,29 @@
+{
+  my = {
+
+    cachyosKernel.enable = false;
+
+    desktop = {
+      enable = true;
+      hyprland.enable = false;
+      kdePlasma.enable = true;
+      flatpak.enable = true;
+      spicetify.enable = false;
+      nixcord.enable = false;
+      gaming.enable = true;
+    };
+
+    nvidia.enable = true;
+    openlinkhub.enable = false;
+    rgb.enable = false;
+    cockpit.enable = true;
+    virtualisation.enable = true;
+    amd = {
+      boost.disable = true;
+      performancePreference = "power";
+    };
+    gpu = {
+      powersave = true;
+    };
+  };
+}

hosts/lillyserver/default.nix

@@ -0,0 +1,19 @@
+{ lib, ... }:
+let
+  b = builtins;
+
+  module_files =
+    b.readDir ./. |>
+    lib.filterAttrs (name: type:
+      ( (lib.strings.hasSuffix ".nix" name
+        && name != "default.nix"
+        && type == "regular" )
+      || ( type == "directory"
+        && b.pathExists ./${name}/default.nix))
+    ) |>
+    b.attrNames |>
+    b.map (f: ./${f});
+in
+{
+  imports = module_files;
+}

hosts/lillyserver/network.nix

@@ -0,0 +1,51 @@
+{
+  systemd.network = {
+
+    netdevs = {
+
+      iot = {
+        netdevConfig = {
+          Name = "iot";
+          Kind = "vlan";
+        };
+        vlanConfig.Id = "2";
+      };
+
+      macvtaphost = {
+        netdevConfig = {
+          Name = "macvtaphost";
+          Kind = "macvtap";
+          MACAddress = "18:C0:4D:04:DE:0B";
+        };
+        extraConfig = ''
+[MACVTAP]
+Mode=bridge
+        '';
+      };
+    };
+
+    networks = {
+
+      physicalinterface = {
+        matchConfig.PermanentMACAddress = "18:C0:4D:04:DE:0B";
+        linkConfig.MACAddress = "18:C0:4D:04:DE:0C";
+        macvtap = [ "macvtaphost" ];
+        vlan = [ "iot" ];
+        networkConfig.IPv6AcceptRA = false;
+      };
+
+      macvtaphost = {
+        name = "macvtaphost";
+        address = [ "10.0.10.5/16" ];
+        DHCP = "ipv6";
+        DNS = [ "10.0.0.1" ];
+        Gateway = [ "10.0.0.1" ];
+        networkConfig = {
+          IPv6AcceptRA = true;
+        };
+        dhcpV4Config.UseDNS = false;
+        dhcpV6Config.UseDNS = false;
+      };
+    };
+  };
+}

hosts/lillyserver/samba-shares.nix

@@ -0,0 +1,59 @@
+{
+  services.samba = {
+    enable = true;
+    openFirewall = true;
+    smbd.enable = true;
+    settings = ''
+[global]
+workgroup = LILLY
+server string = LillyServer Samba
+server role = standalone server
+log file = /var/log/samba/%m.log
+max log size = 50
+
+[LillyNAS]
+  path = /mnt/lilly-storage/LillyNAS
+  guest ok = no
+  comment = 
+  read only = no
+  shadow:snapdir = .zfs/snapshot
+  shadow:sort = desc
+  shadow:format = %Y-%m-%d-%H%M%S
+  valid users = "@lilly" "lilly"
+  vfs objects = shadow_copy2
+  browseable = no
+
+[LillyPhoneSync]
+	path = /mnt/lilly-storage/LillyPhoneSync
+	guest ok = no
+	comment = Phone Data Sync
+	valid users = "lilly"
+	read only = no
+	browseable = no
+
+[PaperlessConsume]
+	path = /mnt/lilly-storage/PaperlessConsume
+	guest ok = no
+	comment = 
+	read only = no
+	browseable = no
+	valid users = "lilly" "paperless-consume"
+
+[3D-Printing]
+	path = /mnt/lilly-storage/3D-Printing
+	guest ok = no
+	comment = 
+	valid users = "lilly"
+	read only = no
+	browseable = no
+
+[Media]
+	path = /mnt/lilly-storage/Media
+	guest ok = no
+	comment = 
+	valid users = "lilly"
+	read only = no
+	browseable = no
+'';
+  };
+}

hosts/lillyserver/systemd.nix

@@ -0,0 +1,83 @@
+{ pkgs, ... }:
+let
+  crowdsec-service = "crowdsec-prefix";
+  tailscale-cloudflare-dns-sync-service = "tailscale-cloudflare-dns-sync";
+  certbot-generic-cert-service = "certbot-renew";
+in
+{
+  systemd.services = {
+
+    ${crowdsec-service} = {
+      enable = true;
+      description = "Get IPv6 Prefix to add to Crowdsec Whitelist";
+      serviceConfig = {
+        Type = "oneshot";
+        ExecStart = "/mnt/lilly-ssd/appdata/crowdsec/crowdsec-prefix-change-script/checkprefix.sh";
+        WorkingDirectory = "/mnt/lilly-ssd/appdata/crowdsec/crowdsec-prefix-change-script";
+      };
+    };
+
+    ${tailscale-cloudflare-dns-sync-service} = {
+      enable = true;
+      description = "Start the tailscale-cloudflare-dns-sync Docker container";
+      serviceConfig = {
+        Type = "oneshot";
+        ExecStart = "${pkgs.docker}/bin/docker start tailscale-cloudflare-dns-sync";
+      };
+    };
+
+    ${certbot-generic-cert-service} = {
+      enable = true;
+      description = "Renew Let's Encrypt certificates using Certbot in Docker";
+      after = [ "network-online.target" ];
+      wants = [ "network-online.target" ];
+      serviceConfig = {
+        Type = "oneshot";
+        ExecStart = ''${pkgs.docker}/bin/docker \
+          run --rm --name certbot-renew \
+          -v /mnt/lilly-ssd/secrets/certificates/etc:/etc/letsencrypt \
+          -v /mnt/lilly-ssd/secrets/certificates/var:/var/lib/letsencrypt \
+          -v /mnt/lilly-ssd/secrets/certificates/cf-credentials:/cf-credentials:ro \
+          -v /mnt/lilly-ssd/secrets/certificates/id_ed25519_certshare:/openwrt_private_key:ro \
+          certbot/dns-cloudflare renew \
+          --dns-cloudflare \
+          --dns-cloudflare-credentials /cf-credentials
+        '';
+      };
+    };
+  };
+
+  systemd.timers = {
+
+    ${crowdsec-service} = {
+      enable = true;
+      description = "Run Crowdsec-Prefix check regularly.";
+      timerConfig = {
+        OnCalendar = "*:0/5";
+        Persistent = true;
+      };
+      wantedBy = [ "timers.target" ];
+    };
+    
+    ${tailscale-cloudflare-dns-sync-service} = {
+      enable = true;
+      description = "Run tailscale-cloudflare-dns-sync every 10 minutes";
+      timerConfig = {
+        OnBootSec = "10min";
+        OnUnitActiveSec = "10min";
+        Persistent = true;
+      };
+      wantedBy = [ "timers.target" ];
+    };
+    
+    ${certbot-generic-cert-service} = {
+      enable = true;
+      description = "Weekly renewal of Let's Encrypt certificates";
+      timerConfig = {
+        OnCalendar = "weekly";
+        Persistent = true;
+      };
+      wantedBy = [ "timers.target" ];
+    };
+  };
+}

modules/cli/packages.nix

@@ -32,5 +32,8 @@
     p7zip
     curl
     jq
+    lsb-release
+    file
+    pkg-config
   ];
 }

modules/cli/ssh.nix

@@ -0,0 +1,4 @@
+{
+  # Enable the OpenSSH daemon.
+  services.openssh.enable = true;
+}

modules/core/amd-cpu-tweaks.nix

@@ -0,0 +1,8 @@
+{ config, lib, ... }:
+{
+  systemd.tmpfiles.rules = [
+    "w /sys/devices/system/cpu/cpu*/cpufreq/energy_performance_preference - - - - ${config.my.amd.performancePreference}"
+  ]
+  ++ lib.optionals config.my.amd.boost.disable 
+  [ "w /sys/devices/system/cpu/cpufreq/boost - - - - 0" ];
+}

modules/core/default.nix

@@ -0,0 +1,19 @@
+{ lib, ... }:
+let
+  b = builtins;
+
+  module_files =
+    b.readDir ./. |>
+    lib.filterAttrs (name: type:
+      ( (lib.strings.hasSuffix ".nix" name
+        && name != "default.nix"
+        && type == "regular" )
+      || ( type == "directory"
+        && b.pathExists ./${name}/default.nix))
+    ) |>
+    b.attrNames |>
+    b.map (f: ./${f});
+in
+{
+  imports = module_files;
+}

modules/core/gpu-powersave.nix

@@ -0,0 +1,6 @@
+{ config, lib, ... }:
+{
+  systemd.tmpfiles.rules = lib.mkIf config.my.gpu.powersave [
+    "w /sys/module/pcie_aspm/parameters/policy - - - - powersave"
+  ];
+}

modules/core/hardware.nix

@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{pkgs, config, lib, ...}: {
   hardware = {
     sane = {
       enable = true;
@@ -7,11 +7,11 @@
     };
     logitech.wireless.enable = true;
     logitech.wireless.enableGraphical = true;
-    graphics = {
+    graphics = lib.mkIf config.my.desktop.enable {
       enable = true;
       enable32Bit = true;
     };
-    amdgpu.opencl.enable = true;
+    amdgpu.opencl.enable = config.my.desktop.enable;
     enableRedistributableFirmware = true;
     keyboard.qmk.enable = true;
     bluetooth.enable = true;

modules/core/ld.nix

@@ -0,0 +1,40 @@
+{ pkgs, config, lib, ... }:
+let
+  cfg = config.my;
+in
+{
+  programs.nix-ld = lib.mkIf (cfg.rgb.enable || cfg.openlinkhub.enable ) {
+    enable = true;
+    libraries = with pkgs; [
+      stdenv.cc.cc
+      glibc
+      xorg.libX11
+      xorg.libXcursor
+      xorg.libXrandr
+      xorg.libXinerama
+      xorg.libXi
+      wayland
+      libGL
+      libdrm
+      alsa-lib
+      pulseaudio
+      glib
+      nspr.out
+      nss.out
+      dbus.lib
+      at-spi2-atk
+      cups.lib
+      cairo.out
+      gtk3.out
+      pango.out
+      libxcomposite.out
+      libxdamage.out
+      libxext.out
+      libxfixes.out
+      libgbm.out
+      expat.out
+      libxcb.out
+      libxkbcommon.out
+    ];
+  };
+}

modules/core/network.nix

@@ -0,0 +1,38 @@
+{ options, host, lib, ... }:
+{
+  networking = {
+    hostName = "${host}";
+    networkmanager.enable = false;
+    useNetworkd = true;
+    timeServers = options.networking.timeServers.default ++ ["pool.ntp.org"];
+    dhcpcd.enable = false;
+    firewall = {
+      enable = lib.mkDefault false;
+      autoLoadConntrackHelpers = true;
+    };
+    nftables.enable = true;
+  };
+  boot.initrd.systemd = {
+    network.enable = true;
+    
+  };
+  systemd.network.enable = true;
+  services.resolved = {
+    enable = true;
+    fallbackDns = [
+      "2a07:a8c0::18:7be4"
+      "2a07:a8c1::18:7be4"
+      "79.198.199.184"
+    ];
+  };
+  services.tailscale = {
+    enable = true;
+    useRoutingFeatures = "both";
+    openFirewall = true;
+    extraSetFlags = [
+      "--ssh"
+      "--accept-dns=false"
+      "--accept-routes"
+    ];
+  };
+}

modules/core/nvidia.nix

@@ -1,9 +1,4 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
+{ config, pkgs, lib, ... }:
 let
   cfg = config.my;
 in
@@ -15,9 +10,18 @@ in
       powerManagement.enable = true;
       powerManagement.finegrained = false;
       open = true;
-      nvidiaSettings = cfg.desktop.enable;
+      nvidiaSettings = true;
       # Optionally, you may need to select the appropriate driver version for your specific GPU.
-      package = config.boot.kernelPackages.nvidiaPackages.stable;
+      package = config.boot.kernelPackages.nvidiaPackages.beta;
+  # package =
+  #   config.boot.kernelPackages.nvidiaPackages.mkDriver {
+  #     version = "590.48.01";
+  #     sha256_64bit = "sha256-ueL4BpN4FDHMh/TNKRCeEz3Oy1ClDWto1LO/LWlr1ok=";
+  #     sha256_aarch64 = "sha256-xctt4TPRlOJ6r5S54h5W6PT6/3Zy2R4ASNFPu8TSHKM=";
+  #     openSha256 = "sha256-ZpuVZybW6CFN/gz9rx+UJvQ715FZnAOYfHn5jt5Z2C8=";
+  #     settingsSha256 = "sha256-ZpuVZybW6CFN/gz9rx+UJvQ715FZnAOYfHn5jt5Z2C8=";
+  #     persistencedSha256 = lib.fakeSha256;
+  #   };
     };
     hardware.nvidia-container-toolkit.enable = config.virtualisation.docker.enable;
     environment.systemPackages = with pkgs; [

modules/core/services.nix

@@ -0,0 +1,16 @@
+{
+  # Services to start
+  services = {
+    upower.enable = true;
+    libinput.enable = true; # Input Handling
+    fstrim.enable = true; # SSD Optimizer
+    gvfs.enable = true; # For Mounting USB & More
+    power-profiles-daemon.enable = true;
+    tumbler.enable = true; # Image/video preview
+
+    smartd = {
+      enable = true;
+      autodetect = true;
+    };
+  };
+}

modules/default.nix

@@ -1,15 +1,19 @@
+{ lib, ... }:
+let
+  b = builtins;
+
+  module_files =
+    b.readDir ./. |>
+    lib.filterAttrs (name: type:
+      ( (lib.strings.hasSuffix ".nix" name
+        && name != "default.nix"
+        && type == "regular" )
+      || ( type == "directory"
+        && b.pathExists ./${name}/default.nix))
+    ) |>
+    b.attrNames |>
+    b.map (f: ./${f});
+in
 {
-  imports = [
-    ./cli
-    ./packages.nix
-    ./desktop
-    ./gaming
-    ./hardware.nix
-    ./network.nix
-    ./services.nix
-    ./fonts.nix
-    ./ld.nix
-    ./nvidia.nix
-    ./corsairLink.nix
-  ];
+  imports = module_files;
 }

modules/desktop/audio.nix

@@ -0,0 +1,32 @@
+{ config, lib, ... }:
+{
+  services.pipewire = lib.mkIf config.my.desktop.enable {
+    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.quantum" = 256;
+        "default.clock.min-quantum" = 256;
+        "default.clock.max-quantum" = 256;
+      };
+    };
+    extraConfig.pipewire-pulse."92-low-latency" = {
+      context.modules = [
+        {
+          name = "libpipewire-module-protocol-pulse";
+          args = {
+            pulse.min.req = "256/48000";
+            pulse.default.req = "256/48000";
+            pulse.max.req = "256/48000";
+            pulse.min.quantum = "256/48000";
+            pulse.max.quantum = "256/48000";
+          };
+        }
+      ];
+    };
+  };
+}

modules/desktop/dms.nix

@@ -19,7 +19,7 @@ in
     enableSystemMonitoring = true;     # System monitoring widgets (dgop)
     enableClipboard = true;            # Clipboard history manager
     enableVPN = true;                  # VPN management widget
-    enableDynamicTheming = true;       # Wallpaper-based theming (matugen)
+    enableDynamicTheming = false;       # Wallpaper-based theming (matugen)
     enableAudioWavelength = true;      # Audio visualizer (cava)
     enableCalendarEvents = true;       # Calendar integration (khal)
   };

modules/desktop/environment.nix

@@ -1,3 +1,43 @@
+{ config, lib, ... }:
+let
+  cfg = config.my.desktop;
+in
 {
-  environment.sessionVariables.NIXOS_OZONE_WL = "1";
+  environment.sessionVariables = {
+    NIXOS_OZONE_WL = "1";
+    GDK_BACKEND = "wayland,x11,*";
+    GDK_SCALE = "2"; # GDK Scaling Factor (no fractional scaling)
+
+    MOZ_ENABLE_WAYLAND = "1";
+    MOZ_DISABLE_RDD_SANDBOX = "1";
+
+    OZONE_PLATFORM = "wayland";
+
+    ELECTRON_OZONE_PLATFORM_HINT = "auto";
+
+    SDL_VIDEODRIVER = "wayland";
+    CLUTTER_BACKEND = "wayland";
+
+    QT_QPA_PLATFORM = "wayland;xcb";
+    XDG_MENU_PREFIX = "plasma-";
+    QT_QPA_PLATFORMTHEME_QT6 = "qt5ct";
+    GTK_THEME = "Adwaita:dark";
+    QS_ICON_THEME = "Papirus-Dark";
+
+    LIBVA_DRIVER_NAME = "nvidia";
+    __GLX_VENDOR_LIBRARY_NAME = "nvidia";
+    GBM_BACKEND = "nvidia-drm";
+    TERMINAL = "kitty";
+
+    __GL_GSYNC_ALLOWED = "1";
+    __GL_VRR_ALLOWED = "1";
+
+    EDITOR = "code";
+    STLEDITOR = "code";
+
+    XCURSOR_SIZE = "16";
+
+    XDG_SESSION_DESKTOP = lib.optionalString cfg.hyprland.enable "Hyprland";
+    AQ_DRM_DEVICES = lib.optionalString cfg.hyprland.enable "/dev/dri/nvidia-dgpu";
+  };
 }

modules/desktop/greeter.nix

@@ -0,0 +1,16 @@
+{ pkgs, inputs, username, config, ... }:
+{
+  services.greetd = {
+    enable = true;
+    settings = rec {
+      default_session = {
+        command = 
+          if config.my.desktop.hyprland.enable
+          then "${pkgs.uwsm}/bin/uwsm start -e -D Hyprland ${inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland}/bin/start-hyprland"
+          else "";
+	      user = "${username}";
+      };
+      initial_session = default_session;
+    };
+  };
+}

modules/desktop/obs-studio.nix

@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ pkgs, config, lib, ... }:
 {
-  programs.obs-studio = {
+  programs.obs-studio = lib.mkIf config.my.desktop.enable {
     enable = true;
     enableVirtualCamera = true;
     plugins = [

modules/desktop/packages.nix

@@ -1,35 +1,35 @@
-{ pkgs, ...}:
-
+{ pkgs, config, lib, ...}:
+let
+  cfg = config.my.desktop;
+in
 {
+  config = lib.mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
       kitty
       thunderbird
       bitwarden-desktop
       pwvucontrol
-    firefox
+      pavucontrol
       gedit
       wl-clipboard
-    tuigreet
       brightnessctl
-    spotify
       hyprshot
       mpv
       #jellyfin-media-player
       gedit
       nixfmt
       nixd
+      gtk4
       xfce.thunar
       xfce.thunar-archive-plugin
       xfce.thunar-media-tags-plugin
       droidcam
       rustdesk
-    mailspring
       rquickshare
       btrfs-assistant
       ungoogled-chromium
       gparted
       veracrypt
-    lshw
       syncplay
       tigervnc
       solaar
@@ -39,6 +39,18 @@
       gsettings-desktop-schemas
       gnome-tweaks
       appimage-run
+      firefoxpwa
+      papirus-icon-theme
+      tuigreet
+      arrpc
+    ]
+    ++ lib.optionals cfg.hyprland.enable [
+      hyprpolkitagent
+      hypridle
+      hyprpicker
+    ]
+    ++ lib.optionals cfg.spicetify.enable [
+      spotify
     ];
     programs.seahorse.enable = true;
     programs.streamcontroller.enable = true;
@@ -47,4 +59,8 @@
       binfmt = true;
     };
     programs.yubikey-manager.enable = true;
+    systemd.user.targets.graphical-session = {
+      wants = [ "arrpc.service" ];
+    };
+  };
 }

modules/desktop/sddm.nix

@@ -1,30 +0,0 @@
-{ pkgs, lib, username, config, ... }:
-let
-  cfg = config.my.desktop;
-in
-{
-  services.displayManager.sddm = {
-    enable = cfg.sddm.enable;
-    theme = "catppuccin-mocha-mauve";
-    package = pkgs.kdePackages.sddm;
-    wayland.enable = true;
-    settings = {
-      Autologin = lib.optionalAttrs cfg.sddm.autoLogin.enable {
-        User = "${username}";
-        Session = cfg.sddm.autoLogin.session;
-      };
-    };
-  };
-
-  environment.systemPackages =
-  lib.optionals cfg.sddm.enable [(
-    pkgs.catppuccin-sddm.override {
-      flavor = "mocha";
-      accent = "mauve";
-      font  = "Noto Sans";
-      fontSize = "9";
-      background = "${./sddm-background/wallpaper.png}";
-      loginBackground = true;
-    }
-  )];
-}

modules/desktop/xdg.nix

@@ -1,16 +1,23 @@
-{ pkgs, inputs, ...}:
-
+{ pkgs, inputs, config, lib, ...}:
+let
+  cfg = config.my.desktop;
+in
 {
   xdg = {
     mime.enable = true;
     menus.enable = true;
-    portal = {
+    portal = lib.mkIf cfg.enable {
       enable = true;
       extraPortals = [
-        inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland
         pkgs.xdg-desktop-portal-gtk
+      ]
+      ++ lib.optionalAttrs cfg.hyprland.enable [
+        inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland
+      ];
+      configPackages = []
+      ++ lib.optionalAttrs cfg.hyprland.enable [
+        inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland
       ];
-      configPackages = [inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland];
     };
   };
 }

modules/gaming/anime-game-launchers.nix

@@ -1,6 +1,6 @@
 { lib, config, inputs, ... }:
 let
-  cfg = config.my.gaming;
+  cfg = config.my.desktop.gaming;
 in
 {
   imports = [

modules/gaming/steam.nix

@@ -1,11 +1,20 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
+let
+  system = pkgs.stdenv.hostPlatform.system;
+
+  pkgsUnstable = import inputs.nixpkgs-unstable {
+    inherit system;
+    config.allowUnfree = true;
+  };
+in
 {
   programs = {
     steam = {
       enable = true;
+      package = pkgsUnstable.steam;
       remotePlay.openFirewall = true;
-      dedicatedServer.openFirewall = false;
-      gamescopeSession.enable = false;
+      dedicatedServer.openFirewall = true;
+      gamescopeSession.enable = true;
       extraPackages = with pkgs; [
         steamtinkerlaunch
       ];
@@ -16,6 +25,7 @@
     gamescope = {
       enable = true;
       capSysNice = true;
+      package = inputs.nixpkgs-unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system}.gamescope;
     };
   };
   environment.systemPackages = with pkgs; [

modules/ld.nix

@@ -1,35 +0,0 @@
-{ pkgs, ... }:
-{
-  programs.nix-ld.enable = true;
-  programs.nix-ld.libraries = with pkgs; [
-    stdenv.cc.cc
-    glibc
-    xorg.libX11
-    xorg.libXcursor
-    xorg.libXrandr
-    xorg.libXinerama
-    xorg.libXi
-    wayland
-    libGL
-    libdrm
-    alsa-lib
-    pulseaudio
-    glib
-    nspr.out
-    nss.out
-    dbus.lib
-    at-spi2-atk
-    cups.lib
-    cairo.out
-    gtk3.out
-    pango.out
-    libxcomposite.out
-    libxdamage.out
-    libxext.out
-    libxfixes.out
-    libgbm.out
-    expat.out
-    libxcb.out
-    libxkbcommon.out
-  ];
-}

modules/network.nix

@@ -1,30 +0,0 @@
-{
-  options,
-  ...
-}:
-{
-  networking = {
-    hostName = "LillyPC";
-    networkmanager.enable = true;
-    timeServers = options.networking.timeServers.default ++ ["pool.ntp.org"];
-    firewall = {
-      enable = false;
-      allowedTCPPorts = [
-        22
-        80
-        443
-        59010
-        59011
-        8080
-      ];
-      allowedUDPPorts = [
-        59010
-        59011
-      ];
-    };
-  };
-  services.tailscale = {
-    enable = true;
-    useRoutingFeatures = "client";
-  };
-}

modules/packages.nix

@@ -1,12 +0,0 @@
-{ pkgs, ...}:
-
-{
-  environment.systemPackages = with pkgs; [
-    firefoxpwa
-    hyprpolkitagent
-    hypridle
-    hyprpicker
-    lsb-release
-    papirus-icon-theme
-  ];
-}

modules/server/default.nix

@@ -0,0 +1,19 @@
+{ lib, ... }:
+let
+  b = builtins;
+
+  module_files =
+    b.readDir ./. |>
+    lib.filterAttrs (name: type:
+      ( (lib.strings.hasSuffix ".nix" name
+        && name != "default.nix"
+        && type == "regular" )
+      || ( type == "directory"
+        && b.pathExists ./${name}/default.nix))
+    ) |>
+    b.attrNames |>
+    b.map (f: ./${f});
+in
+{
+  imports = module_files;
+}

modules/server/virtualisation.nix

@@ -0,0 +1,16 @@
+{ config, lib, ... }:
+{
+  virtualisation = {
+    docker.enable = true;
+    spiceUSBRedirection.enable = config.my.virtualisation.enable;
+    libvirtd = lib.mkIf config.my.virtualisation.enable {
+      enable = true;
+      qemu = {
+        swtpm.enable = true;
+        runAsRoot = false;
+      };
+      onShutdown = "shutdown";
+      nss.enableGuest = true;
+    };
+  };
+}

modules/services.nix

@@ -1,56 +0,0 @@
-{
-  # Services to start
-  services = {
-    upower.enable = true; # noctalia shell battery
-    libinput.enable = true; # Input Handling
-    fstrim.enable = true; # SSD Optimizer
-    gvfs.enable = true; # For Mounting USB & More
-    power-profiles-daemon.enable = true;
-    openssh = {
-      enable = true; # Enable SSH
-      settings = {
-        PermitRootLogin = "no"; # Prevent root from SSH login
-        PasswordAuthentication = true; #Users can SSH using kb and password
-        KbdInteractiveAuthentication = true;
-      };
-      ports = [22];
-    };
-    blueman.enable = true; # Bluetooth Support
-    tumbler.enable = true; # Image/video preview
-    gnome.gnome-keyring.enable = true;
-
-    smartd = {
-      enable = true;
-      autodetect = true;
-    };
-    pipewire = {
-      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.quantum" = 256;
-          "default.clock.min-quantum" = 256;
-          "default.clock.max-quantum" = 256;
-        };
-      };
-      extraConfig.pipewire-pulse."92-low-latency" = {
-        context.modules = [
-          {
-            name = "libpipewire-module-protocol-pulse";
-            args = {
-              pulse.min.req = "256/48000";
-              pulse.default.req = "256/48000";
-              pulse.max.req = "256/48000";
-              pulse.min.quantum = "256/48000";
-              pulse.max.quantum = "256/48000";
-            };
-          }
-        ];
-      };
-    };
-  };
-}

options.nix

@@ -2,8 +2,6 @@
 {
   options.my = {
 
-    gaming.enable = lib.mkEnableOption "Gaming";
-
     cachyosKernel.enable = lib.mkEnableOption "CachyOS Kernel";
 
     nvidia = {
@@ -14,33 +12,48 @@
 
     rgb.enable = lib.mkEnableOption "Has RGB";
 
+    virtualisation.enable = lib.mkEnableOption "Enable Virualisation Tools";
+
+    amd = {
+      boost.disable = lib.mkEnableOption "Disable CPU Boost";
+      performancePreference = lib.mkOption {
+        type = lib.types.str;
+        default = "balance_performance";
+        example = "balance_performance";
+        description = "Performance Preference to set";
+      };
+    };
+
+    gpu = {
+      powersave = lib.mkEnableOption "Set GPU ASPM to powersave";
+    };
+
     desktop = {
       enable = lib.mkEnableOption "Is a Desktop System";
 
-      sddm = {
-        enable = lib.mkEnableOption "SDDM";
-        autoLogin = {
-          enable = lib.mkEnableOption "SDDM AutoLogin";
-          session = lib.mkOption {
-            type = lib.types.str;
-            default = "hyprland-uwsm.desktop";
-            example = "hyprland-uwsm.desktop";
-            description = "Name of the autologin session desktop file";
-          };
-        };
-      };
+      gaming.enable = lib.mkEnableOption "Gaming";
 
       hyprland = {
         enable = lib.mkEnableOption "Hyprland";
       };
 
       kdePlasma = {
-        enable = lib.mkEnableOption "Hyprland";
+        enable = lib.mkEnableOption "KDE Plasma";
       };
 
       flatpak = {
         enable = lib.mkEnableOption "Flatpak Support";
       };
+
+      spicetify = {
+        enable = lib.mkEnableOption "Install Spotify/Spicetify";
       };
+
+      nixcord = {
+        enable = lib.mkEnableOption "Install Nixcord/Equibop";
+      };
+    };
+
+    cockpit.enable = lib.mkEnableOption "Install Cockpit";
   };
 }

system/core.nix

@@ -1,8 +1,20 @@
-{ pkgs, config, ... }:
+{ pkgs, config, inputs, lib, ... }:
 let
   cfg = config.my.cachyosKernel;
 in
 {
+  services = {
+    openssh = {
+      enable = true; # Enable SSH
+      settings = {
+        PermitRootLogin = "no"; # Prevent root from SSH login
+        PasswordAuthentication = true; #Users can SSH using kb and password
+        KbdInteractiveAuthentication = true;
+      };
+      ports = [22];
+    };
+    blueman.enable = true; # Bluetooth Support
+  };
   nix = {
     settings = {
       download-buffer-size = 200000000;
@@ -26,6 +38,13 @@ in
     };
   };
 
+  nixpkgs.overlays = lib.mkIf cfg.enable [
+    inputs.nix-cachyos-kernel.overlays.pinned
+  ];
+
+  # Allow unfree packages
+  nixpkgs.config.allowUnfree = true;
+
   # Boot/Kernel Stuff
   boot = {
     kernelPackages = 
@@ -39,6 +58,9 @@ in
     kernel.sysctl = {"vm.max_map_count" = 2147483642;};
     loader.systemd-boot.enable = true;
     loader.efi.canTouchEfiVariables = true;
+    initrd = {
+      systemd.enable = true;
+    };
     # Appimage Support
     binfmt.registrations.appimage = {
       wrapInterpreterInShell = false;
@@ -50,4 +72,44 @@ in
     };
     plymouth.enable = true;
   };
+
+  # Set your time zone.
+  time.timeZone = "Europe/Berlin";
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_US.UTF-8";
+
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "en_US.UTF-8";
+    LC_IDENTIFICATION = "en_US.UTF-8";
+    LC_MEASUREMENT = "en_US.UTF-8";
+    LC_MONETARY = "en_US.UTF-8";
+    LC_NAME = "en_US.UTF-8";
+    LC_NUMERIC = "en_US.UTF-8";
+    LC_PAPER = "en_US.UTF-8";
+    LC_TELEPHONE = "en_US.UTF-8";
+    LC_TIME = "en_US.UTF-8";
+  };
+
+  # Configure keymap in X11
+  services.xserver.xkb = {
+    layout = "us";
+    variant = "euro";
+  };
+
+  # Some programs need SUID wrappers, can be configured further or are
+  # started in user sessions.
+  # programs.mtr.enable = true;
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "25.11"; # Did you read the comment?
 }