added reshade

wip: there are other packages available, might be advantageous of me to
added those other packages as optional values

defaults/nvim/lua/plugins/discord.lua

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

flake.lock

@@ -115,18 +115,37 @@
         "type": "github"
       }
     },
-    "nixpkgs": {
+    "nix-reshade": {
+      "inputs": {
+        "nixpkgs": "nixpkgs",
+        "treefmt-nix": "treefmt-nix"
+      },
       "locked": {
-        "lastModified": 1747953325,
+        "lastModified": 1749858810,
-        "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=",
+        "narHash": "sha256-xg/MnKlnI6G/mLrh2apPuXUq8wjYSBbt8RtilM5cutI=",
-        "owner": "nixos",
+        "owner": "LovingMelody",
-        "repo": "nixpkgs",
+        "repo": "nix-reshade",
-        "rev": "55d1f923c480dadce40f5231feb472e81b0bab48",
+        "rev": "e1a7e702b052e4a98a9f15796f048270b2aca679",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "LovingMelody",
-        "ref": "nixos-25.05",
+        "repo": "nix-reshade",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1749285348,
+        "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -163,13 +182,30 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1747953325,
+        "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "55d1f923c480dadce40f5231feb472e81b0bab48",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "darwin": "darwin",
         "ghostty": "ghostty",
         "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs"
+        "nix-reshade": "nix-reshade",
+        "nixpkgs": "nixpkgs_2"
       }
     },
     "systems": {
@@ -187,6 +223,27 @@
         "type": "github"
       }
     },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nix-reshade",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1749194973,
+        "narHash": "sha256-eEy8cuS0mZ2j/r/FE0/LYBSBcIs/MKOIVakwHVuqTfk=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "a05be418a1af1198ca0f63facb13c985db4cb3c5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
     "zig": {
       "inputs": {
         "flake-compat": [

flake.nix

@@ -12,7 +12,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     ghostty.url = "github:ghostty-org/ghostty";
-    quadlet-nix.url = "github:SEIAROTg/quadlet-nix";
+    nix-reshade.url = "github:LovingMelody/nix-reshade";
   };
 
   outputs = inputs @ {
@@ -22,7 +22,6 @@
     darwin,
     home-manager,
     ghostty,
-    quadlet-nix,
     ...
   }: let
     userName = "wyatt";
@@ -112,21 +111,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/git.nix

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

modules/apps/gaming.nix

@@ -2,6 +2,7 @@
   config,
   lib,
   pkgs,
+  inputs,
   ...
 }: let
   cfg = config.gaming;
@@ -108,6 +109,10 @@ in {
     ffxiv = {
       enable = lib.mkEnableOption "Final Fantasy XIV and it's accompanied (unofficial) launcher";
     };
+
+    reshade = {
+      enable = lib.mkEnableOption "ReShade, a post-processing injector for games and video software";
+    };
   };
 
   config = {
@@ -154,6 +159,7 @@ in {
         cfg.lutris.extraPackages
       )) ++
       (lib.optionals cfg.minecraft.enable [pkgs.prismlauncher]) ++
-      (lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher]);
+      (lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher]) ++
+      (lib.optionals cfg.reshade.enable [inputs.packages.${pkgs.system}.reshade]);
   };
 }

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/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
-# ----------------------