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

@@ -7,41 +7,37 @@ set $down j
 set $up k
 set $right l
 # Alacritty
-set $term foot
+set $term alacritty
 
 # Menu (rofi)
-set $menu wofi --show
+set $menu wofi --term '$term'
 
-# ### Output configuration
+### Output configuration
-# output DP-3 pos 3840 0 res 1920x1080@59Hz
+output DP-3 pos 3840 0 res 1920x1080@59Hz
-# output HDMI-A-1 pos 0 0 res 1920x1080@59Hz
+output HDMI-A-1 pos 0 0 res 1920x1080@59Hz
-# output DP-2 pos 1920 0 res 1920x1080@60Hz
+output DP-2 pos 1920 0 res 1920x1080@60Hz
 
 ### Wallpaper
-output * bg ~/.wallpaper/.wallpaper.png fill
+output HDMI-A-1 bg ~/.wallpaper/.wallpaper.png fill
-# output HDMI-A-1 bg ~/.wallpaper/.wallpaper.png fill
+output DP-2  bg ~/.wallpaper/.wallpaper.png fill
-# output DP-2  bg ~/.wallpaper/.wallpaper.png fill
+output DP-3 bg ~/.wallpaper/.wallpaper.png fill
-# output DP-3 bg ~/.wallpaper/.wallpaper.png fill
 
 ### Workspace binding
 
 ## DP-3 bindings
-# workspace 1 output DP-2
+workspace 1 output DP-2
-# workspace 2 output DP-2
+workspace 2 output DP-2
-# workspace 4 output DP-2
+workspace 4 output DP-2
-# workspace 5 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-3
-# workspace 7 output DP-3
-# workspace 8 output DP-3
 
-## eDP-1 bindings scale
+## HDMI-A-1 bindings
-output eDP-1 scale 1.25
+workspace 3 output HDMI-A-1
+workspace 9 output HDMI-A-1
+
+## DP-2 bindings
+workspace 6 output DP-3
+workspace 7 output DP-3
+workspace 8 output DP-3
 
 ### Colour options
 set $bg 	#24283b
@@ -232,4 +228,10 @@ set $opacity 1.00
 for_window [class=".*"] opacity $opacity
 for_window [app_id=".*"] opacity $opacity
 
+# Disable locking when conditions are met
+for_window [class="streaming_client"] inhibit_idle fullscreen
+for_window [app_id="firefox"] inhibit_idle fullscreen
+for_window [app_id="neovide"] inhibit_idle fullscreen
+
+for_window [title="Beyond All Reason"] inhibit_idle fullscreen
 include /etc/sway/config.d/*

flake.lock

@@ -55,24 +55,6 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "ghostty": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -132,25 +114,6 @@
         "type": "github"
       }
     },
-    "nixgl": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_3"
-      },
-      "locked": {
-        "lastModified": 1752054764,
-        "narHash": "sha256-Ob/HuUhANoDs+nvYqyTKrkcPXf4ZgXoqMTQoCK0RFgQ=",
-        "owner": "guibou",
-        "repo": "nixGL",
-        "rev": "a8e1ce7d49a149ed70df676785b07f63288f53c5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "guibou",
-        "repo": "nixGL",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1748189127,
@@ -178,21 +141,6 @@
       }
     },
     "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1746378225,
-        "narHash": "sha256-OeRSuL8PUjIfL3Q0fTbNJD/fmv1R+K2JAOqWJd3Oceg=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "93e8cdce7afc64297cfec447c311470788131cd9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
       "locked": {
         "lastModified": 1759281824,
         "narHash": "sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0=",
@@ -208,14 +156,29 @@
         "type": "github"
       }
     },
+    "quadlet-nix": {
+      "locked": {
+        "lastModified": 1758631655,
+        "narHash": "sha256-EGeZ963L7xsNAY7snvP1JHQe7LWLVCM6f49+PzWjhEE=",
+        "owner": "SEIAROTg",
+        "repo": "quadlet-nix",
+        "rev": "2ebe01b175e2e1e6de3f172d23f0c3b88713eec9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "SEIAROTg",
+        "repo": "quadlet-nix",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "darwin": "darwin",
         "ghostty": "ghostty",
         "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",
-        "nixgl": "nixgl",
+        "nixpkgs": "nixpkgs_3",
-        "nixpkgs": "nixpkgs_4"
+        "quadlet-nix": "quadlet-nix"
       }
     },
     "systems": {
@@ -233,21 +196,6 @@
         "type": "github"
       }
     },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "zig": {
       "inputs": {
         "flake-compat": [

flake.nix

@@ -12,7 +12,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     ghostty.url = "github:ghostty-org/ghostty";
-    nixgl.url = "github:guibou/nixGL";
+    quadlet-nix.url = "github:SEIAROTg/quadlet-nix";
   };
 
   outputs = inputs @ {
@@ -22,13 +22,15 @@
     darwin,
     home-manager,
     ghostty,
-    nixgl,
+    quadlet-nix,
     ...
   }: let
     userName = "wyatt";
     userEmail = "wyatt@wyattjmiller.com";
-    extraSpecialArgs = {
+
-      inherit userName userEmail ghostty;
+    # 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;
@@ -36,8 +38,7 @@
     # Primary laptop - MacBook Pro (2023, M3)
     darwinConfigurations."sephiroth" = darwin.lib.darwinSystem {
       system = "aarch64-darwin";
-      specialArgs = {
+      specialArgs = customArgs // {
-        inherit userName userEmail ghostty;
         hostname = "sephiroth";
         role = "devel";
       };
@@ -49,7 +50,9 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.extraSpecialArgs = customArgs // {
+            inherit home-manager;
+          };
           home-manager.users.${userName} = import ./home;
         }
       ];
@@ -58,8 +61,7 @@
     # Primary desktop computer
     nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
-      specialArgs = {
+      specialArgs = customArgs // {
-        inherit userName userEmail ghostty;
         hostname = "cloud";
         role = "devel";
       };
@@ -72,7 +74,9 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.extraSpecialArgs = customArgs // {
+            inherit home-manager;
+          };
           home-manager.users.${userName}.imports = [
             ./home
           ];
@@ -83,8 +87,7 @@
     # Apartment appliance server
     nixosConfigurations."valefor" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
-      specialArgs = {
+      specialArgs = customArgs // {
-        inherit userName userEmail;
         hostname = "valefor";
         role = "server";
       };
@@ -96,7 +99,9 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.extraSpecialArgs = customArgs // {
+            inherit home-manager;
+          };
           home-manager.users.${userName}.imports = [
             ./home
           ];
@@ -107,41 +112,25 @@
     # Storage, status, game, and media server
     nixosConfigurations."ixion" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
-      specialArgs = {
+      specialArgs = customArgs // {
-        inherit userName userEmail;
         hostname = "ixion";
         role = "server";
       };
-      # modules = [
-      #   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.users.${userName}.imports = [
-      #       ./home
-      #     ];
-      #   }
-      # ];
-    };
-
-    # For anyone running home-manager standalone
-    homeConfigurations.${userName} = home-manager.lib.homeManagerConfiguration {
-      pkgs = nixpkgs.legacyPackages.x86_64-linux;
       modules = [
-        ./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
+          ];
+        }
       ];
-      # Optionally, pass specialArgs if needed
-      extraSpecialArgs = extraSpecialArgs // { 
-        inherit nixgl;
-      };
     };
   };
 }

home/browser.nix

@@ -38,14 +38,14 @@
       (createChromiumExtension {
         # ublock origin
         id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";
-        sha256 = "sha256:054kqrai2kd89bzc5c3x17rjfdil2zzxrxrg65vaywmvm77y7kmn";
+        sha256 = "sha256:0pdh1v0vx1d5vnl1zh7nbk6j1fh4k4hhwp1ljs203icn306lahsn";
         # sha256 = lib.fakeSha256;
         version = "1.64.0";
       })
       (createChromiumExtension {
         # bitwarden
         id = "nngceckbapebfimnlniiiahkandclblb";
-        sha256 = "sha256:02cscadjqbfx3a5bky1zc38pxymzgndb9h3wing3pb0fwm30yrzd";
+        sha256 = "sha256:0jxk3cqmgd5qj8hnw7s0k5s4bfrcmr0w0rckp3x0bmng07azw4gi";
         # sha256 = lib.fakeSha256;
         version = "2025.5.0";
       })

home/default.nix

@@ -27,7 +27,6 @@ in {
     ./browser.nix
     ./zellij.nix
     ./bat.nix
-    ./fonts.nix
   ];
 
   # Home Manager needs a bit of information about you and the
@@ -40,9 +39,9 @@ in {
       else "/home/${userName}";
 
     sessionVariables = {
-      XDG_CURRENT_DESKTOP = "gnome";
+      XDG_CURRENT_DESKTOP = "sway";
       XDG_SESSION_TYPE = "wayland";
-      XDG_SESSION_DESKTOP="gnome";
+      XDG_SESSION_DESKTOP="sway";
       XDG_CONFIG_HOME = "$HOME/.config";
       XDG_CACHE_HOME = "$HOME/.cache";
       XDG_DATA_HOME = "$HOME/.local/share";

home/fonts.nix

@@ -1,16 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
-  fonts.fontconfig.enable = true;
-  home.packages = with pkgs;
-    [
-      noto-fonts
-      noto-fonts-emoji
-      liberation_ttf
-      noto-fonts-cjk-sans
-      monaspace
-    ]
-    ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
-}

home/packages/common.nix

@@ -39,13 +39,9 @@
     babelfish
 
     # language-specific package managers
-    # nodejs
+    nodejs
-    fnm
     cargo
     python3
-    python312Packages.gyp
-    node-gyp
-    node-pre-gyp
 
     # nix specific stuff
     nixd

home/packages/linux.nix

@@ -5,19 +5,16 @@
 }: {
   home.packages = lib.mkIf pkgs.stdenv.isLinux (with pkgs; [
     imv
-    # betterdiscordctl
+    betterdiscordctl
-    # vesktop
+    vesktop
     xdg-utils
+    mcrcon
     xfce.thunar
     pavucontrol
-    # godot
+    godot
-    # aseprite
+    aseprite
     gpu-screen-recorder
     gpu-screen-recorder-gtk
     # ungoogled-chromium
-    playerctl
-    light
-    brightnessctl
-    wttrbar
   ]);
 }

home/shell.nix

@@ -1,9 +1,9 @@
 {pkgs, lib, ...}: {
   programs.fish = {
     enable = true;
-    shellInit = ''
+    # initExtra = ''
-      fnm env --use-on-cd --shell fish | source
+    #   export PATH="$PATH:$HOME/bin:$HOME/.local/bin:$HOME/go/bin"
-    '';
+    # '';
 
     shellAliases = {
       # ls aliases

home/terminal.nix

@@ -100,52 +100,9 @@
     };
   };
 
-
+  programs.kitty = {
-    programs.foot = {
+    enable = false; # TODO: to enable later
-      enable = true;
+  };
-      settings = {
-        main = {
-          font = "Monaspace Argon:size=11";
-        };
-        colors = {
-          alpha = 0.9;
-
-          cursor = "11111b f5e0dc";
-          foreground = "cdd6f4";
-          background = "1e1e2e";
-
-          regular0 = "45475a";
-          regular1 = "f38ba8";
-          regular2 = "a6e3a1";
-          regular3 = "f9e2af";
-          regular4 = "89b4fa";
-          regular5 = "f5c2e7";
-          regular6 = "94e2d5";
-          regular7 = "bac2de";
-
-          bright0 = "585b70";
-          bright1 = "f38ba8";
-          bright2 = "a6e3a1";
-          bright3 = "f9e2af";
-          bright4 = "89b4fa";
-          bright5 = "f5c2e7";
-          bright6 = "94e2d5";
-          bright7 = "a6adc8";
-
-          "16" = "fab387";
-          "17" = "f5e0dc";
-
-          selection-foreground = "cdd6f4";
-          selection-background = "414356";
-
-          search-box-no-match = "11111b f38ba8";
-          search-box-match = "cdd6f4 313244";
-
-          jump-labels = "11111b fab387";
-          urls = "89b4fa";
-        };
-      };
-    };
 
   home.packages = if pkgs.stdenv.isLinux then
     [ ghostty.packages.${pkgs.system}.default ]

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/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;
+  };
+}