added virtualbox

README.md

@@ -53,3 +53,11 @@ Installing Sakamoto Nix configuration may vary on your current operating system.
     ```sh
     $ sudo nix run nix-darwin --extra-experimental-features "nix-command flakes" -- switch --flake ~/.config/nixos#macos
     ```
+
+## Problems:
+* XDG defaults (file manager default is terminal)
+* File Manager must be TUI
+* Bluetooth and WiFi should open at TUI
+* Steam and Heroic incompatible
+* Broken switchwall.sh
+* Box fonts

config.nix

@@ -1,5 +1,8 @@
 {
   myConfig = {
+    macos = {
+      Username = "lsoriano";
+    };
     essentials = {
       # !!! replace it with your own, else system might malfunction.
       Username = "kenji";
@@ -17,7 +20,7 @@
     nixos = {
       Hostname = "hakase";
       Timezone = "America/Chicago";
-      enableSteamOS = true;
+      enableSteamOS = false;
 
       Boot = {
         mode = "systemd"; # systemd or grub
@@ -25,31 +28,31 @@
       Apps = {
         packages = pkgs:
           with pkgs; [
+            adwaita-icon-theme
             jellyfin-media-player
-            usbutils
+            delfin
-            pciutils
             goverlay
             geekbench_6
             gparted
             ntfs3g
-            todoist
             feishin
             discord
             xfce.thunar
           ];
       };
       Hyprland = {
-        enable = false;
         monitors = [
-          "DP-1, highres@165,0x1080,1,vrr,1"
+          # "DP-2, highres@165,0x1080,1,vrr,1"
-          "DP-2, highres@highrr,0x0,1"
+          # "DP-2, highres@180,0x1080,1,cm,hdr, sdrbrightness, 1.5, sdrsaturation, 0.98"
+          "DP-2, highres@180,0x1080,1,bitdepth,10,cm,hdr,sdrbrightness,1.4,sdrsaturation,0.98"
+          "DP-1, highres@highrr,760x0,1"
           "HDMI-A-1, 1920x1080@120, 20000x20000,1"
           # "HDMI-A-1, disabled"
         ];
       };
       Git = {
-        user = "";
+        user = "kenji";
-        email = "";
+        email = "kenji@hakase";
         defaultBranch = "master";
       };
     };
@@ -64,7 +67,7 @@
             sshUser = "";
             sshKey = "";
             system = "";
-            supportedFeatures = ["big-parallel" "kvm" "nixos-test"];
+            supportedFeatures = ["apple-virt" "big-parallel" "kvm" "nixos-test"];
           }
         ];
       };

flake.nix

@@ -6,18 +6,26 @@
     flake-utils.url = "github:numtide/flake-utils";
     chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
 
-    nur = {
-      url = "github:nix-community/NUR";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     jovian = {
       url = "github:Jovian-Experiments/Jovian-NixOS";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    hyprland.url = "github:hyprwm/Hyprland";
+    matugen = {
-    hyprland.inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:/InioX/Matugen";
+      inputs.nixpkgs.follows = "nixpkgs";
+      # ref = "refs/tags/matugen-v0.10.0";
+    };
+
+    erosanix = {
+      url = "github:emmanuelrosa/erosanix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    hyprland = {
+      url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     home-manager = {
       url = "github:nix-community/home-manager";
@@ -34,77 +42,101 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    matugen = {
+    illogical-impulse = {
-      url = "github:/InioX/Matugen";
+      url = "git+https://git.sakamoto.dev/kenji/illogical-impulse.git";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    quickshell = {
+    omarchy-nix = {
-      url = "git+https://git.outfoxxed.me/outfoxxed/quickshell";
+      url = "git+https://git.sakamoto.dev/kenji/omarchy-nix.git";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    caelestia-shell = {
-      url = "git+https://git.sakamoto.dev/kenji/caelestia-nix";
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.home-manager.follows = "home-manager";
     };
   };
 
   outputs = {
     self,
     nixpkgs,
-    flake-utils,
     home-manager,
     darwin,
+    chaotic,
+    jovian,
+    nixovim,
+    illogical-impulse,
+    erosanix,
+    omarchy-nix,
     ...
   } @ inputs: let
     config = import ./config.nix;
-
+    system = "x86_64-linux";
-    mkArgs = system:
+    args =
       {
         inherit inputs system;
       }
       // config;
-
-    systems = ["x86_64-linux" "aarch64-linux"];
-  in
-    flake-utils.lib.eachSystem systems (system: let
-      pkgs = import nixpkgs {
-        inherit system;
-        config.allowUnfree = true;
-      };
-      args = mkArgs system;
   in {
-    })
-    // {
     nixosConfigurations = {
       hakase = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
+        specialArgs = args;
-          specialArgs = mkArgs "x86_64-linux";
         modules = [
+          chaotic.nixosModules.default
+          home-manager.nixosModules.home-manager
+          jovian.nixosModules.default
+          erosanix.nixosModules.protonvpn
           ./hosts/hakase/configuration.nix
         ];
       };
+      hakase-omarchy = nixpkgs.lib.nixosSystem {
+        specialArgs = args;
+        modules = [
+          chaotic.nixosModules.default
+          omarchy-nix.nixosModules.default
+          home-manager.nixosModules.home-manager
+          ./hosts/hakase-omarchy/configuration.nix
+        ];
+      };
+      vanilla = nixpkgs.lib.nixosSystem {
+        specialArgs = args;
+        modules = [
+          ./hosts/vanilla/configuration.nix
+          # nixovim.packages.${system}.full
+        ];
+      };
     };
 
     homeConfigurations = {
       hakase = home-manager.lib.homeManagerConfiguration {
         pkgs = import nixpkgs {
-            system = "x86_64-linux";
           config.allowUnfree = true;
-            extraSpecialArgs = mkArgs "x86_64-linux";
+          extraSpecialArgs = args;
         };
         modules = [
+          home-manager.nixosModules.home-manager
           ./home/hakase.nix
         ];
       };
+      hakase-omarchy = home-manager.lib.homeManagerConfiguration {
+        pkgs = import nixpkgs {
+          config.allowUnfree = true;
+          extraSpecialArgs = args;
+        };
+        modules = [
+          home-manager.nixosModules.home-manager
+          ./home/hakase-omarchy.nix
+        ];
+      };
     };
-
     darwinConfigurations = {
       macos = darwin.lib.darwinSystem {
         system = "aarch64-darwin";
-          specialArgs = mkArgs "aarch64-darwin";
+        specialArgs =
+          {
+            inherit inputs;
+            system = "aarch64-darwin";
+          }
+          // config;
         modules = [
+          home-manager.darwinModules.home-manager
           ./hosts/macos/darwin.nix
         ];
       };

home/hakase-omarchy.nix

@@ -0,0 +1,15 @@
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}: {
+  imports = [
+    # ... your other imports
+    inputs.omarchy-nix.homeManagerModules.default # Assuming you have a system module too
+  ];
+
+  # ADD THIS BLOCK
+
+  home.stateVersion = "25.05";
+}

home/hakase.nix

@@ -9,6 +9,7 @@ in {
     # inputs.chaotic.homeManagerModules.default
     ../modules/home/desktop.nix
     ../modules/home/terminal.nix
+    ../modules/home/apps.nix
   ];
   # nix.package = pkgs.nix;
   home.packages = info.myConfig.nixos.Apps.packages pkgs;

hosts/hakase-omarchy/configuration.nix

@@ -0,0 +1,156 @@
+{
+  pkgs,
+  myConfig,
+  specialArgs,
+  ...
+}: {
+  imports = [
+    ../../modules/default/boot.nix
+    ./hardware-configuration.nix
+  ];
+
+  system.stateVersion = "25.05";
+
+  i18n.defaultLocale = "en_US.UTF-8";
+  time.timeZone = "${myConfig.nixos.Timezone}";
+  nixpkgs.config.allowUnfree = myConfig.general.allowUnfree;
+
+  console = {
+    earlySetup = false;
+    font = "${pkgs.terminus_font}/share/consolefonts/ter-132n.psf.gz";
+    packages = with pkgs; [terminus_font];
+    useXkbConfig = true;
+  };
+
+  users = {
+    # defaultUserShell = pkgs.${myConfig.general.Terminal.shell};
+    users = {
+      ${myConfig.essentials.Username} = {
+        isNormalUser = true;
+        extraGroups = ["wheel" "networkmanager" "input" "video"];
+        initialHashedPassword = "$y$j9T$NHFtSwF4NJtEmgMjy4Xdg.$9WQltjEx3eEfZ7GbpGLW8lBhJtiXPOeIawrxdmx0.vB";
+        useDefaultShell = true;
+        packages = [];
+      };
+    };
+  };
+
+  omarchy = {
+    full_name = "${myConfig.essentials.Username}"; # Or variable
+    email_address = "${myConfig.nixos.Git.email}";
+  };
+
+  home-manager = {
+    backupFileExtension = "backup";
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    extraSpecialArgs = specialArgs;
+    users.${myConfig.essentials.Username} = import ../../home/hakase-omarchy.nix;
+  };
+  networking = {
+    useDHCP = false;
+    wireless = {
+      enable = false;
+    };
+
+    networkmanager.enable = true;
+    firewall = {
+      enable = true;
+      allowedTCPPorts = [22 80 531];
+      allowedUDPPorts = [53 531 5353];
+    };
+    proxy = {
+      default = null;
+      noProxy = null;
+    };
+  };
+
+  systemd = {
+    # network.enable = true;
+    # extraConfig = "DefaultTimeoutStopSec=5s";
+  };
+
+  nix = {
+    settings = {
+      experimental-features = ["nix-command" "flakes"];
+    };
+  };
+  #
+  # hardware = {
+  #   enableAllFirmware = true;
+  #   logitech.wireless.enable = true;
+  #
+  #   bluetooth = {
+  #     enable = true;
+  #     powerOnBoot = true;
+  #     settings = {
+  #       General = {
+  #         # AutoEnable = true;
+  #         Experimental = true;
+  #         MultiProfile = "multiple";
+  #         FastConnectable = true;
+  #         # ControllerMode = "bredr";
+  #       };
+  #       Policy = {
+  #         AutoEnable = true;
+  #       };
+  #     };
+  #   };
+  #
+  #   graphics = {
+  #     enable = true;
+  #     enable32Bit = true;
+  #   };
+  #
+  #   xone.enable = true;
+  # };
+  #
+
+  # security.rtkit.enable = true;
+
+  # programs = {
+  #   bash.interactiveShellInit = ''
+  #     if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]; then
+  #       shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
+  #       exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
+  #     fi
+  #   '';
+  #   zsh.enable = true;
+  #   fish.enable = true;
+  #
+  #   appimage = {
+  #     enable = true;
+  #     binfmt = true;
+  #   };
+  #
+  #   ssh.extraConfig = myConfig.optionals.Ssh.extraConfig;
+  # };
+
+  # jovian.steamos.enableMesaPatches = true;
+  #
+  # services = {
+  #   displayManager.sessionPackages = [
+  #     inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland
+  #   ];
+  #
+  #   getty.autologinUser = lib.mkOverride 10 "${myConfig.essentials.Username}";
+  #
+  #   flatpak.enable = true;
+  #   seatd.enable = true;
+  #   upower.enable = true;
+  #   scx.enable = true;
+  #   libinput.enable = true;
+  #   blueman.enable = true;
+  #   printing.enable = true;
+  #   openssh.enable = true;
+  #
+  #   pipewire = {
+  #     enable = true;
+  #     alsa = {
+  #       enable = true;
+  #       support32Bit = true;
+  #     };
+  #     pulse.enable = true;
+  #   };
+  # };
+}

hosts/hakase-omarchy/hardware-configuration.nix

@@ -0,0 +1,33 @@
+# 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 = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/mapper/luks-9091013c-0763-40a6-8316-d44d52df3530";
+      fsType = "ext4";
+    };
+
+  boot.initrd.luks.devices."luks-9091013c-0763-40a6-8316-d44d52df3530".device = "/dev/disk/by-uuid/9091013c-0763-40a6-8316-d44d52df3530";
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/B332-BF84";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  swapDevices = [ ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

hosts/hakase/configuration.nix

@@ -6,21 +6,33 @@
   specialArgs,
   ...
 }: {
-  imports = [
+  imports =
-    inputs.home-manager.nixosModules.home-manager
+    [
-    inputs.chaotic.nixosModules.default
       ./hardware-configuration.nix
+      ../../modules/default/apps.nix
       ../../modules/default/desktop.nix
-    ../../modules/default/dev.nix
       ../../modules/default/remote.nix
+      ../../modules/default/gaming.nix
+      ../../modules/default/udev.nix
+      ../../modules/default/boot.nix
+      ../../modules/default/dev.nix
+      ../../modules/default/security.nix
+    ]
+    ++ lib.optionals (myConfig.nixos.enableSteamOS == false) [
+      ../../modules/default/login.nix
     ];
 
-  environment.systemPackages = with pkgs; [
+  system.stateVersion = "25.05";
-    pavucontrol
+
-    wl-clipboard
+  i18n.defaultLocale = "en_US.UTF-8";
-    wget
+  time.timeZone = "${myConfig.nixos.Timezone}";
-    protontricks
+
-  ];
+  console = {
+    earlySetup = false;
+    font = "${pkgs.terminus_font}/share/consolefonts/ter-132n.psf.gz";
+    packages = with pkgs; [terminus_font];
+    useXkbConfig = true;
+  };
 
   users = {
     defaultUserShell = pkgs.${myConfig.general.Terminal.shell};
@@ -34,6 +46,7 @@
       };
     };
   };
+
   home-manager = {
     backupFileExtension = "backup";
     useGlobalPkgs = true;
@@ -44,92 +57,6 @@
 
   nixpkgs.config.allowUnfree = myConfig.general.allowUnfree;
 
-  hardware.logitech.wireless.enable = true;
-  hardware.bluetooth.enable = true;
-  hardware.bluetooth.powerOnBoot = true;
-  hardware.bluetooth.settings = {
-    General = {
-      AutoEnable = true;
-      Experimental = true;
-      MultiProfile = "multiple";
-      FastConnectable = true;
-    };
-  };
-  hardware.graphics = {
-    enable = true;
-    enable32Bit = true;
-  };
-
-  i18n.defaultLocale = "en_US.UTF-8";
-  time.timeZone = "${myConfig.nixos.Timezone}";
-
-  boot.loader = {
-    systemd-boot = lib.mkIf (myConfig.nixos.Boot.mode == "systemd") {
-      enable = true;
-    };
-    grub = lib.mkIf (myConfig.nixos.Boot.mode == "grub") {
-      efiSupport = true;
-      enable = true;
-      device = "nodev";
-      useOSProber = true;
-    };
-    efi = {
-      canTouchEfiVariables = true;
-      efiSysMountPoint = "/boot";
-    };
-  };
-
-  programs.ssh.extraConfig = myConfig.optionals.Ssh.extraConfig;
-
-  programs.bash = {
-    interactiveShellInit = ''
-      if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
-      then
-        shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
-        exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
-      fi
-    '';
-  };
-
-  programs = {
-    zsh.enable = true;
-    fish.enable = true;
-  };
-
-  services = {
-    displayManager.sessionPackages = [inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland];
-    # getty.autologinUser = "${myConfig.essentials.Username}";
-    # greetd = {
-    #   enable = true;
-    #   settings.default_session = {
-    #     user = "${myConfig.essentials.Username}";
-    #     command = "Hyprland";
-    #   };
-    # };
-
-    seatd.enable = true;
-    upower.enable = true;
-    scx.enable = true; # by default uses scx_rustland scheduler
-    libinput.enable = true;
-    blueman.enable = true;
-    printing.enable = true;
-    openssh.enable = true;
-    pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-
-      # lowLatency = {
-      #   enable = true;
-      #   quantum = 64;
-      #   rate = 48000;
-      # };
-    };
-  };
-  # make pipewire realtime-capable
-  security.rtkit.enable = true;
-
   nix = {
     distributedBuilds = true;
     settings = {
@@ -139,66 +66,109 @@
     };
   };
 
-  console = {
+  hardware = {
-    earlySetup = false;
+    enableAllFirmware = true;
-    font = "${pkgs.terminus_font}/share/consolefonts/ter-132n.psf.gz";
+    logitech.wireless.enable = true;
-    packages = with pkgs; [terminus_font];
+
-    useXkbConfig = true;
+    bluetooth = {
+      enable = true;
+      powerOnBoot = true;
+      settings = {
+        General = {
+          Enable = "Source,Sink,Media,Socket";
+          # AutoEnable = true;
+          Experimental = true;
+          MultiProfile = "multiple";
+          FastConnectable = true;
+          # ControllerMode = "bredr";
+        };
+        Policy = {
+          AutoEnable = true;
+        };
+      };
+    };
+
+    graphics = {
+      enable = true;
+      enable32Bit = true;
+    };
+
+    xone.enable = true;
   };
 
   networking = {
-    # wakeOnLan.enable = true;
+    useDHCP = false;
+    wireless = {
+      enable = false;
+    };
+
     networkmanager.enable = true;
     firewall = {
       enable = true;
       allowedTCPPorts = [22 80];
       allowedUDPPorts = [53];
     };
-    proxy.default = null;
+    proxy = {
-    proxy.noProxy = null;
+      default = null;
+      noProxy = null;
+    };
   };
 
-  boot.loader.timeout = 0;
+  systemd = {
-  boot.loader.limine.maxGenerations = 5;
+    # network.enable = true;
-  hardware.amdgpu.initrd.enable = true;
+    # extraConfig = "DefaultTimeoutStopSec=5s";
+  };
 
-  boot.kernelParams = [
+  security.rtkit.enable = true;
-    "quiet"
+
-    "splash"
+  programs = {
-    "boot.shell_on_fail"
+    bash.interactiveShellInit = ''
-    "udev.log_priority=3"
+      if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]; then
-    "rd.systemd.show_status=auto"
+        shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
-    "iommu=pt"
+        exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
-    "amd_pstate=active"
+      fi
+    '';
+    zsh.enable = true;
+    fish.enable = true;
+
+    appimage = {
+      enable = true;
+      binfmt = true;
+    };
+
+    ssh.extraConfig = myConfig.optionals.Ssh.extraConfig;
+  };
+
+  # jovian.steamos.enableMesaPatches = true;
+
+  services = {
+    displayManager.sessionPackages = [
+      inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland
     ];
-  boot.kernelPackages = pkgs.linuxPackages_cachyos;
-  boot.kernel.sysctl = {
-    "kernel.split_lock_mitigate" = 0;
-    "kernel.nmi_watchdog" = 0;
-    "kernel.sched_bore" = "1";
-  };
 
-  boot.initrd = {
+    getty.autologinUser = lib.mkOverride 10 "${myConfig.essentials.Username}";
-    systemd.enable = true;
-    kernelModules = [];
-    verbose = false;
-  };
-  boot.plymouth.enable = true;
-  boot.plymouth.theme = "seal";
-  boot.plymouth.themePackages = with pkgs; [
-    # By default we would install all themes
-    (adi1090x-plymouth-themes.override {
-      selected_themes = ["seal"];
-    })
-  ];
-  boot.consoleLogLevel = 0;
-  systemd.extraConfig = "DefaultTimeoutStopSec=5s";
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
 
-  # networking.proxy.default = "http://user:password@proxy:port/";
+    flatpak.enable = true;
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+    seatd.enable = true;
-  system.stateVersion = "25.05";
+    upower.enable = true;
+    scx.enable = true;
+    libinput.enable = true;
+    blueman.enable = true;
+    printing.enable = true;
+    openssh.enable = true;
+
+    pipewire = {
+      enable = true;
+      alsa = {
+        enable = true;
+        support32Bit = true;
+      };
+      pulse.enable = true;
+    };
+    avahi = {
+      enable = true;
+      nssmdns4 = true;
+      openFirewall = true;
+    };
+  };
 }

hosts/hakase/hardware-configuration.nix

@@ -8,39 +8,25 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" ];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/532ac73e-1370-4e4d-9d5a-15033de0b96d";
+    { device = "/dev/mapper/luks-f8bd85aa-b08e-472a-b7f6-5e190b9b9714";
-      fsType = "btrfs";
+      fsType = "ext4";
-      options = [ "subvol=@" ];
     };
 
+  boot.initrd.luks.devices."luks-f8bd85aa-b08e-472a-b7f6-5e190b9b9714".device = "/dev/disk/by-uuid/f8bd85aa-b08e-472a-b7f6-5e190b9b9714";
+
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/1368-D3F3";
+    { device = "/dev/disk/by-uuid/72BA-AF9B";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };
 
-  fileSystems."/home" =
+  swapDevices = [ ];
-    { device = "/dev/disk/by-uuid/780aa81f-c4d6-478b-9c51-2d60362fdb07";
-      fsType = "ext4";
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/b02ef55c-4caf-4a24-a6a2-fb8001eafe22"; }
-    ];
-
-  # 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.enp11s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp10s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

hosts/macos/darwin.nix

@@ -3,45 +3,32 @@
   myConfig,
   inputs,
   system,
-  mkArgs,
+  specialArgs,
   ...
 }: {
   imports = [
     ../../modules/default/darwin.nix
-    inputs.home-manager.darwinModules.home-manager
   ];
-  # List packages installed in system profile. To search by name, run:
-  # $ nix-env -qaP | grep wget
   environment.systemPackages = [];
 
-  # Auto upgrade nix package and the daemon service.
-  # services.nix-daemon.enable = true;
-  # services.karabiner-elements.enable = true;
-  # nix.package = pkgs.nix;
-
-  # Necessary for using flakes on this system.
   nix.settings.experimental-features = "nix-command flakes";
-  nix.settings.trusted-users = myConfig.optionals.Builds.trustedUsers;
+  # nix.settings.trusted-users = myConfig.optionals.Builds.trustedUsers;
 
-  # Create /etc/zshrc that loads the nix-darwin environment.
   programs.zsh.enable = true; # default shell on catalina
   programs.fish.enable = true;
 
-  # $ darwin-rebuild changelog
   system.stateVersion = 5;
 
-  # The platform the configuration will be used on.
   nixpkgs.hostPlatform = "aarch64-darwin";
   security.pam.services.sudo_local.touchIdAuth = true;
 
-  users.users.${myConfig.essentials.Username} = {
+  users.users.${myConfig.macos.Username} = {
-    name = "${myConfig.essentials.Username}";
+    name = "${myConfig.macos.Username}";
-    home = "/Users/${myConfig.essentials.Username}";
+    home = "/Users/${myConfig.macos.Username}";
-    # shell = pkgs.${myConfig.general.terminal.Shell}; # no support for nix-darwin, but can be changed via chsh.
   };
 
   home-manager.useGlobalPkgs = true;
   home-manager.useUserPackages = true;
-  home-manager.extraSpecialArgs = mkArgs system;
+  home-manager.extraSpecialArgs = specialArgs;
-  home-manager.users.${myConfig.essentials.Username} = import ../../home/darwin.nix;
+  home-manager.users.${myConfig.macos.Username} = import ../../home/darwin.nix;
 }

hosts/steamos/configuration.nix

@@ -1,169 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  myConfig,
-  inputs,
-  ...
-}: {
-  imports = [
-    # Include the results of the hardware scan.
-    inputs.chaotic.nixosModules.default
-    ./hardware-configuration.nix
-  ];
-
-  nix.settings.experimental-features = ["nix-command" "flakes"];
-  nixpkgs.config.allowUnfree = true;
-
-  ####################
-  # Boot & Kernel    #
-  ####################
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.loader.timeout = 0;
-  boot.loader.limine.maxGenerations = 5;
-  hardware.amdgpu.initrd.enable = true;
-
-  boot.kernelParams = ["quiet"];
-  boot.kernelPackages = pkgs.linuxPackages_cachyos;
-  boot.kernel.sysctl = {
-    "kernel.split_lock_mitigate" = 0;
-    "kernel.nmi_watchdog" = 0;
-    "kernel.sched_bore" = "1";
-  };
-
-  boot.initrd = {
-    systemd.enable = true;
-    kernelModules = [];
-    verbose = false;
-  };
-  boot.plymouth.enable = true;
-  boot.consoleLogLevel = 0;
-  systemd.extraConfig = "DefaultTimeoutStopSec=5s";
-
-  ################
-  # FileSystems  #
-  ################
-  # fileSystems."/" = {
-  #   options = ["compress=zstd"];
-  # };
-
-  ############
-  # Network  #
-  ############
-  networking = {
-    networkmanager.enable = true;
-    firewall.enable = false;
-    hostName = "nixos";
-  };
-
-  #################
-  # Bluetooth     #
-  #################
-  hardware.bluetooth.enable = true;
-  hardware.bluetooth.settings = {
-    General = {
-      MultiProfile = "multiple";
-      FastConnectable = true;
-    };
-  };
-
-  #################
-  # Sound & RTKit #
-  #################
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-  };
-
-  ########################
-  # Graphical & Greetd   #
-  ########################
-
-  services.xserver.enable = false;
-  services.getty.autologinUser = "steamos";
-  services.greetd = {
-    enable = true;
-    settings.default_session = {
-      user = "${myConfig.essentials.Username}";
-      command = "steam-gamescope > /dev/null 2>&1";
-    };
-  };
-
-  ########################
-  # Programs & Gaming    #
-  ########################
-  services.automatic-timezoned.enable = true;
-  services.flatpak.enable = true;
-  xdg.portal.enable = true;
-  xdg.portal.config.common.default = "*";
-  xdg.portal.extraPortals = [pkgs.xdg-desktop-portal-gtk];
-
-  # programs.steam.gamescopeSession.args = ["-w 1920" "-h 1080" "-r 120" "--xwayland-count 2" "-e" "--hdr-enabled" "--mangoapp"];
-
-  programs = {
-    appimage = {
-      enable = true;
-      binfmt = true;
-    };
-    fish = {enable = true;};
-    mosh = {enable = true;};
-    tmux = {enable = true;};
-    gamescope.capSysNice = true;
-    steam = {
-      enable = true;
-      gamescopeSession.enable = true;
-      extraCompatPackages = with pkgs; [proton-ge-bin];
-      extraPackages = with pkgs; [
-        mangohud
-        gamescope-wsi
-      ];
-    };
-  };
-
-  environment.sessionVariables = {
-    PROTON_USE_NTSYNC = "1";
-    ENABLE_HDR_WSI = "1";
-    DXVK_HDR = "1";
-    PROTON_ENABLE_AMD_AGS = "1";
-    PROTON_ENABLE_NVAPI = "1";
-    ENABLE_GAMESCOPE_WSI = "1";
-    STEAM_MULTIPLE_XWAYLANDS = "1";
-  };
-
-  ###################
-  # Virtualization  #
-  ###################
-  virtualisation.docker.enable = true;
-  virtualisation.docker.enableOnBoot = false;
-  virtualisation.libvirtd.enable = true;
-
-  ###############
-  # Users       #
-  ###############
-  users.users.${myConfig.essentials.Username} = {
-    isNormalUser = true;
-    description = "SteamOS user";
-    extraGroups = ["networkmanager" "wheel" "docker" "video" "seat" "audio" "libvirtd"];
-    # password = "steamos";
-  };
-
-  #################
-  # Security      #
-  #################
-  security.sudo.wheelNeedsPassword = false;
-  security.polkit.enable = true;
-  services.seatd.enable = true;
-  services.openssh.enable = true;
-
-  ######################
-  ######################
-
-  ########################
-  # System State Version #
-  ########################
-  system.stateVersion = "25.05";
-}

hosts/vanilla/configuration.nix

@@ -0,0 +1,133 @@
+# Edit this configuration file to define what should be installed on
+# your system. Help is available in the configuration.nix(5) man page, on
+# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
+{
+  config,
+  lib,
+  pkgs,
+  myConfig,
+  inputs,
+  ...
+}: {
+  imports = [
+    # Include the results of the hardware scan.
+    ./hardware-configuration.nix
+  ];
+
+  # Use the systemd-boot EFI boot loader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  # networking.hostName = "nixos"; # Define your hostname.
+  # Pick only one of the below networking options.
+  # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
+  networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
+
+  # Set your time zone.
+  time.timeZone = "${myConfig.nixos.Timezone}";
+
+  # Configure network proxy if necessary
+  # networking.proxy.default = "http://user:password@proxy:port/";
+  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_US.UTF-8";
+  console = {
+    earlySetup = false;
+    font = "${pkgs.terminus_font}/share/consolefonts/ter-132n.psf.gz";
+    packages = with pkgs; [terminus_font];
+    useXkbConfig = true;
+  };
+
+  # Enable the X11 windowing system.
+  # services.xserver.enable = true;
+
+  # Configure keymap in X11
+  # services.xserver.xkb.layout = "us";
+  # services.xserver.xkb.options = "eurosign:e,caps:escape";
+
+  # Enable CUPS to print documents.
+  # services.printing.enable = true;
+
+  # Enable sound.
+  # services.pulseaudio.enable = true;
+  # OR
+  services.pipewire = {
+    enable = true;
+    pulse.enable = true;
+  };
+
+  hardware.bluetooth.enable = true;
+  services = {
+    blueman.enable = true;
+  };
+
+  # Enable touchpad support (enabled default in most desktopManager).
+  # services.libinput.enable = true;
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.users.${myConfig.essentials.Username} = {
+    isNormalUser = true;
+    extraGroups = ["wheel"]; # Enable ‘sudo’ for the user.
+    packages = with pkgs; [
+      tree
+    ];
+  };
+
+  # programs.firefox.enable = true;
+
+  # List packages installed in system profile.
+  # You can use https://search.nixos.org/ to find more packages (and options).
+  environment.systemPackages = with pkgs; [
+    inputs.nixovim.packages.${system}.full
+    # linux-firmware
+    vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+    wget
+  ];
+
+  hardware.firmware = [
+    pkgs.linux-firmware
+  ];
+  # Some programs need SUID wrappers, can be configured further or are
+  # started in user sessions.
+  # programs.mtr.enable = true;
+  # programs.gnupg.agent = {
+  #   enable = true;
+  #   enableSSHSupport = true;
+  # };
+
+  # List services that you want to enable:
+
+  # Enable the OpenSSH daemon.
+  services.openssh.enable = true;
+
+  # Open ports in the firewall.
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
+
+  # Copy the NixOS configuration file and link it from the resulting system
+  # (/run/current-system/configuration.nix). This is useful in case you
+  # accidentally delete configuration.nix.
+  # system.copySystemConfiguration = true;
+
+  # This option defines the first version of NixOS you have installed on this particular machine,
+  # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
+  #
+  # Most users should NEVER change this value after the initial install, for any reason,
+  # even if you've upgraded your system to a new NixOS release.
+  #
+  # This value does NOT affect the Nixpkgs version your packages and OS are pulled from,
+  # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how
+  # to actually do that.
+  #
+  # This value being lower than the current NixOS release does NOT mean your system is
+  # out of date, out of support, or vulnerable.
+  #
+  # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
+  # and migrated your data accordingly.
+  #
+  # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
+  system.stateVersion = "25.11"; # Did you read the comment?
+}

hosts/vanilla/hardware-configuration.nix

@@ -14,13 +14,13 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/532ac73e-1370-4e4d-9d5a-15033de0b96d";
+    { device = "/dev/disk/by-uuid/9f701bae-3392-4927-b27d-a905dd67edab";
       fsType = "btrfs";
       options = [ "subvol=@" ];
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/1368-D3F3";
+    { device = "/dev/disk/by-uuid/894C-F998";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };

modules/default/apps.nix

@@ -0,0 +1,28 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    usbutils
+    pciutils
+    pavucontrol
+    wget
+    dualsensectl
+    protontricks
+    wl-clipboard
+    tldr
+    anki
+    lact
+    lm_sensors
+    grim
+  ];
+  imports = [
+    ../../packages/virtualbox/default.nix
+    # ../../packages/lact/default.nix
+  ];
+  hardware.amdgpu.overdrive.enable = true;
+  services.lact.enable = true;
+  # services = {
+  #   protonvpn = {
+  #     enable = true;
+  #     autostart = true;
+  #   };
+  # };
+}

modules/default/boot.nix

@@ -0,0 +1,68 @@
+{
+  myConfig,
+  lib,
+  pkgs,
+  ...
+}: {
+  boot = {
+    loader = {
+      timeout = 0;
+      efi = {
+        canTouchEfiVariables = true;
+        efiSysMountPoint = "/boot";
+      };
+
+      limine = lib.mkIf (myConfig.nixos.Boot.mode == "limine") {
+        enable = true;
+        maxGenerations = 5;
+      };
+
+      systemd-boot = lib.mkIf (myConfig.nixos.Boot.mode == "systemd") {
+        enable = true;
+        # xbootldrMountPoint = "/boot";
+
+        edk2-uefi-shell.enable = true;
+        edk2-uefi-shell.sortKey = "z_edk2";
+      };
+
+      # grub ain't that great for advanced setups such as using a secure boot.
+      grub = lib.mkIf (myConfig.nixos.Boot.mode == "grub") {
+        enable = true;
+        efiSupport = true;
+        device = "nodev";
+        useOSProber = true;
+      };
+    };
+
+    plymouth = {
+      enable = false;
+      theme = "seal";
+      themePackages = with pkgs; [
+        (adi1090x-plymouth-themes.override {
+          selected_themes = ["seal"];
+        })
+      ];
+    };
+
+    # blacklistedKernelModules = ["tpm_crb" "tpm_tis" "tpm"];
+
+    kernelPackages = pkgs.linuxPackages_cachyos;
+    kernelParams = [
+      # "quiet"
+      # "splash"
+      "boot.shell_on_fail"
+      "udev.log_priority=3"
+      "rd.systemd.show_status=auto"
+      "kvm.enable_virt_at_load=0"
+    ];
+
+    initrd = {
+      systemd.enable = true;
+      kernelModules = [];
+      verbose = false;
+    };
+
+    consoleLogLevel = 0;
+  };
+  hardware.amdgpu.initrd.enable = true;
+}

modules/default/desktop.nix

@@ -1,20 +1,12 @@
 {
   lib,
   myConfig,
+  pkgs,
   ...
 }: {
-  imports =
+  imports = [
-    [
+    # ../../packages/quickshell/default.nix
     ../../packages/hyprland/default.nix
-      ../../packages/matugen/default.nix
+    ../../packages/sunshine/default.nix
-      ../../packages/quickshell/default.nix
-      ../../packages/udev/default.nix
-    ]
-    ++ [
-      ../../packages/steam/default.nix
-      ../../packages/bottles/default.nix
-    ]
-    ++ lib.optionals (myConfig.nixos.enableSteamOS == true) [
-      ../../packages/steam/jovian.nix
   ];
 }

modules/default/dev.nix

@@ -1,5 +1,8 @@
-{
+{pkgs, ...}: {
   imports = [
     ../../packages/python/default.nix
   ];
+  environment.systemPackages = with pkgs; [
+    p7zip
+  ];
 }

modules/default/gaming.nix

@@ -0,0 +1,14 @@
+{
+  lib,
+  myConfig,
+  ...
+}: {
+  imports =
+    [
+      ../../packages/steam/default.nix
+    ]
+    ++ lib.optionals (myConfig.nixos.enableSteamOS == true)
+    [
+      ../../packages/steam/jovian.nix
+    ];
+}

modules/default/lanzaboote.nix

@@ -0,0 +1,27 @@
+# file: configuration.nix
+{
+  pkgs,
+  lib,
+  ...
+}: let
+  sources = import ./nix/sources.nix;
+  lanzaboote = import sources.lanzaboote;
+in {
+  imports = [lanzaboote.nixosModules.lanzaboote];
+
+  environment.systemPackages = [
+    # For debugging and troubleshooting Secure Boot.
+    pkgs.sbctl
+  ];
+
+  # Lanzaboote currently replaces the systemd-boot module.
+  # This setting is usually set to true in configuration.nix
+  # generated at installation time. So we force it to false
+  # for now.
+  boot.loader.systemd-boot.enable = lib.mkForce false;
+
+  boot.lanzaboote = {
+    enable = true;
+    pkiBundle = "/var/lib/sbctl";
+  };
+}

modules/default/login.nix

@@ -0,0 +1,13 @@
+{
+  lib,
+  myConfig,
+  ...
+}: {
+  services.greetd = {
+    enable = true;
+    settings.default_session = {
+      user = lib.mkOverride 10 "${myConfig.essentials.Username}";
+      command = lib.mkOverride 10 "Hyprland";
+    };
+  };
+}

modules/default/remote.nix

@@ -1,4 +1,6 @@
 {
   imports = [
+#    ../../packages/moondeck-buddy/appimage.nix
+    ../../packages/sunshine/default.nix
   ];
 }

modules/default/security.nix

@@ -1,5 +1,9 @@
 {pkgs, ...}: {
+  imports = [
+    # ./lanzaboote.nix
+  ];
   environment.systemPackages = with pkgs; [
-    bottles
+    niv
+    sbctl
   ];
 }

modules/default/udev.nix

@@ -0,0 +1,9 @@
+{pkgs, ...}: {
+  # services.udev.extraRules = ''
+  #   SUBSYSTEM=="usb", ATTR{idVendor}=="0e8d", ATTR{idProduct}=="0616", ATTR{power/wakeup}="enabled"
+  #
+  # '';
+  services.udev.packages = with pkgs; [
+    game-devices-udev-rules
+  ];
+}

modules/home/apps.nix

@@ -0,0 +1,19 @@
+{pkgs, ...}: {
+  imports = [
+    ../../packages/firefox/home.nix
+  ];
+
+  home.packages = with pkgs; [
+    heroic
+    # fcitx5
+    # fcitx5-mozc-ut
+    # kdePackages.fcitx5-configtool
+    solaar
+    parted
+    edk2-uefi-shell
+    libreoffice
+  ];
+  services.easyeffects = {
+    enable = true;
+  };
+}

modules/home/desktop.nix

@@ -1,26 +1,28 @@
 {
-  imports =
+  inputs,
-    [
+  pkgs,
+  lib,
+  ...
+}: {
+  imports = [
+    inputs.illogical-impulse.homeManagerModules.default
     ../../packages/fonts/home.nix
-      ../../packages/firefox/home.nix
+  ];
+  programs.illogical-impulse.enable = true;
+  programs.illogical-impulse.settings = {
+    hyprland.useNixForConf = false;
+    simpleStarship.enable = true;
+  };
 
-      ../../packages/hyprland/home.nix
+  # wayland.windowManager.hyprland = {
-      ../../packages/hyprlock/home.nix
+  #   settings = {
-      ../../packages/hypridle/home.nix
+  #     monitor = lib.mkForce [
-      ../../packages/quickshell/home.nix
+  #       "DP-1, highres@180,0x1080,1,bitdepth,10,cm,hdr,sdrbrightness,1.4,sdrsaturation,0.98"
-      ../../packages/swww/home.nix
+  #       "DP-2, highres@highrr,760x0,1"
-      ../../packages/hyprsunset/home.nix
+  #     ];
-      ../../packages/matugen/home.nix
+  #   };
-      ../../packages/rofi/home.nix
+  # };
-      ../../packages/bibata/home.nix
+  # programs.illogical-impulse.settings.simpleStarship.enable = true;
-    ]
+  home.packages = [
-    ++ [
-      ../../packages/solaar/home.nix
-    ]
-    ++ [
-      ../../packages/mangohud/home.nix
-      ../../packages/protonup/home.nix
-      ../../packages/lutris/home.nix
-      ../../packages/steam/home.nix
   ];
 }

modules/home/remote.nix

@@ -1,6 +1,6 @@
 {
   imports = [
-    ../../packages/moondeck-buddy/appimage.nix
+    # ../../packages/moondeck-buddy/appimage.nix
     ../../packages/sunshine/default.nix
   ];
 }

modules/home/terminal.nix

@@ -3,7 +3,7 @@
     ../../packages/fish/home.nix
     ../../packages/kitty/home.nix
     ../../packages/neovim/home.nix
-    ../../packages/starship/home.nix
+    # ../../packages/starship/home.nix
     ../../packages/fastfetch/home.nix
     ../../packages/zsh/home.nix
     ../../packages/zoxide/home.nix

nix/sources.json

@@ -0,0 +1,27 @@
+{
+    "lanzaboote": {
+        "branch": "master",
+        "description": "Secure Boot for NixOS [maintainers=@blitz @raitobezarius @nikstur]",
+        "homepage": "",
+        "owner": "nix-community",
+        "repo": "lanzaboote",
+        "rev": "v0.4.2",
+        "sha256": "0xc1wawnb0297h5khxblmf9pd1fry950xkcm7mwlck19s2906h80",
+        "type": "tarball",
+        "url": "https://github.com/nix-community/lanzaboote/archive/v0.4.2.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
+        "version": "0.4.2"
+    },
+    "nixpkgs": {
+        "branch": "nixos-unstable",
+        "description": "Nix Packages collection",
+        "homepage": null,
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "6c43a3495a11e261e5f41e5d7eda2d71dae1b2fe",
+        "sha256": "16f329z831bq7l3wn1dfvbkh95l2gcggdwn6rk3cisdmv2aa3189",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/6c43a3495a11e261e5f41e5d7eda2d71dae1b2fe.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    }
+}

nix/sources.nix

@@ -0,0 +1,198 @@
+# This file has been generated by Niv.
+
+let
+
+  #
+  # The fetchers. fetch_<type> fetches specs of type <type>.
+  #
+
+  fetch_file = pkgs: name: spec:
+    let
+      name' = sanitizeName name + "-src";
+    in
+    if spec.builtin or true then
+      builtins_fetchurl { inherit (spec) url sha256; name = name'; }
+    else
+      pkgs.fetchurl { inherit (spec) url sha256; name = name'; };
+
+  fetch_tarball = pkgs: name: spec:
+    let
+      name' = sanitizeName name + "-src";
+    in
+    if spec.builtin or true then
+      builtins_fetchTarball { name = name'; inherit (spec) url sha256; }
+    else
+      pkgs.fetchzip { name = name'; inherit (spec) url sha256; };
+
+  fetch_git = name: spec:
+    let
+      ref =
+        spec.ref or (
+          if spec ? branch then "refs/heads/${spec.branch}" else
+          if spec ? tag then "refs/tags/${spec.tag}" else
+          abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!"
+        );
+      submodules = spec.submodules or false;
+      submoduleArg =
+        let
+          nixSupportsSubmodules = builtins.compareVersions builtins.nixVersion "2.4" >= 0;
+          emptyArgWithWarning =
+            if submodules
+            then
+              builtins.trace
+                (
+                  "The niv input \"${name}\" uses submodules "
+                  + "but your nix's (${builtins.nixVersion}) builtins.fetchGit "
+                  + "does not support them"
+                )
+                { }
+            else { };
+        in
+        if nixSupportsSubmodules
+        then { inherit submodules; }
+        else emptyArgWithWarning;
+    in
+    builtins.fetchGit
+      ({ url = spec.repo; inherit (spec) rev; inherit ref; } // submoduleArg);
+
+  fetch_local = spec: spec.path;
+
+  fetch_builtin-tarball = name: throw
+    ''[${name}] The niv type "builtin-tarball" is deprecated. You should instead use `builtin = true`.
+        $ niv modify ${name} -a type=tarball -a builtin=true'';
+
+  fetch_builtin-url = name: throw
+    ''[${name}] The niv type "builtin-url" will soon be deprecated. You should instead use `builtin = true`.
+        $ niv modify ${name} -a type=file -a builtin=true'';
+
+  #
+  # Various helpers
+  #
+
+  # https://github.com/NixOS/nixpkgs/pull/83241/files#diff-c6f540a4f3bfa4b0e8b6bafd4cd54e8bR695
+  sanitizeName = name:
+    (
+      concatMapStrings (s: if builtins.isList s then "-" else s)
+        (
+          builtins.split "[^[:alnum:]+._?=-]+"
+            ((x: builtins.elemAt (builtins.match "\\.*(.*)" x) 0) name)
+        )
+    );
+
+  # The set of packages used when specs are fetched using non-builtins.
+  mkPkgs = sources: system:
+    let
+      sourcesNixpkgs =
+        import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) { inherit system; };
+      hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
+      hasThisAsNixpkgsPath = <nixpkgs> == ./.;
+    in
+    if builtins.hasAttr "nixpkgs" sources
+    then sourcesNixpkgs
+    else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
+      import <nixpkgs> { }
+    else
+      abort
+        ''
+          Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
+          add a package called "nixpkgs" to your sources.json.
+        '';
+
+  # The actual fetching function.
+  fetch = pkgs: name: spec:
+
+    if ! builtins.hasAttr "type" spec then
+      abort "ERROR: niv spec ${name} does not have a 'type' attribute"
+    else if spec.type == "file" then fetch_file pkgs name spec
+    else if spec.type == "tarball" then fetch_tarball pkgs name spec
+    else if spec.type == "git" then fetch_git name spec
+    else if spec.type == "local" then fetch_local spec
+    else if spec.type == "builtin-tarball" then fetch_builtin-tarball name
+    else if spec.type == "builtin-url" then fetch_builtin-url name
+    else
+      abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}";
+
+  # If the environment variable NIV_OVERRIDE_${name} is set, then use
+  # the path directly as opposed to the fetched source.
+  replace = name: drv:
+    let
+      saneName = stringAsChars (c: if (builtins.match "[a-zA-Z0-9]" c) == null then "_" else c) name;
+      ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}";
+    in
+    if ersatz == "" then drv else
+      # this turns the string into an actual Nix path (for both absolute and
+      # relative paths)
+    if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}";
+
+  # Ports of functions for older nix versions
+
+  # a Nix version of mapAttrs if the built-in doesn't exist
+  mapAttrs = builtins.mapAttrs or (
+    f: set: with builtins;
+    listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set))
+  );
+
+  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295
+  range = first: last: if first > last then [ ] else builtins.genList (n: first + n) (last - first + 1);
+
+  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257
+  stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1));
+
+  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269
+  stringAsChars = f: s: concatStrings (map f (stringToCharacters s));
+  concatMapStrings = f: list: concatStrings (map f list);
+  concatStrings = builtins.concatStringsSep "";
+
+  # https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d118/lib/attrsets.nix#L331
+  optionalAttrs = cond: as: if cond then as else { };
+
+  # fetchTarball version that is compatible between all the versions of Nix
+  builtins_fetchTarball = { url, name ? null, sha256 }@attrs:
+    let
+      inherit (builtins) lessThan nixVersion fetchTarball;
+    in
+    if lessThan nixVersion "1.12" then
+      fetchTarball ({ inherit url; } // (optionalAttrs (name != null) { inherit name; }))
+    else
+      fetchTarball attrs;
+
+  # fetchurl version that is compatible between all the versions of Nix
+  builtins_fetchurl = { url, name ? null, sha256 }@attrs:
+    let
+      inherit (builtins) lessThan nixVersion fetchurl;
+    in
+    if lessThan nixVersion "1.12" then
+      fetchurl ({ inherit url; } // (optionalAttrs (name != null) { inherit name; }))
+    else
+      fetchurl attrs;
+
+  # Create the final "sources" from the config
+  mkSources = config:
+    mapAttrs
+      (
+        name: spec:
+          if builtins.hasAttr "outPath" spec
+          then
+            abort
+              "The values in sources.json should not have an 'outPath' attribute"
+          else
+            spec // { outPath = replace name (fetch config.pkgs name spec); }
+      )
+      config.sources;
+
+  # The "config" used by the fetchers
+  mkConfig =
+    { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null
+    , sources ? if sourcesFile == null then { } else builtins.fromJSON (builtins.readFile sourcesFile)
+    , system ? builtins.currentSystem
+    , pkgs ? mkPkgs sources system
+    }: rec {
+      # The sources, i.e. the attribute set of spec name to spec
+      inherit sources;
+
+      # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers
+      inherit pkgs;
+    };
+
+in
+mkSources (mkConfig { }) // { __functor = _: settings: mkSources (mkConfig settings); }

packages/ags/custom/.gitignore

@@ -1,2 +0,0 @@
-node_modules/
-@girs/

packages/ags/custom/app.ts

@@ -1,17 +0,0 @@
-import { App } from "astal/gtk3"
-import style from "./style.scss"
-import Bar from "./widget/Bar"
-
-App.start({
-    css: style,
-    instanceName: "js",
-    requestHandler(request, res) {
-        print(request)
-        res("ok")
-    },
-    main: () => {
-        const monitors = App.get_monitors()
-        const primary = monitors.find(m => m.primary) || monitors[0]
-        return Bar(primary)
-    }
-})

packages/ags/custom/colors.scss

@@ -1,3 +0,0 @@
-$background: #131318;
-$foreground: #e4e1e9;
-$primary: #bec2ff;

packages/ags/custom/env.d.ts

@@ -1,21 +0,0 @@
-declare const SRC: string
-
-declare module "inline:*" {
-    const content: string
-    export default content
-}
-
-declare module "*.scss" {
-    const content: string
-    export default content
-}
-
-declare module "*.blp" {
-    const content: string
-    export default content
-}
-
-declare module "*.css" {
-    const content: string
-    export default content
-}

packages/ags/custom/package.json

@@ -1,6 +0,0 @@
-{
-    "name": "astal-shell",
-    "dependencies": {
-        "astal": "/home/biscuit/.local/share/ags"
-    }
-}

packages/ags/custom/style.scss

@@ -1,143 +0,0 @@
-@use "sass:color";
-@use "./colors" as *;
-
-// default
-// $bg: #212223;
-// $fg: #f1f1f1;
-// $accent: #378DF7;
-// $radius: 7px;
-
-// Kanagawa Theme
-// $bg: #1F1F28;
-// $fg: #DCD7BA;
-// $accent: #C0A36E;
-// $radius: 7px;
-
-// mstcl 
-// $bg: #121212;
-// $fg: #f1f1f1;
-// $accent: #C0A36E;
-// $radius: 7px;
-
-$bg: $background;
-$fg: $foreground;
-$accent: $primary;
-$radius: 7px;
-
-window.Bar {
-    border: none;
-    box-shadow: none;
-    background-color: $bg;
-    color: $fg;
-    font-size: 1.1em;
-    font-weight: bold;
-    font-family: "JetBrainsMono Nerd Font";
-
-    label {
-        margin: 0 8px;
-    }
-
-    .Workspaces  {
-        button {
-            all: unset;
-            background-color: transparent;
-
-            &:hover label {
-                background-color: color.adjust($fg, $alpha: -0.84);
-                border-color: color.adjust($accent, $alpha: -0.8);
-            }
-
-            &:active label {
-                background-color: color.adjust($fg, $alpha: -0.8)
-            }
-        }
-
-        label {
-            transition: 200ms;
-            padding: 0 8px;
-            margin: 2px;
-            border-radius: $radius;
-            border: 1pt solid transparent;
-        }
-
-        .focused label {
-            color: $accent;
-            border-color: $accent;
-        }
-    }
-
-    .SysTray {
-        margin-right: 8px;
-
-        button {
-            padding: 0 4px;
-        }
-    }
-
-    .Time {
-        .TimeHM {
-            font-weight: bold;
-            color: $accent;
-        }
-
-        .TimeDate {
-            // color: color.adjust($fg, $lightness: -10%);
-            color: $fg;
-            opacity: 0.85;
-            font-weight: normal;
-        }
-    }
-
-    
-    .FocusedClient {
-        color: color.adjust($fg, $lightness: -30%);
-        opacity: 0.7;
-    }
-
-    .Media .Cover {
-        min-height: 1.2em;
-        min-width: 1.2em;
-        border-radius: $radius;
-        background-position: center;
-        background-size: contain;
-    }
-
-    .Battery label {
-        padding-left: 0;
-        margin-left: 0;
-    }
-
-    .AudioSlider {
-        * {
-            all: unset;
-        }
-
-        icon {
-            margin-right: .6em;
-        }
-
-        & {
-            margin: 0 1em;
-        }
-
-        trough {
-            background-color: color.adjust($fg, $alpha: -0.8);
-            border-radius: $radius;
-        }
-
-        highlight {
-            background-color: $accent;
-            min-height: .8em;
-            border-radius: $radius;
-        }
-
-        slider {
-            background-color: $fg;
-            border-radius: $radius;
-            min-height: 1em;
-            min-width: 1em;
-            margin: -.2em;
-        }
-    }
-}
-

packages/ags/custom/tsconfig.json

@@ -1,14 +0,0 @@
-{
-    "$schema": "https://json.schemastore.org/tsconfig",
-    "compilerOptions": {
-        "experimentalDecorators": true,
-        "strict": true,
-        "target": "ES2022",
-        "module": "ES2022",
-        "moduleResolution": "Bundler",
-        // "checkJs": true,
-        // "allowJs": true,
-        "jsx": "react-jsx",
-        "jsxImportSource": "astal/gtk3",
-    }
-}

packages/ags/custom/widget/Bar.tsx

@@ -1,189 +0,0 @@
-import { App } from "astal/gtk3"
-import { Variable, GLib, bind } from "astal"
-import { Astal, Gtk, Gdk } from "astal/gtk3"
-import Hyprland from "gi://AstalHyprland"
-import Mpris from "gi://AstalMpris"
-import Battery from "gi://AstalBattery"
-import Wp from "gi://AstalWp"
-import Network from "gi://AstalNetwork"
-import Tray from "gi://AstalTray"
-
-function SysTray() {
-    const tray = Tray.get_default()
-
-    return <box className="SysTray">
-        {bind(tray, "items").as(items => items.map(item => (
-            <menubutton
-                tooltipMarkup={bind(item, "tooltipMarkup")}
-                usePopover={false}
-                actionGroup={bind(item, "actionGroup").as(ag => ["dbusmenu", ag])}
-                menuModel={bind(item, "menuModel")}>
-                <icon gicon={bind(item, "gicon")} />
-            </menubutton>
-        )))}
-    </box>
-}
-
-function Wifi() {
-    const network = Network.get_default()
-    const wifi = bind(network, "wifi")
-
-    return <box visible={wifi.as(Boolean)}>
-        {wifi.as(wifi => wifi && (
-            <icon
-                tooltipText={bind(wifi, "ssid").as(String)}
-                className="Wifi"
-                icon={bind(wifi, "iconName")}
-            />
-        ))}
-    </box>
-
-}
-
-function AudioSlider() {
-    const speaker = Wp.get_default()?.audio.defaultSpeaker!
-
-    return <box className="AudioSlider" css="min-width: 140px">
-        <icon icon={bind(speaker, "volumeIcon")} />
-        <slider
-            hexpand
-            onDragged={({ value }) => speaker.volume = value}
-            value={bind(speaker, "volume")}
-        />
-    </box>
-}
-
-function BatteryLevel() {
-    const bat = Battery.get_default()
-
-    return <box className="Battery"
-        visible={bind(bat, "isPresent")}>
-        <icon icon={bind(bat, "batteryIconName")} />
-        <label label={bind(bat, "percentage").as(p =>
-            `${Math.floor(p * 100)} %`
-        )} />
-    </box>
-}
-
-function Media() {
-    const mpris = Mpris.get_default()
-
-    return <box className="Media">
-        {bind(mpris, "players").as(ps => ps[0] ? (
-            <box>
-                <box
-                    className="Cover"
-                    valign={Gtk.Align.CENTER}
-                    css={bind(ps[0], "coverArt").as(cover =>
-                        `background-image: url('${cover}');`
-                    )}
-                />
-                <label
-                    label={bind(ps[0], "metadata").as(() =>
-                        `${ps[0].title} - ${ps[0].artist}`
-                    )}
-                />
-            </box>
-        ) : (
-            <label label="Biscuit" />
-        ))}
-    </box>
-}
-
-
-function Workspaces() {
-  const hypr = Hyprland.get_default();
-
-  return (
-    <box className="Workspaces">
-      {bind(hypr, "focusedWorkspace").as((fw) => {
-        if (!fw) return null;
-
-        // Determine the current chunk of 5 visible workspace buttons
-        const currentChunkStart = Math.floor((fw.id - 1) / 5) * 5 + 1;
-        const visibleIds = Array.from({ length: 5 }, (_, i) => currentChunkStart + i);
-
-        return visibleIds.map((id) => {
-          // Try to get the real workspace, fall back to a dummy one if it doesn't exist
-          const ws =
-            hypr.workspaces.find((w) => w.id === id) ??
-            Hyprland.Workspace.dummy(id, null);
-
-          return (
-            <button
-              className={fw.id === id ? "focused" : ""}
-              onClick={() => ws.focus()}
-            >
-              {id}
-            </button>
-          );
-        });
-      })}
-    </box>
-  );
-}
-
-function FocusedClient() {
-    const hypr = Hyprland.get_default();
-    const focused = bind(hypr, "focusedClient");
-
-    return (
-        <box className="FocusedClient" visible={focused.as(Boolean)}>
-            {focused.as(client => {
-                if (!client) return null;
-
-                return (
-                    <label
-                        label={bind(client, "title").as(title => {
-                            return title.length > 40
-                                ? title.slice(0, 37) + "..."
-                                : title;
-                        })}
-                    />
-                );
-            })}
-        </box>
-    );
-}
-function Time({ format = "%H:%M|%a %b %d" }) {
-    const time = Variable<string>("").poll(1000, () =>
-        GLib.DateTime.new_now_local().format(format)!
-    );
-
-    return bind(time).as(str => {
-        const [hm, date] = str.split("|");
-
-        return (
-            <box className="Time">
-                <label className="TimeHM" label={hm} />
-                <label className="TimeDate" label={date} />
-            </box>
-        );
-    });
-}
-
-export default function Bar(monitor: Gdk.Monitor) {
-    const { TOP, LEFT, RIGHT } = Astal.WindowAnchor
-
-    return <window
-        className="Bar"
-        gdkmonitor={monitor}
-        exclusivity={Astal.Exclusivity.EXCLUSIVE}
-        anchor={TOP | LEFT | RIGHT}>
-        <centerbox>
-            <box hexpand halign={Gtk.Align.START}>
-                <Workspaces />
-                <FocusedClient />
-            </box>
-            <box>
-                <Time />
-            </box>
-            <box hexpand halign={Gtk.Align.END} >
-                <SysTray />
-                <Wifi />
-                <AudioSlider />
-                <BatteryLevel />
-            </box>
-        </centerbox>
-    </window>
-}

packages/ags/home.nix

@@ -1,28 +0,0 @@
-{
-  inputs,
-  pkgs,
-  system,
-  ...
-}: {
-  imports = [inputs.ags.homeManagerModules.default];
-
-  programs.ags = {
-    enable = true;
-    configDir = ./custom;
-
-    extraPackages = let
-      agsPkgs = inputs.ags.packages.${system};
-    in
-      with pkgs; [
-        agsPkgs.battery
-        agsPkgs.hyprland
-        agsPkgs.mpris
-        agsPkgs.wireplumber
-        agsPkgs.notifd
-        agsPkgs.apps
-        agsPkgs.network
-        agsPkgs.tray
-        fzf
-      ];
-  };
-}

packages/firefox/home.nix

@@ -84,7 +84,7 @@
       # Valid strings for installation_mode are "allowed", "blocked",
       # "force_installed" and "normal_installed".
       ExtensionSettings = {
-        "*".installation_mode = "blocked";
+        "*".installation_mode = "allowed";
         "uBlock0@raymondhill.net" = {
           install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
           installation_mode = "force_installed";

packages/hyprland/config/binds.nix

@@ -40,6 +40,7 @@
         "$mod, D, global, caelestia:launcherInterrupt"
         "$mod, Escape, global, caelestia:launcherInterrupt"
         "$mod, PERIOD, global, caelestia:launcherInterrupt"
+        "$mod, SPACE, global, caelestia:launcherInterrupt"
         "$mod, E, global, caelestia:launcherInterrupt"
         "$mod, V, global, caelestia:launcherInterrupt"
 
@@ -69,6 +70,8 @@
         "$mod ALT, A, global, caelestia:showall"
         "$mod ALT, L, global, caelestia:lock"
 
+        "$mod, SPACE, exec, rofi -show drun"
+
         # Restore lock - these are `bindl` in your original, but `exec` should be fine here.
         # However, `bindl` is typically for a *release* event. If `caelestia shell -d` is a daemon,
         # and `caelestia:lock` is a quickshell internal, you might need to reconsider.

packages/hyprland/config/rules.nix

@@ -44,7 +44,6 @@
       "workspace special:music, initialTitle:Spotify( Free)?"
       "workspace special:communication, class:discord|equibop|vesktop|whatsapp"
       "workspace special:todo, class:Todoist"
-      "workspace special:steam, class:^(steam_app_.*)$"
 
       "noinitialfocus, class:discord"
       "focusonactivate 0, class:discord"
@@ -70,6 +69,7 @@
 
       # Steam
       "workspace special:steam, class:steam"
+      "workspace special:gaming, class:^(steam_app_.*)$"
       "rounding 10, title:, class:steam"
       "float, title:Friends List, class:steam"
       "immediate, class:steam_app_[0-9]+"
@@ -91,15 +91,15 @@
     workspace = [
       "w[tv1]s[false], gapsout:20, gapsin:20"
       "f[1]s[false], gapsout:20, gapsin:20"
-      "1, monitor:DP-1, default:true"
+      "1, monitor:DP-2, default:true"
-      "2, monitor:DP-1"
+      "2, monitor:DP-2"
-      "3, monitor:DP-1"
+      "3, monitor:DP-2"
-      "4, monitor:DP-2"
+      "4, monitor:DP-1"
-      "5, monitor:DP-2"
+      "5, monitor:DP-1"
-      "6, monitor:DP-2"
+      "6, monitor:DP-1"
 
-      "special:gaming, monitor:DP-1, persistent:true"
+      "special:gaming, monitor:DP-2, persistent:true"
-      "special:steam, monitor:DP-1, persistent:true, on-created-empty:steam"
+      "special:steam, monitor:DP-2, persistent:true, on-created-empty:steam"
     ];
 
     # ######## Layer rules ########

packages/lact/default.nix

@@ -0,0 +1,50 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (lib) mkEnableOption mkOption mkIf;
+  this = config.custom.lact;
+
+  configFile =
+    pkgs.runCommand "lact-config.yaml" {
+      json = pkgs.writers.writeJSON "lact-config.json" this.settings;
+    } ''
+      # Merge with the defaults
+      ${lib.getExe pkgs.yq} -s '.[0] * .[1]' $json ${./lact-default-config.yaml} > config.json
+      # Convert keys to numeric values where possible. It depends on this for some reason.
+      ${lib.getExe pkgs.yj} -jy -k < config.json > $out
+    '';
+in {
+  options.custom.lact = {
+    enable = mkEnableOption "my LACT module";
+    settings = mkOption {
+      default = {};
+      type = lib.types.submodule {
+        freeformType = (pkgs.formats.yaml {}).type;
+      };
+      description = ''
+        Settings for LACT. Settings are merged with the defaults.
+
+        The easiest method of acquiring the settings is to delete
+        `/etc/lact/config.yaml`, enter your settings and look at the file.
+      '';
+    };
+  };
+
+  config = mkIf this.enable {
+    systemd.packages = with pkgs; [
+      lact
+    ];
+    systemd.services.lactd.wantedBy = ["multi-user.target"];
+
+    environment.etc."lact/config.yaml" = mkIf (this.settings != {}) {
+      source = configFile;
+    };
+    systemd.services.lactd = {
+      # Restart if config changed
+      restartTriggers = mkIf (this.settings != {}) [configFile];
+    };
+  };
+}

packages/lact/lact-default-config.yaml

@@ -0,0 +1,8 @@
+daemon:
+  log_level: info
+  admin_groups:
+    - wheel
+    - sudo
+  disable_clocks_cleanup: false
+apply_settings_timer: 5
+gpus: {}

packages/matugen/custom/config.toml

@@ -1,70 +0,0 @@
-[config]
-# If set to enabled, it will check for updates when you run the matugen command, notifying you that an update is avaiable.
-# WARNING: Matugen needs to be compiled with the `update-informer` feature for this to work.
-version_check = false
-
-[config.wallpaper]
-# The base command to run for applying the wallpaper, shouldn't have spaces in it.
-command = "swww"
-
-# The arguments that will be provided to the command.
-# Keywords like {{ mode }} or anything that works inside of hooks doesn't work here.
-# The last argument will be the image path.
-arguments = ["img", "--transition-type", "center", "--transition-fps", "120"]
-
-# For example, killing the wallpaper daemon. Usage is like a normal hook.
-# pre_hook = ""
-
-[config.custom_keywords]
-test = "aaaa"
-
-[templates.name1]
-# Relative paths will be resolved from the path `config.toml` is in.
-input_path = "./colors.whatever-extension"
-output_path = "./a/colors-generated.whatever-extension"
-
-# This will use a different input path depending on what mode you use.
-# input_path_modes = { dark = "./colors.whatever-extension", light = "./colors.whatever-extension" }
-
-# This will compare all of the colors inside the array with the color you set as `compare_to`, and returns the closest color to it.
-# You can then use `{{closest_color}}` inside templates and hooks.
-colors_to_compare = [
-    { name = "black", color = "#000000" },
-    { name = "red", color = "#ff0000" },
-    { name = "maroon", color = "#800000" },
-    { name = "yellow", color = "#ffff00" },
-    { name = "olive", color = "#808000" },
-    { name = "lime", color = "#00ff00" },
-    { name = "green", color = "#008000" },
-    { name = "aqua", color = "#00ffff" },
-    { name = "teal", color = "#008080" },
-    { name = "blue", color = "#0000ff" },
-    { name = "navy", color = "#000080" },
-    { name = "fuchsia", color = "#ff00ff" },
-    { name = "purple", color = "#800080" },
-]
-compare_to = "{{colors.primary.default.hex}}"
-
-# Runs before the template is exported. You can use keywords here,
-pre_hook = 'echo "source color {{colors.source_color.default.hex}}, source image {{image}}, closest color {{closest_color}}"'
-# Runs after the template is exported. You can use keywords here.
-post_hook = 'echo "after gen"'
-
-# Only hex values
-# https://m3.material.io/styles/color/advanced/adjust-existing-colors#1cc12e43-237b-45b9-8fe0-9a3549c1f61e
-# Blend is set to true by default. 
-[config.custom_colors]
-green = "#00ff00"
-red = "#ff0000"
-blue = { color = "#0000ff", blend = false }
-
-### --- my config 
-[templates.kitty]
-input_path = '~/.config/nixos/pkgs/matugen/custom/templates/kitty.conf'
-output_path = '~/.config/kitty/colors.conf'
-post_hook = "kitty @ set-colors -a -c ~/.config/kitty/colors.conf"
-
-[templates.ags]
-input_path = '~/.config/nixos/pkgs/matugen/custom/templates/ags.scss'
-output_path = '~/.config/nixos/pkgs/ags/biscuit/colors.scss'
-post_hook = "pkill gjs & ags run ~/.config/nixos/pkgs/ags/biscuit/app.ts & disown (jobs -p) &"

packages/matugen/custom/templates/ags.scss

@@ -1,3 +0,0 @@
-$background: {{colors.surface.dark.hex}};
-$foreground: {{colors.on_surface.dark.hex}};
-$primary: {{colors.primary.dark.hex}};

packages/matugen/custom/templates/kitty.conf

@@ -1,41 +0,0 @@
-cursor {{colors.on_surface.default.hex}}
-cursor_text_color {{colors.on_surface_variant.default.hex}}
-
-foreground            {{colors.on_surface.default.hex}}
-background            {{colors.surface.default.hex}}
-selection_foreground  {{colors.on_secondary.default.hex}}
-selection_background  {{colors.secondary_fixed_dim.default.hex}}
-url_color             {{colors.primary.default.hex}}
-
-# black
-color8   #262626
-color0   #4c4c4c
-
-# red
-color1   #ac8a8c
-color9   #c49ea0
-
-# green
-color2   #8aac8b
-color10  #9ec49f
-
-# yellow
-color3   #aca98a
-color11  #c4c19e
-
-# blue
-/* color4  #8f8aac */
-color4  {{colors.primary.default.hex}}
-color12 #a39ec4
-
-# magenta
-color5   #ac8aac
-color13  #c49ec4
-
-# cyan
-color6   #8aacab
-color14  #9ec3c4
-
-# white
-color15   #e7e7e7
-color7  #f0f0f0

packages/matugen/default.nix

@@ -1,10 +0,0 @@
-{
-  inputs,
-  pkgs,
-  ...
-}: {
-  imports = [inputs.matugen.nixosModules.default];
-  environment.systemPackages = with pkgs; [
-    inputs.matugen.packages.${system}.default
-  ];
-}

packages/matugen/home.nix

@@ -1,10 +0,0 @@
-{
-  pkgs,
-  inputs,
-  system,
-  ...
-}: {
-  home.file.".config/matugen/config.toml" = {
-    source = builtins.toPath ./custom/config.toml;
-  };
-}

packages/moondeck-buddy/appimage.nix

@@ -4,6 +4,7 @@
   pkgs,
   lib,
   fetchurl,
+  myConfig,
   ...
 }: let
   moondeckBuddyWrapped = pkgs.appimageTools.wrapType2 {
@@ -17,7 +18,8 @@
 
     extraPkgs = pkgs:
       with pkgs; [
-        # Your extraPkgs here
+        steam
+        libappindicator-gtk3
       ];
 
     desktopItems = [
@@ -51,7 +53,36 @@ in {
     59999 # Allow Moondeck Buddy to listen on this port
   ];
   # If Moondeck Buddy also needs UDP, uncomment and add it here:
-  # networking.firewall.allowedUDPPorts = [
+  networking.firewall.allowedUDPPorts = [
-  #   59999
+    59999
-  # ];
+  ];
+
+  systemd.services.moondeck-buddy = {
+    description = "Moondeck Buddy service for Sunshine/Moonlight integration";
+    after = ["network-online.target" "display-manager.service"]; # Ensure display manager is up
+    wantedBy = ["multi-user.target"]; # Still autostart with multi-user target
+
+    serviceConfig = {
+      Type = "simple";
+      User = "${myConfig.essentials.Username}"; # <--- IMPORTANT: User *must* have access to the display
+      Group = "users";
+
+      ExecStart = "${moondeckBuddyWrapped}/bin/moondeck-buddy";
+
+      Restart = "on-failure";
+      RestartSec = 5;
+
+      # Crucial for GUI applications running as system services:
+      Environment = [
+        "DISPLAY=:0" # Assuming your main display is :0. This can vary.
+        # "XAUTHORITY=/home/your-username/.Xauthority" # Needed if using Xauthority
+        # If using Wayland, you might need XDG_RUNTIME_DIR and WAYLAND_DISPLAY
+        # "XDG_RUNTIME_DIR=/run/user/$(id -u your-username)"
+        # "WAYLAND_DISPLAY=wayland-0" # Or specific to your compositor
+      ];
+
+      # You might also need to explicitly grant access, e.g., with xhost +
+      # but that's a security hole. Best is to rely on user authentication.
+    };
+  };
 }

packages/neovim/home.nix

@@ -5,6 +5,6 @@
   ...
 }: {
   home.packages = [
-    inputs.nixovim.packages.${system}.default
+    inputs.nixovim.packages.${system}.full
   ];
 }

packages/protonup/home.nix

@@ -1,13 +0,0 @@
-{
-  pkgs,
-  myConfig,
-  ...
-}: {
-  home.packages = with pkgs; [
-    protonup
-  ];
-
-  home.sessionVariables = {
-    STEAM_EXTRA_COMPAT_TOOLS_PATHS = "/home/${myConfig.essentials.Username}/.steam/root/compatibilitytools.d";
-  };
-}

packages/quickshell/home.nix

@@ -4,11 +4,12 @@
   system,
   ...
 }: let
-  caelestia-shell = pkgs.fetchFromGitHub {
+  caelestia-shell = pkgs.fetchFromGitea {
+    domain = "git.sakamoto.dev";
     owner = "caelestia-dots";
     repo = "shell";
     rev = "main";
-    sha256 = "sha256-FHPCSy/Fd9hIpFA2BxhTkbwBtY9vtvsEUYC3+ZX6zNQ=";
+    sha256 = "sha256-y9Wkh+9ND8GcUYhybXdEPTVY6gUb0jclnbbVi70l70Y=";
   };
 in {
   imports = [
@@ -20,7 +21,6 @@ in {
     grim
     foot
     hyprpicker
-    heroic-unwrapped
     qalculate-qt
     fuzzel
     inotify-tools

packages/solaar/home.nix

@@ -1,5 +1,4 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
-    solaar
   ];
 }

packages/steam/default.nix

@@ -3,13 +3,6 @@
   myConfig,
   ...
 }: {
-  environment.systemPackages = with pkgs; [
-    steam-run
-  ];
-
-  programs.appimage.enable = true;
-  programs.appimage.binfmt = true;
-
   programs.steam = {
     enable = true;
     remotePlay.openFirewall = true;

packages/steam/jovian.nix

@@ -2,40 +2,45 @@
   inputs,
   pkgs,
   myConfig,
+  lib,
   ...
 }: {
   imports = [
-    inputs.jovian.nixosModules.default
   ];
   environment.sessionVariables = {
     DECKY_HOME = "/home/${myConfig.essentials.Username}/homebrew";
     DECKY_USER_HOME = "/home/${myConfig.essentials.Username}";
   };
+
   # environment.systemPackages = with pkgs; [inputs.jovian.packages.${system}.default];
-  jovian.steam.enable = true;
+  jovian.steam = {
-  jovian.steam.autoStart = true;
-  jovian.steam.desktopSession = "hyprland";
-  jovian.steam.user = "${myConfig.essentials.Username}";
-  jovian.hardware.has.amd.gpu = true;
-
-  jovian.decky-loader.enable = true;
-  jovian.decky-loader.user = "kenji";
-
-  # jovian.steamos.enableBluetoothConfig = true;
-  # jovian.steamos.enableMesaPatches = true;
-  jovian.steamos.useSteamOSConfig = true;
-  jovian.decky-loader.extraPythonPackages = pythonPackages:
-    with pythonPackages; [
-      requests
-      aiohttp
-    ];
-
-  # jovian.devices.steamdeck.enableControllerUdevRules = true;
-  hardware = {
-    xone.enable = true;
-  };
-  programs.nix-ld = {
     enable = true;
-    libraries = pkgs.steam-run.args.multiPkgs pkgs;
+    autoStart = true;
+    desktopSession = "hyprland";
+    user = "${myConfig.essentials.Username}";
+    environment = {
+      OUTPUT_CONNECTOR = "DP-1"; # Keep this
+      STEAM_GAMESCOPE_CMD_OPTIONS = "-O DP-1"; # Force override flag
     };
+  };
+
+  jovian.decky-loader = {
+    enable = true;
+    stateDir = "/home/${myConfig.essentials.Username}/Games/Decky";
+    user = "${myConfig.essentials.Username}";
+  };
+
+  jovian.devices.steamdeck = {
+    enableControllerUdevRules = true;
+  };
+
+  # programs.gamescope = {
+  #   enable = true;
+  #   args = ["--output-name" "DP-1"];
+  # };
+
+  jovian.hardware.has.amd.gpu = true;
+  jovian.steamos.enableBluetoothConfig = true;
+  # jovian.steamos.useSteamOSConfig = true;
+  # jovian.devices.steamdeck.enableControllerUdevRules = true;
 }

packages/sunshine/config.nix

@@ -0,0 +1,43 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  cfg = config.programs.sunshine;
+in {
+  options.programs.sunshine = with lib; {
+    enable = mkEnableOption "sunshine";
+  };
+
+  config = lib.mkIf cfg.enable {
+    networking.firewall.allowedTCPPortRanges = [
+      {
+        from = 47984;
+        to = 48010;
+      }
+    ];
+    networking.firewall.allowedUDPPortRanges = [
+      {
+        from = 47998;
+        to = 48010;
+      }
+    ];
+    security.wrappers.sunshine = {
+      owner = "root";
+      group = "root";
+      capabilities = "cap_sys_admin+p";
+      source = "${pkgs.sunshine}/bin/sunshine";
+    };
+    systemd.user.services.sunshine = {
+      description = "Sunshine self-hosted game stream host for Moonlight";
+      startLimitBurst = 5;
+      startLimitIntervalSec = 500;
+      serviceConfig = {
+        ExecStart = "${config.security.wrapperDir}/sunshine";
+        Restart = "on-failure";
+        RestartSec = "5s";
+      };
+    };
+  };
+}

packages/sunshine/default.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./config.nix
+  ];
+  programs.sunshine.enable = true;
+}

packages/sunshine/home.nix

@@ -1,11 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = with pkgs; [
-    sunshine
-  ];
-  services.sunshine = {
-    enable = true;
-    autoStart = true;
-    capSysAdmin = true;
-    openFirewall = true;
-  };
-}

packages/swww/home.nix

@@ -1,3 +0,0 @@
-{...}: {
-  services.swww.enable = true;
-}

packages/udev/default.nix

@@ -1,6 +0,0 @@
-{
-  services.udev.extraRules = ''
-    SUBSYSTEM=="usb", ATTR{idVendor}=="0e8d", ATTR{idProduct}=="0616", ATTR{power/wakeup}="enabled"
-    
-  '';
-}

packages/virtualbox/default.nix

@@ -0,0 +1,5 @@
+{myConfig, ...}: {
+  virtualisation.virtualbox.host.enable = true;
+  users.extraGroups.vboxusers.members = ["${myConfig.essentials.Username}"];
+  virtualisation.virtualbox.host.enableExtensionPack = true;
+}

result

@@ -0,0 +1 @@
+/nix/store/bbmjfn520yfij7z284imjm3dcfvs8fkx-nixos-system-nixos-25.11.20250630.3016b4b