added base configuration for ixion, applied system update, modified power mgmt readme

also wrote some doucumentation about quadlets, nothing too comprehesive
though as the wrapper might get removed later

defaults/sway/config

@@ -13,9 +13,9 @@ set $term alacritty
 set $menu wofi --term '$term'
 
 ### Output configuration
-output DP-3 pos 1920 0 res 1920x1080@60Hz
-output HDMI-A-1 pos 0 0 res 1920x1080@60Hz
-output DP-2 pos 3840 0 res 1920x1080@60Hz
+output DP-3 pos 3840 0 res 1920x1080@59Hz
+output HDMI-A-1 pos 0 0 res 1920x1080@59Hz
+output DP-2 pos 1920 0 res 1920x1080@60Hz
 
 ### Wallpaper
 output HDMI-A-1 bg ~/.wallpaper/.wallpaper.png fill
@@ -25,22 +25,22 @@ output DP-3 bg ~/.wallpaper/.wallpaper.png fill
 ### Workspace binding
 
 ## DP-3 bindings
-workspace 1 output DP-3
-workspace 2 output DP-3
-workspace 4 output DP-3
-workspace 5 output DP-3
+workspace 1 output DP-2
+workspace 2 output DP-2
+workspace 4 output DP-2
+workspace 5 output DP-2
 
 ## HDMI-A-1 bindings
 workspace 3 output HDMI-A-1
 workspace 9 output HDMI-A-1
 
 ## DP-2 bindings
-workspace 6 output DP-2
-workspace 7 output DP-2
-workspace 8 output DP-2
+workspace 6 output DP-3
+workspace 7 output DP-3
+workspace 8 output DP-3
 
 ### Colour options
-set $bg 	       #24283b
+set $bg 	#24283b
 set $bg-inactive   #323232
 set $bg-urgent     #000000
 set $text          #eeeeec

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759509947,
-        "narHash": "sha256-4XifSIHfpJKcCf5bZZRhj8C4aCpjNBaE3kXr02s4rHU=",
+        "lastModified": 1757432263,
+        "narHash": "sha256-qHn+/0+IOz5cG68BZUwL9BV3EO/e9eNKCjH3+N7wMdI=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "000eadb231812ad6ea6aebd7526974aaf4e79355",
+        "rev": "1fef4404de4d1596aa5ab2bd68078370e1b9dcdb",
         "type": "github"
       },
       "original": {
@@ -64,11 +64,11 @@
         "zon2nix": "zon2nix"
       },
       "locked": {
-        "lastModified": 1761172581,
-        "narHash": "sha256-uX8FzMlRt15kvs4pPuOHZeQe1wztQXTEWOVtB2EwmB0=",
+        "lastModified": 1759330332,
+        "narHash": "sha256-ZKyOgOOm9Itjbc5xi89xMtw+cnnOFfl79zndPMTzKpU=",
         "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "bdbda2fd8380b440508246bcda0bf1198f6666e4",
+        "rev": "a5aff0e347b0016e2735d4ec4b4cdca96b5438d1",
         "type": "github"
       },
       "original": {
@@ -116,15 +116,15 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 315532800,
-        "narHash": "sha256-sV6pJNzFkiPc6j9Bi9JuHBnWdVhtKB/mHgVmMPvDFlk=",
-        "rev": "82c2e0d6dde50b17ae366d2aa36f224dc19af469",
+        "lastModified": 1748189127,
+        "narHash": "sha256-zRDR+EbbeObu4V2X5QCd2Bk5eltfDlCr5yvhBwUT6pY=",
+        "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre877938.82c2e0d6dde5/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802491.7c43f080a7f2/nixexprs.tar.xz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
+        "url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz"
       }
     },
     "nixpkgs_2": {
@@ -142,11 +142,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1761016216,
-        "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=",
+        "lastModified": 1759281824,
+        "narHash": "sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "481cf557888e05d3128a76f14c76397b7d7cc869",
+        "rev": "5b5be50345d4113d04ba58c444348849f5585b4a",
         "type": "github"
       },
       "original": {
@@ -156,19 +156,18 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "quadlet-nix": {
       "locked": {
-        "lastModified": 1744536153,
-        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
+        "lastModified": 1758631655,
+        "narHash": "sha256-EGeZ963L7xsNAY7snvP1JHQe7LWLVCM6f49+PzWjhEE=",
+        "owner": "SEIAROTg",
+        "repo": "quadlet-nix",
+        "rev": "2ebe01b175e2e1e6de3f172d23f0c3b88713eec9",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
+        "owner": "SEIAROTg",
+        "repo": "quadlet-nix",
         "type": "github"
       }
     },
@@ -179,25 +178,7 @@
         "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs_3",
-        "rust-overlay": "rust-overlay"
-      }
-    },
-    "rust-overlay": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_4"
-      },
-      "locked": {
-        "lastModified": 1761100675,
-        "narHash": "sha256-LX3TCDBeNpCWTDXtGyRASVcLmRPChSli34bgHnZ1DCw=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "72161c6c53f6e3f8dadaf54b2204a5094c6a16ae",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
+        "quadlet-nix": "quadlet-nix"
       }
     },
     "systems": {
@@ -231,11 +212,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760401936,
-        "narHash": "sha256-/zj5GYO5PKhBWGzbHbqT+ehY8EghuABdQ2WGfCwZpCQ=",
+        "lastModified": 1748261582,
+        "narHash": "sha256-3i0IL3s18hdDlbsf0/E+5kyPRkZwGPbSFngq5eToiAA=",
         "owner": "mitchellh",
         "repo": "zig-overlay",
-        "rev": "365085b6652259753b598d43b723858184980bbe",
+        "rev": "aafb1b093fb838f7a02613b719e85ec912914221",
         "type": "github"
       },
       "original": {

flake.nix

@@ -12,7 +12,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     ghostty.url = "github:ghostty-org/ghostty";
-    rust-overlay.url = "github:oxalica/rust-overlay";
+    quadlet-nix.url = "github:SEIAROTg/quadlet-nix";
   };
 
   outputs = inputs @ {
@@ -22,37 +22,27 @@
     darwin,
     home-manager,
     ghostty,
-    rust-overlay,
+    quadlet-nix,
     ...
   }: let
     userName = "wyatt";
     userEmail = "wyatt@wyattjmiller.com";
-    extraSpecialArgs = {
-      inherit userName userEmail ghostty;
-    };
 
-    myOverlays = { ... }: {
-      nixpkgs.overlays = [
-        rust-overlay.overlays.default
-      ] ++ (nixpkgs.lib.attrValues self.common.overlays);
+    # use this variable to take inputs and use them as arguments in your modules, this will be the common one
+    customArgs = {
+      inherit userName userEmail ghostty quadlet-nix;
     };
   in {
     meta = import ./meta;
 
-    common = {
-      overlays = import ./modules/common/overlays.nix;
-    };
-
     # Primary laptop - MacBook Pro (2023, M3)
     darwinConfigurations."sephiroth" = darwin.lib.darwinSystem {
       system = "aarch64-darwin";
-      specialArgs = {
-        inherit userName userEmail ghostty;
+      specialArgs = customArgs // {
         hostname = "sephiroth";
-        role = "workstation";
+        role = "devel";
       };
       modules = [
-        myOverlays
         ./modules/common
         ./modules/machine/sephiroth
 
@@ -60,9 +50,9 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs // { isNixOS = false; };
-          # home-manager.extraSpecialArgs = extraSpecialArgs;
-          home-manager.backupFileExtension = "bak";
+          home-manager.extraSpecialArgs = customArgs // {
+            inherit home-manager;
+          };
           home-manager.users.${userName} = import ./home;
         }
       ];
@@ -71,13 +61,11 @@
     # Primary desktop computer
     nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
-      specialArgs = {
-        inherit userName userEmail ghostty;
+      specialArgs = customArgs // {
         hostname = "cloud";
-        role = "workstation";
+        role = "devel";
       };
       modules = [
-        myOverlays
         nix-flatpak.nixosModules.nix-flatpak
         ./modules/common
         ./modules/machine/cloud
@@ -86,8 +74,9 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs;
-          home-manager.backupFileExtension = "bak";
+          home-manager.extraSpecialArgs = customArgs // {
+            inherit home-manager;
+          };
           home-manager.users.${userName}.imports = [
             ./home
           ];
@@ -98,13 +87,11 @@
     # Apartment appliance server
     nixosConfigurations."valefor" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
-      specialArgs = {
-        inherit userName userEmail;
+      specialArgs = customArgs // {
         hostname = "valefor";
         role = "server";
       };
       modules = [
-        myOverlays
         ./modules/common
         ./modules/machine/valefor
 
@@ -112,8 +99,9 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs;
-          home-manager.backupFileExtension = "bak";
+          home-manager.extraSpecialArgs = customArgs // {
+            inherit home-manager;
+          };
           home-manager.users.${userName}.imports = [
             ./home
           ];
@@ -124,48 +112,24 @@
     # Storage, status, game, and media server
     nixosConfigurations."ixion" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
-      specialArgs = {
-        inherit userName userEmail;
+      specialArgs = customArgs // {
         hostname = "ixion";
         role = "server";
       };
-      # modules = [
-      #   myOverlays
-      #   nix-flatpak.nixosModules.nix-flatpak
-      #   nix-ld.nixosModules.nix-ld
-      #   ./modules/nixos/hardware-configuration.nix
-      #   ./modules/nix-core.nix
-      #   ./modules/nixos/configuration.nix
-      #   ./modules/host-users.nix
-      #
-      #   home-manager.nixosModules.home-manager
-      #   {
-      #     home-manager.useGlobalPkgs = true;
-      #     home-manager.useUserPackages = true;
-      #     home-manager.extraSpecialArgs = extraSpecialArgs;
-      #     home-manager.backupFileExtension = "bak";
-      #     home-manager.users.${userName}.imports = [
-      #       ./home
-      #     ];
-      #   }
-      # ];
-    };
-
-    # generic non-NixOS Linux machine
-    homeConfigurations."generic" = let
-      hostname = builtins.getEnv "HOSTNAME";
-      pkgs = nixpkgs.legacyPackages.x86_64-linux;
-    in home-manager.lib.homeManagerConfiguration {
-      inherit pkgs;
-      # system = "x86_64-linux";
-      extraSpecialArgs = extraSpecialArgs // { 
-        isNixOS = false; 
-        hostname = hostname;
-        role = "workstation";
-      };
       modules = [
-        myOverlays
-        ./home
+        quadlet-nix.nixosModules.quadlet
+        ./modules/common
+        ./modules/machine/ixion
+
+        home-manager.nixosModules.home-manager
+        {
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+          home-manager.extraSpecialArgs = customArgs;
+          home-manager.users.${userName}.imports = [
+            ./home
+          ];
+        }
       ];
     };
   };

home/atuin.nix

@@ -1,7 +1,6 @@
-{ pkgs, ...}: {
+{...}: {
   programs.atuin = {
     enable = true;
     enableFishIntegration = true;
-    package = pkgs.atuinLatest;
   };
 }

home/browser.nix

@@ -1,8 +1,6 @@
 {
   pkgs,
   lib,
-  isNixOS,
-  role,
   ...
 }: {
   programs.firefox = {
@@ -11,7 +9,7 @@
   };
 
   programs.chromium = {
-    enable = pkgs.stdenv.isLinux && isNixOS;
+    enable = pkgs.stdenv.isLinux;
     package = pkgs.ungoogled-chromium.override {
       enableWideVine = true;
       commandLineArgs = [

home/default.nix

@@ -1,57 +1,63 @@
-{ lib
-, pkgs
-, userName
-, userEmail
-, ghostty
-, isNixOS ? true
-, role
-, ...
-}:
-let
-  # Have a file structure that holds all the configuration files that can't be configured by Nix
+{
+  lib,
+  pkgs,
+  userName,
+  userEmail,
+  ghostty,
+  ...
+}: let
+  # Have a file sturcture that holds all the configuration files that can't be configured by Nix
+  # or maybe I'm too lazy to do anything about it? I dunno
   dirs = {
     defaults = ../defaults;
   };
-in
-{
+in {
   # Import sub modules
-  imports = [
+  imports = map (module: import module {inherit lib pkgs dirs userName userEmail ghostty;}) [
+    ./atuin.nix
+    ./shell.nix
     ./packages
+    ./git.nix
+    ./starship.nix
+    ./eza.nix
+    ./neovim.nix
+    ./direnv.nix
+    ./sway.nix
+    ./terminal.nix
+    ./browser.nix
+    ./zellij.nix
+    ./bat.nix
   ];
 
-  home = lib.mkMerge [
-    {
-      username = userName;
-      homeDirectory =
-        if pkgs.stdenv.isDarwin
-        then "/Users/${userName}"
-        else "/home/${userName}";
+  # Home Manager needs a bit of information about you and the
+  # paths it should manage.
+  home = {
+    username = userName;
+    homeDirectory =
+      if pkgs.stdenv.isDarwin
+      then "/Users/${userName}"
+      else "/home/${userName}";
 
-      stateVersion = "24.11";
-    }
+    sessionVariables = {
+      XDG_CURRENT_DESKTOP = "sway";
+      XDG_SESSION_TYPE = "wayland";
+      XDG_SESSION_DESKTOP="sway";
+      XDG_CONFIG_HOME = "$HOME/.config";
+      XDG_CACHE_HOME = "$HOME/.cache";
+      XDG_DATA_HOME = "$HOME/.local/share";
+      XDG_STATE_HOME = "$HOME/.local/state";
+      NIXOS_OZONE_WL = "1";
+    };
 
-    (lib.mkIf isNixOS {
-      sessionVariables = {
-        XDG_CURRENT_DESKTOP = "sway";
-        XDG_SESSION_TYPE = "wayland";
-        XDG_SESSION_DESKTOP = "sway";
-        XDG_CONFIG_HOME = "$HOME/.config";
-        XDG_CACHE_HOME = "$HOME/.cache";
-        XDG_DATA_HOME = "$HOME/.local/share";
-        XDG_STATE_HOME = "$HOME/.local/state";
-        NIXOS_OZONE_WL = "1";
-      };
-    })
+    pointerCursor = lib.mkIf pkgs.stdenv.isLinux {
+      gtk.enable = true;
+      package = pkgs.catppuccin-cursors.mochaDark;
+      name = "catppuccin-mocha-dark-cursors";
+      size = 22;
+    };
 
-    (lib.mkIf pkgs.stdenv.isLinux {
-      pointerCursor = {
-        gtk.enable = true;
-        package = pkgs.catppuccin-cursors.mochaDark;
-        name = "catppuccin-mocha-dark-cursors";
-        size = 22;
-      };
-    })
-  ];
+    stateVersion = "24.11";
+  };
 
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;

home/k9s.nix

@@ -1,32 +0,0 @@
-{ pkgs, ... }: {
-  programs.k9s = {
-    enable = true;
-    package = pkgs.k9sLatest;
-    settings.k9s = {
-      refreshRate = "2s";
-      liveViewAutoRefresh = false;
-      apiServerTimeout = "30s";
-      maxConnRetry = 5;
-      readOnly = true;
-      noExitOnCtrlC = false;
-      portForwardAddress = "localhost";
-      skipLatestRevCheck = false;
-      
-      skin = {
-        catppuccin-mocha = ./defaults/k9s/catppuccin-mocha.yml;
-      };
-
-      ui = {
-        skin = "catppuccin-mocha";
-        enableMouse = true;
-        headless = false;
-        logoless = true;
-        crumbsless = false;
-        splashless = true;
-        reactive = false;
-        noIcons = false;
-        defaultsToFullscreen = false;
-      };
-    };
-  };
-}

home/krew.nix

@@ -1,12 +0,0 @@
-{ pkgs, lib, ... }:
-with pkgs;
-let
-  plugins = writeText "plugins" ''
-    krew
-    oidc-login
-  '';
-in {
-  home.activation.krew = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
-    $DRY_RUN_CMD ${krewfile}/bin/krewfile -command ${krew}/bin/krew -file ${plugins}
-  '';
-}

home/lazygit.nix

@@ -1,7 +1,6 @@
-{ pkgs, ... }: {
+{...}: {
   programs.lazygit = {
     enable = true;
-    package = pkgs.lazygitLatest;
 
     settings = {
       gui.theme = {

home/packages/common.nix

@@ -3,17 +3,9 @@
   pkgs,
   ...
 }: {
-  imports = [
-    ../atuin.nix
-    ../shell.nix
-    ../git.nix
-    ../starship.nix
-    ../eza.nix
-    ../neovim.nix
-    ../bat.nix
-  ];
-
   home.packages = with pkgs; [
+    yazi # terminal file manager
+
     # archives
     zip
     xz
@@ -21,22 +13,40 @@
     p7zip
 
     # utils
-    yazi
     tmux
+    lazygit
     bottom
     ripgrep
     jq
     yq-go
     fzf
+    fh
     aria2
-    gnupg
+    yt-dlp
+    obsidian
+    vscode
+    weechat
     inetutils
 
     # misc
+    cowsay
     file
     which
     tree
     gnutar
+    gnupg
+    zoxide
     babelfish
+
+    # language-specific package managers
+    nodejs
+    cargo
+    python3
+
+    # nix specific stuff
+    nixd
+    deadnix
+    alejandra
+    statix
   ];
 }

home/packages/darwin.nix

@@ -1,9 +1,10 @@
 {
   pkgs,
+  lib,
   ...
 }: {
-  home.packages = with pkgs; [
+  home.packages = lib.mkIf pkgs.stdenv.isDarwin (with pkgs; [
     discord
     ollama
-  ];
+  ]);
 }

home/packages/default.nix

@@ -1,9 +1,11 @@
-{ pkgs, lib, role, ... }:
 {
-  imports =
-    [ ./common.nix ]
-    ++ lib.optional pkgs.stdenv.isDarwin ./darwin.nix
-    ++ lib.optional pkgs.stdenv.isLinux ./linux.nix
-    ++ lib.optional (role == "workstation") ./workstation.nix
-    ++ lib.optional (role == "server") ./server.nix;
-}
+  pkgs,
+  lib,
+  ...
+}: {
+  imports = [
+    ./common.nix
+    ./darwin.nix
+    ./linux.nix
+  ];
+}

home/packages/linux.nix

@@ -1,8 +1,9 @@
 {
   pkgs,
+  lib,
   ...
 }: {
-  home.packages = with pkgs; [
+  home.packages = lib.mkIf pkgs.stdenv.isLinux (with pkgs; [
     imv
     betterdiscordctl
     vesktop
@@ -15,5 +16,5 @@
     gpu-screen-recorder
     gpu-screen-recorder-gtk
     # ungoogled-chromium
-  ];
+  ]);
 }

home/packages/server.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }: {
-    home.packages = with pkgs; [
-    ];
-}

home/packages/workstation.nix

@@ -1,39 +0,0 @@
-{
-  lib,
-  pkgs,
-  dirs,
-  userName,
-  userEmail,
-  ghostty,
-  isNixOS,
-  ...
-}: {
-  imports = map (module: import module { inherit lib pkgs dirs userName userEmail ghostty isNixOS; }) [
-    ../terminal.nix
-    ../broswer.nix
-    ../zellij.nix
-    ../lazygit.nix
-    ../k9s.nix
-    ../krew.nix
-    ../direnv.nix
-  ] ++ lib.optional isNixOS [
-    ../sway.nix
-  ];
-
-  home.packages = with pkgs; [
-    fh
-    kubectl # kube config is deliberately not included
-    kubectx
-    obsidian
-    vscode
-    yt-dlp
-    weechat
-    nodejs
-    cargo
-    python3
-    nixd
-    deadnix
-    alejandra
-    statix
-  ];
-}

home/shell.nix

@@ -43,25 +43,7 @@
             "Can I get a waffle? Can I please get a waffle?" \
             "I'm lesbian. I thought you were American." \
             "You gotta give 'em that 'hawk tuah' and spit on that thang!" \
-            "We don't do that here..." \
-            "What are those?! They are my crocs..." \
-            "It's an avocado... Thanks!" \
-            "I am once again asking for your financial support" \
-            "Is that a weed?" \
-            "No, this is Patrick!" \
-            "Come ride, heroes, ride" \
-            "Away with the tide" \
-            "Concede your mind unto the fiend" \
-            "Darkness come, rend the shield of light" \
-            "The sun is setting, darkness taking over - a date with chaos and you're dressed to the nines" \
-            "Now kneel overdweller, your lord commands, there's no salvation for the sons of man" \
-            "Snap click clank whirr whizz wham boom!" \
-            "Rohs an kyn ala na" \
-            "If you’ve brought your ivory standard, I’ll be happy to tell you where you can stick it" \
-            "Speeches? Oh, yes, I love them. There's nothing like a good exposition when you're having trouble sleeping!" \
-            "Somehow, the boy just isn't very buoyant" \
-            "I am...not interested, little sun. Try again when you have become a man"
-
+            "We don't do that here..."
 
           set choose_meme (random)"%"(count $memes)
           set choose_meme $memes[(math $choose_meme"+1")]

home/terminal.nix

@@ -1,4 +1,4 @@
-{ pkgs, ghostty, ... }: {
+{ lib, pkgs, ghostty, ... }: {
   programs.alacritty = {
     enable = pkgs.stdenv.isLinux;
     settings = {

modules/common/core.nix

@@ -8,9 +8,6 @@
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
-  nixpkgs.config.permittedInsecurePackages = [
-    "mbedtls-2.28.10"
-  ];
 
   nix.package = pkgs.nix;
 

modules/common/default.nix

@@ -1,9 +1,12 @@
-{ ... }: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   imports = [
     ./core.nix
     ./environment.nix
     ./fonts.nix
-    # ./overlays.nix
     ./users.nix
   ];
 }

modules/common/overlays.nix

@@ -1,64 +0,0 @@
-final: prev: let
-  rust_1_90_0 = prev.rust-bin.stable."1.90.0".default;
-  myRustPlatform = prev.makeRustPlatform {
-    cargo = rust_1_90_0;
-    rustc = rust_1_90_0;
-  };
-in {
-  lazygitLatest = prev.lazygit.overrideAttrs (_: rec {
-    version = "0.55.1";
-    src = prev.fetchFromGitHub {
-      owner = "jesseduffield";
-      repo = "lazygit";
-      rev = "v${version}";
-      hash = "sha256-UofhgILZhVXnYiGpb25m4Ct4sbu5pRmjVgj3oEf5Uyk=";
-    };
-    vendorHash = null;
-    subPackages = [ "." ];
-    ldflags = [
-      "-X main.version=${version}"
-      "-X main.buildSource=nix"
-    ];
-  });
-
-  atuinLatest = (prev.atuin.override {
-    rustPlatform = myRustPlatform;
-  }).overrideAttrs (oldAttrs: rec {
-    version = "18.10.0";
-
-    src = prev.fetchFromGitHub {
-      owner = "atuinsh";
-      repo = "atuin";
-      rev = "v${version}";
-      hash = "sha256-bfSa3RtVXxHt3usDqqpE/oXKKDUZOrf+tD9uL59fr6M=";
-    };
-
-    cargoDeps = myRustPlatform.fetchCargoVendor {
-      # name = "atuin-${version}-vendor.tar.gz";
-      inherit src;
-      hash = "sha256-67ffivZVCly1GWA3fJ9mT8nGv2EGd6eCthbaIu/IW3M=";
-    };
-
-    preCheck = (oldAttrs.preCheck or "") + ''
-      export HOME="$TMPDIR"
-      export XDG_CONFIG_HOME="$TMPDIR/.config"
-      export XDG_DATA_HOME="$TMPDIR/.local/share"
-      export XDG_STATE_HOME="$TMPDIR/.local/state"
-      mkdir -p "$XDG_CONFIG_HOME" "$XDG_DATA_HOME" "$XDG_STATE_HOME"
-    '';
-  });
-
-  k9sLatest = prev.k9s.overrideAttrs (oldAttrs: rec {
-    version = "0.30.16";
-    src = prev.fetchFromGitHub {
-      owner = "derailed";
-      repo = "k9s";
-      rev = "v${version}";
-      hash = "sha256-1z6r6v3n1p6vd2q6n4pl5q3f7q3q7q1p7j5j1k3l4m5n6o7p8q9r";
-    };
-    ldflags = [
-      "-X github.com/derailed/k9s/version.Version=${version}"
-      "-X github.com/derailed/k9s/version.BuildSource=nix"
-    ];
-  });
-}

modules/machine/cloud/configuration.nix

@@ -18,7 +18,7 @@
 in {
   imports = [
     (import ../../apps/flatpak.nix {
-      inherit lib pkgs flatpakPackages userName;
+      inherit lib pkgs flatpakPackages;
     })
     ../../apps/gaming.nix
     ../../apps/appimage.nix

modules/machine/cloud/hardware-configuration.nix

@@ -12,24 +12,24 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "thunderbolt" "ahci" "usb_storage" "usbhid" "sd_mod"];
+  boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
   boot.initrd.kernelModules = [];
   boot.kernelModules = ["kvm-amd"];
   boot.extraModulePackages = [];
 
   fileSystems."/" = {
-    device = "/dev/disk/by-uuid/f8f39aae-61d2-437d-a8e1-01066bbb3c5c";
+    device = "/dev/disk/by-label/COMPUTER";
     fsType = "xfs";
   };
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/B72F-087F";
+    device = "/dev/disk/by-label/BOOT";
     fsType = "vfat";
     options = ["fmask=0022" "dmask=0022"];
   };
 
   swapDevices = [
-    {device = "/dev/disk/by-uuid/6d6bcc02-20a9-4ae8-9c1e-5124fb2b2634";}
+    {device = "/dev/disk/by-label/SWAP";}
   ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

modules/machine/ixion/configuration.nix

@@ -0,0 +1,84 @@
+{
+  pkgs,
+  userName,
+  ...
+}: {
+  imports = [
+    ../../pwrMgmt
+    ../../networking/core.nix
+    ../../virtualization/podman.nix
+    ../../virtualization/quadlet.nix
+    ../../virtualization/hardware.nix
+  ];
+
+  # Enable flakes for NixOS
+  nix.settings.experimental-features = ["nix-command" "flakes"];
+
+  # Custom kernel/boot stuff
+  boot = {
+    kernelPackages = pkgs.linuxPackages_latest;
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+  };
+
+  # Enable Polkit
+  security.polkit.enable = true;
+
+  # Make sure Bluetooth is off!
+  hardware.bluetooth.enable = false;
+
+  # Set your timezone
+  time.timeZone = "America/Detroit";
+
+  # Power management module
+  pwrMgmt = {
+    enable = true;
+    cpuFreqGovernor = "performance";
+    powertop.enable = false;
+  };
+
+  # Podman module (see ../../virtualization/podman.nix)
+  podman = {
+    enable = true;
+    extraPackages = with pkgs; [
+      docker-credential-helpers
+      toolbox
+      cosign
+      crane
+      podman-tui
+    ];
+  };
+
+  # Core networking module (see ../../networking/core.nix)
+  network = {
+    firewall.enable = true;
+    networkManager.enable = true;
+  };
+
+  programs = {
+    # Enable GnuPG
+    gnupg.agent = {
+      enable = true;
+      enableSSHSupport = true;
+    };
+
+    # Enable SUID wrappers (some programs need them)
+    mtr.enable = true;
+  };
+
+  users.users.${userName}.extraGroups = ["wheel" "video" "podman" "network"];
+
+  services = {
+    # Enable OpenSSH
+    openssh.enable = true;
+  };
+
+  # Install packages to be installed system-wide
+  environment.systemPackages = with pkgs; [
+    wireguard-tools
+  ];
+
+  system.stateVersion = "25.05";
+}

modules/machine/ixion/default.nix

@@ -0,0 +1,6 @@
+{...}: {
+  imports = [
+    ./configuration.nix
+    ./hardware-configuration.nix
+  ];
+}

modules/machine/ixion/hardware-configuration.nix

@@ -0,0 +1,46 @@
+# --- DO NOT USE ---
+#
+# this is copied from ../valefor/hardware-configuration.nix
+# generate a new hardware-configuration.nix before using this!
+#
+# ------------------
+# 
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/ff89bde1-4b33-4277-b649-b92700b2406c";
+      fsType = "xfs";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/3A4B-6866";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+
+  swapDevices = [ ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

modules/pwrMgmt/README.md

@@ -1,12 +1,12 @@
 # Power management modules
 
-This directory houses my own custom defined power management settings. These are set in the machine-specific configurations (typically).
+This directory houses my own custom defined power management settings as NixOS modules. These are set in the machine-specific configurations (typically).
 
 ## Examples
 
 Given that this configuration is in the `machine/<hostname>` directory (where hostname is the name of the computer your configuring):
 
-### Desktop configuration
+### Desktop/server configuration
 
 ```nix
   imports = [

modules/sound/shairport.nix

@@ -1,16 +1,7 @@
-{ lib, pkgs, userName, ...}: {
+{pkgs, ...}: {
   services.shairport-sync = {
     enable = pkgs.stdenv.isLinux;
     openFirewall = pkgs.stdenv.isLinux;
-    # arguments = "-v -o pa";
-  };
-
-  systemd.services.shairport-sync = {
-    serviceConfig = {
-      User = lib.mkForce "${userName}";
-    };
-    environment = {
-      XDG_RUNTIME_DIR = "/run/user/1000";
-    };
+    arguments = "-v -o pw";
   };
 }

modules/virtualization/README.md

@@ -40,7 +40,13 @@ Example:
   };
 ```
 
-To get a full, comprehensive list of what you can do with the podman module, please check out (podman.nix)[./podman.nix]!
+To get a full, comprehensive list of what you can do with the podman module, please check out [podman.nix](./podman.nix)!
+
+### Podman Quadlets
+
+This is a wrapper around a project called [`quadlet-nix`](https://github.com/SEIAROTg/quadlet-nix), a way of defining systemd services as containers with Nix! Since I have existing services running inside of containers and don't want to risk breaking _everything_ that I have running, I figured this would be a safe, transitionary approach to handle this.
+
+This is still a work-in-progress, check back soon on progress on this.
 
 ## Kubernetes
 

modules/virtualization/quadlet.nix

@@ -0,0 +1,47 @@
+# ----------------------
+# Wrapper for defining Quadlets in Nix via quadlet-nix
+#
+# Still WIP
+# ----------------------
+{
+  config,
+  lib,
+  ...
+}: 
+let
+  cfg = config.quadlet;
+in {
+  options = {
+    quadlet = {
+      enable = lib.mkEnableOption "Enable Podman's Quadlet systemd integration";
+      
+      autoUpdate = {
+        enable = lib.mkEnableOption "Enable the auto update mechanism";
+        
+        calendar = lib.mkOption {
+          type = lib.types.str;
+          default = "*-*-* 03:30:00";
+          description = "When the auto update mechanism is triggered, the calendar option will tell the auto update when to start";
+        };
+      };
+      
+      extraPackages = lib.mkOption {
+        type = lib.types.listOf lib.types.package;
+        default = [];
+        description = "Additional container-related packages to install (these likely will be installed with Podman though)";
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    virtualisation.quadlet = {
+      enable = true;
+      autoUpdate = {
+        enable = cfg.autoUpdate.enable;
+        calendar = cfg.autoUpdate.calendar;
+      };
+    };
+    
+    environment.systemPackages = cfg.extraPackages;
+  };
+}