stopping here for a while

might move into one of the existing modules

defaults/nvim/lua/plugins/discord.lua

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

flake.nix

@@ -12,7 +12,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     ghostty.url = "github:ghostty-org/ghostty";
-    quadlet-nix.url = "github:SEIAROTg/quadlet-nix";
   };
 
   outputs = inputs @ {
@@ -22,7 +21,6 @@
     darwin,
     home-manager,
     ghostty,
-    quadlet-nix,
     ...
   }: let
     userName = "wyatt";
@@ -49,7 +47,7 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.extraSpecialArgs = extraSpecialArgs // { role = "devel"; };
           home-manager.users.${userName} = import ./home;
         }
       ];
@@ -72,7 +70,7 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.extraSpecialArgs = extraSpecialArgs // { role = "devel"; };
           home-manager.users.${userName}.imports = [
             ./home
           ];
@@ -96,7 +94,7 @@
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs;
+          home-manager.extraSpecialArgs = extraSpecialArgs // { role = "server"; };
           home-manager.users.${userName}.imports = [
             ./home
           ];
@@ -112,21 +110,24 @@
         hostname = "ixion";
         role = "server";
       };
-      modules = [
+      # modules = [
-        nix-flatpak.nixosModules.nix-flatpak
+      #   nix-flatpak.nixosModules.nix-flatpak
-        ./modules/common
+      #   nix-ld.nixosModules.nix-ld
-        ./modules/machine/ixion
+      #   ./modules/nixos/hardware-configuration.nix
-
+      #   ./modules/nix-core.nix
-        home-manager.nixosModules.home-manager
+      #   ./modules/nixos/configuration.nix
-        {
+      #   ./modules/host-users.nix
-          home-manager.useGlobalPkgs = true;
+      #
-          home-manager.useUserPackages = true;
+      #   home-manager.nixosModules.home-manager
-          home-manager.extraSpecialArgs = extraSpecialArgs;
+      #   {
-          home-manager.users.${userName}.imports = [
+      #     home-manager.useGlobalPkgs = true;
-            ./home
+      #     home-manager.useUserPackages = true;
-          ];
+      #     home-manager.extraSpecialArgs = extraSpecialArgs;
-        }
+      #     home-manager.users.${userName}.imports = [
-      ];
+      #       ./home
+      #     ];
+      #   }
+      # ];
     };
   };
 }

home/browser.nix

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

home/default.nix

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

home/git.nix

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

home/sway.nix

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

modules/machine/ixion/configuration.nix

@@ -1,16 +0,0 @@
-{
-  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

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

modules/machine/ixion/hardware-configuration.nix

@@ -1,46 +0,0 @@
-# --- 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,7 +87,12 @@
 
   # Core networking module (see ../../networking/core.nix)
   network = {
-    firewall.enable = true;
+    firewall = {
+      enable = true;
+      tcpPorts = {
+        allowedPorts = [8123];
+      };
+    };
     networkManager.enable = true;
   };
 
@@ -97,7 +102,37 @@
   };
 
   # Add username to groups "wheel" and "video" - more may be added here later
-  users.users.${userName}.extraGroups = ["wheel" "podman" "network"];
+  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;
 
   system.stateVersion = "24.11";
 }

modules/virtualization/README.md

@@ -40,13 +40,7 @@ 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

@@ -1,5 +0,0 @@
-# ----------------------
-# Wrapper for defining Quadlets in Nix via quadlet-nix
-#
-# Still WIP
-# ----------------------