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

created easy wrapper for quadlet-nix
Merge branch 'master' into ixion-build
2025-10-05 23:11:47 -04:00 · 2025-10-05 23:10:47 -04:00 · 2025-10-04 20:37:41 -04:00 · 2025-06-01 19:04:38 -04:00
12 changed files with 278 additions and 79 deletions
--- a/defaults/sway/config
+++ b/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
--- a/flake.lock
+++ b/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": 1760808459,
-        "narHash": "sha256-+3ups2SbJ2y2CknaoC8P4IphJDWG/yo5loW01BF7STw=",
+        "lastModified": 1759330332,
+        "narHash": "sha256-ZKyOgOOm9Itjbc5xi89xMtw+cnnOFfl79zndPMTzKpU=",
        "owner": "ghostty-org",
        "repo": "ghostty",
-        "rev": "be0da4845cb629bcf1f5f1890a28850bb7adfe16",
+        "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": 1760580664,
-        "narHash": "sha256-/YdfibIrnqXAL8p5kqCU345mzpHoOtuVIkMiI2pF4Dc=",
+        "lastModified": 1759281824,
+        "narHash": "sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "98ff3f9af2684f6136c24beef08f5e2033fc5389",
+        "rev": "5b5be50345d4113d04ba58c444348849f5585b4a",
        "type": "github"
      },
      "original": {
@@ -156,13 +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",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_3",
+        "quadlet-nix": "quadlet-nix"
      }
    },
    "systems": {
@@ -196,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": {
--- a/flake.nix
+++ b/flake.nix
@@ -12,6 +12,7 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };
    ghostty.url = "github:ghostty-org/ghostty";
+    quadlet-nix.url = "github:SEIAROTg/quadlet-nix";
  };

  outputs = inputs @ {
@@ -21,12 +22,15 @@
    darwin,
    home-manager,
    ghostty,
+    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;
@@ -34,8 +38,7 @@
    # Primary laptop - MacBook Pro (2023, M3)
    darwinConfigurations."sephiroth" = darwin.lib.darwinSystem {
      system = "aarch64-darwin";
-      specialArgs = {
-        inherit userName userEmail ghostty;
+      specialArgs = customArgs // {
        hostname = "sephiroth";
        role = "devel";
      };
@@ -47,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;
        }
      ];
@@ -56,8 +61,7 @@
    # Primary desktop computer
    nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem {
      system = "x86_64-linux";
-      specialArgs = {
-        inherit userName userEmail ghostty;
+      specialArgs = customArgs // {
        hostname = "cloud";
        role = "devel";
      };
@@ -70,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
          ];
@@ -81,8 +87,7 @@
    # Apartment appliance server
    nixosConfigurations."valefor" = nixpkgs.lib.nixosSystem {
      system = "x86_64-linux";
-      specialArgs = {
-        inherit userName userEmail;
+      specialArgs = customArgs // {
        hostname = "valefor";
        role = "server";
      };
@@ -94,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
          ];
@@ -105,29 +112,25 @@
    # 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 = [
-      #   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
-      #     ];
-      #   }
-      # ];
+      modules = [
+        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
+          ];
+        }
+      ];
    };
  };
 }
--- a/modules/machine/cloud/configuration.nix
+++ b/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
--- a/modules/machine/cloud/hardware-configuration.nix
+++ b/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
--- a/modules/machine/ixion/configuration.nix
+++ b/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";
+}
--- a/modules/machine/ixion/default.nix
+++ b/modules/machine/ixion/default.nix
@@ -0,0 +1,6 @@
+{...}: {
+  imports = [
+    ./configuration.nix
+    ./hardware-configuration.nix
+  ];
+}
--- a/modules/machine/ixion/hardware-configuration.nix
+++ b/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;
+}
--- a/modules/pwrMgmt/README.md
+++ b/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 = [
--- a/modules/sound/shairport.nix
+++ b/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";
  };
 }
--- a/modules/virtualization/README.md
+++ b/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

--- a/modules/virtualization/quadlet.nix
+++ b/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;
+  };
+}
Author	SHA1	Message	Date
Wyatt J. Miller	0c1763528e	added base configuration for ixion, applied system update, modified power mgmt readme	2025-10-05 23:11:47 -04:00
Wyatt J. Miller	59ed5f0463	created easy wrapper for quadlet-nix	2025-10-05 23:10:47 -04:00
Wyatt J. Miller	aa47f720ed	Merge branch 'master' into ixion-build	2025-10-04 20:37:41 -04:00
Wyatt J. Miller	831fce71b8	added quadlet-nix input, created initial ixion config, created wrapper around quadlets also wrote some doucumentation about quadlets, nothing too comprehesive though as the wrapper might get removed later	2025-06-01 19:04:38 -04:00