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

defaults/nvim/lua/plugins/discord.lua

@@ -1,5 +0,0 @@
-return {
-  { 
-    'andweeb/presence.nvim',
-  }
-}

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,6 +22,7 @@
     darwin,
     home-manager,
     ghostty,
+    quadlet-nix,
     ...
   }: let
     userName = "wyatt";
@@ -47,7 +49,7 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs // { role = "devel"; };
+          home-manager.extraSpecialArgs = extraSpecialArgs;
           home-manager.users.${userName} = import ./home;
         }
       ];
@@ -70,7 +72,7 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs // { role = "devel"; };
+          home-manager.extraSpecialArgs = extraSpecialArgs;
           home-manager.users.${userName}.imports = [
             ./home
           ];
@@ -94,7 +96,7 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs // { role = "server"; };
+          home-manager.extraSpecialArgs = extraSpecialArgs;
           home-manager.users.${userName}.imports = [
             ./home
           ];
@@ -110,24 +112,21 @@
         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 = [
+        nix-flatpak.nixosModules.nix-flatpak
+        ./modules/common
+        ./modules/machine/ixion
+
+        home-manager.nixosModules.home-manager
+        {
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+          home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.users.${userName}.imports = [
+            ./home
+          ];
+        }
+      ];
     };
   };
 }

home/browser.nix

@@ -1,5 +1,4 @@
 {
-  role,
   pkgs,
   lib,
   ...
@@ -10,7 +9,7 @@
   };
 
   programs.chromium = {
-    enable = pkgs.stdenv.isLinux && role == "devel";
+    enable = pkgs.stdenv.isLinux;
     package = pkgs.ungoogled-chromium.override {
       enableWideVine = true;
       commandLineArgs = [

home/default.nix

@@ -4,7 +4,6 @@
   userName,
   userEmail,
   ghostty,
-  role,
   ...
 }: let
   # Have a file sturcture that holds all the configuration files that can't be configured by Nix
@@ -14,7 +13,7 @@
   };
 in {
   # Import sub modules
-  imports = map (module: import module {inherit lib pkgs dirs userName userEmail ghostty role;}) [
+  imports = map (module: import module {inherit lib pkgs dirs userName userEmail ghostty;}) [
     ./atuin.nix
     ./shell.nix
     ./packages

home/git.nix

@@ -17,7 +17,6 @@
       push.autoSetupRemote = true;
       pull.merge = true;
       merge.tool = "nvimdiff";
-      mergetool.keepBackup = false;
     };
 
     ignores = [

home/sway.nix

@@ -1,10 +1,8 @@
 {
   lib,
   pkgs,
-  role,
   ...
 }: let
-  isDevel = pkgs.stdenv.isLinux && role == "devel";
   dirs = {
     defaults = ../defaults;
   };
@@ -18,7 +16,7 @@
   };
 in {
   wayland.windowManager.sway = {
-    enable = isDevel;
+    enable = pkgs.stdenv.isLinux;
     extraOptions = []; # Extra arguments to pass into sway. If sway goes haywire, we might need something in here
     xwayland = true;
     systemd.enable = true;
@@ -31,11 +29,11 @@ in {
   xdg.configFile."sway/config".source = lib.mkForce (dirs.defaults + /sway/config);
   xdg.configFile."waybar/config".source = lib.mkForce (dirs.defaults + /waybar/config);
   xdg.configFile."waybar/style.css".source = lib.mkForce (dirs.defaults + /waybar/style.css);
-  programs.rofi.enable = isDevel;
-  services.mako.enable = isDevel;
+  programs.rofi.enable = pkgs.stdenv.isLinux;
+  services.mako.enable = pkgs.stdenv.isLinux;
 
   programs.waybar = {
-    enable = isDevel;
+    enable = pkgs.stdenv.isLinux;
     systemd.enable = true;
 
     package = pkgs.waybar.overrideAttrs (old: {

modules/machine/ixion/configuration.nix

@@ -0,0 +1,16 @@
+{
+  lib,
+  pkgs,
+  userName,
+  ...
+}: {
+  imports = [ ];
+
+  # Enable flakes for NixOS
+  nix.settings.experimental-features = ["nix-command" "flakes"];
+
+  # Custom kernel/boot stuff
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+}

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/machine/valefor/configuration.nix

@@ -87,12 +87,7 @@
 
   # Core networking module (see ../../networking/core.nix)
   network = {
-    firewall = {
-      enable = true;
-      tcpPorts = {
-        allowedPorts = [8123];
-      };
-    };
+    firewall.enable = true;
     networkManager.enable = true;
   };
 
@@ -102,37 +97,7 @@
   };
 
   # Add username to groups "wheel" and "video" - more may be added here later
-  users.users.${userName} = { 
-    extraGroups = ["wheel" "podman" "network"]; 
-    openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFV9eSc9L+aJLoKoexq2f/jb5rpyZnhuGiyhS8YQAbaS wyatt@wyattjmiller.com"
-    ];
-  };
-
-  users.users.root.openssh.authorizedKeys.keys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFV9eSc9L+aJLoKoexq2f/jb5rpyZnhuGiyhS8YQAbaS wyatt@wyattjmiller.com"
-  ];
-
-  # Add Home Assistant service
-  services.home-assistant = {
-    enable = true;
-    extraComponents = [
-      "esphome"
-      "met"
-      "radio_browser"
-      "homeassistant_hardware"
-      "zha"
-      "group"
-      "mikrotik"
-    ];
-    config = {
-      # Includes dependencies for a basic setup
-      # https://www.home-assistant.io/integrations/default_config/
-      default_config = {};
-    };
-  };
-
-  security.sudo.wheelNeedsPassword = false;
+  users.users.${userName}.extraGroups = ["wheel" "podman" "network"];
 
   system.stateVersion = "24.11";
 }

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,5 @@
+# ----------------------
+# Wrapper for defining Quadlets in Nix via quadlet-nix
+#
+# Still WIP
+# ----------------------