Flake update.

Fix appimage.

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "private"]
 	path = private
-	url = https://git.zerojay.com/jay/private.git
+        url = https://git.zerojay.com/jay/private.git

README.md

@@ -15,15 +15,15 @@ Machines
 
 To-Do List
 
- [ ]  Finish porting features from nixy's previous setup and get them working on lappy: impermanence.
+ [ ]  Finish porting features from nixy's previous setup and get them working on lappy: impermanence.   
- [ ]  Set up declarative Discord setup with nixcord and plugins.
+ [ ]  Set up declarative Discord setup with nixcord and plugins.   
- [ ]  Figure out how to set up sops-nix with user passwords properly.
+ [ ]  Figure out how to set up sops-nix with user passwords properly.   
- [X]  Fully setup private git repository for secrets.
+ [X]  Fully setup private git repository for secrets.   
- [X]  Integrate private git repository into nixverse setup.
+ [X]  Integrate private git repository into nixverse setup.   
- [X]  Switch nixy over to this nixverse setup.
+ [X]  Switch nixy over to this nixverse setup.   
- [ ]  Finish checking the apps I need on the arcade machine work under NixOS (attractmode, retroarch, teknoparrot, others).
+ [ ]  Finish checking the apps I need on the arcade machine work under NixOS (attractmode, retroarch, teknoparrot, others).   
- [ ]  Setup arcade machine on NixOS.
+ [ ]  Setup arcade machine on NixOS.   
- [ ]  Setup ally machine on NixOS.
+ [ ]  Setup ally machine on NixOS.   
 
 Installation
 

flake.lock

@@ -1,5 +1,25 @@
 {
   "nodes": {
+    "auto-cpufreq-stable-nixos": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1752998173,
+        "narHash": "sha256-ZlYpBp2WOe03UrpjJGz5KTOL/pp7A452hJO/Vc8C4/0=",
+        "owner": "AdnanHodzic",
+        "repo": "auto-cpufreq",
+        "rev": "562278377ffa96f3c1af49c7b499df028ce8d8bd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "AdnanHodzic",
+        "repo": "auto-cpufreq",
+        "type": "github"
+      }
+    },
     "base16": {
       "inputs": {
         "fromYaml": "fromYaml"
@@ -97,11 +117,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752541678,
+        "lastModified": 1756733629,
-        "narHash": "sha256-dyhGzkld6jPqnT/UfGV2oqe7tYn7hppAqFvF3GZTyXY=",
+        "narHash": "sha256-dwWGlDhcO5SMIvMSTB4mjQ5Pvo2vtxvpIknhVnSz2I8=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "2bf3421f7fed5c84d9392b62dcb9d76ef09796a7",
+        "rev": "a5c4f2ab72e3d1ab43e3e65aa421c6f2bd2e12a1",
         "type": "github"
       },
       "original": {
@@ -131,11 +151,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1751413152,
+        "lastModified": 1754487366,
-        "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
+        "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
+        "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18",
         "type": "github"
       },
       "original": {
@@ -266,11 +286,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752544374,
+        "lastModified": 1756679287,
-        "narHash": "sha256-ReX0NG6nIAEtQQjLqeu1vUU2jjZuMlpymNtb4VQYeus=",
+        "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2e00ed310c218127e02ffcf28ddd4e0f669fde3e",
+        "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8",
         "type": "github"
       },
       "original": {
@@ -288,11 +308,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743604125,
+        "lastModified": 1752603129,
-        "narHash": "sha256-ZD61DNbsBt1mQbinAaaEqKaJk2RFo9R/j+eYWeGMx7A=",
+        "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "180fd43eea296e62ae68e079fcf56aba268b9a1a",
+        "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b",
         "type": "github"
       },
       "original": {
@@ -308,11 +328,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1752292276,
+        "lastModified": 1755569534,
-        "narHash": "sha256-cl1NEWTUsNxBmLjyvz+GDP4Hy7riaOszSGpfplHA7Y4=",
+        "narHash": "sha256-ukXfV1cAsxoar0IVEO2/s3qnVEZpZf0wvqE3PIESobw=",
         "owner": "Jas-SinghFSU",
         "repo": "Hyprpanel",
-        "rev": "59b57fca0634c98f23227ea948f87df7814e72f6",
+        "rev": "6385f2e15df908e0c13bed800f4b091300e5b981",
         "type": "github"
       },
       "original": {
@@ -381,11 +401,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752631802,
+        "lastModified": 1756950352,
-        "narHash": "sha256-t65TV28ZatEKVyFoTmExQgb8LECvrj/3Wuogn5PxfYI=",
+        "narHash": "sha256-CkNlcUeNlDmxF1GJwEQg3aIBSCihnFcAqCwBjUQGqNY=",
         "owner": "fufexan",
         "repo": "nix-gaming",
-        "rev": "b8834a847dee8875e06e218830f33a3486f0185e",
+        "rev": "64ac07fae89f297beab704dce70038cdbda55c25",
         "type": "github"
       },
       "original": {
@@ -443,6 +463,22 @@
         "type": "github"
       }
     },
+    "nixos-hardware-stable-nixos": {
+      "locked": {
+        "lastModified": 1756925795,
+        "narHash": "sha256-kUb5hehaikfUvoJDEc7ngiieX88TwWX/bBRX9Ar6Tac=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "ba6fab29768007e9f2657014a6e134637100c57d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
     "nixos-images": {
       "inputs": {
         "nixos-stable": [
@@ -504,11 +540,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1751159883,
+        "lastModified": 1753579242,
-        "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=",
+        "narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab",
+        "rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e",
         "type": "github"
       },
       "original": {
@@ -519,11 +555,11 @@
     },
     "nixpkgs-stable-nixos": {
       "locked": {
-        "lastModified": 1752436162,
+        "lastModified": 1756886854,
-        "narHash": "sha256-Kt1UIPi7kZqkSc5HVj6UY5YLHHEzPBkgpNUByuyxtlw=",
+        "narHash": "sha256-6tooT142NLcFjt24Gi4B0G1pgWLvfw7y93sYEfSHlLI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "dfcd5b901dbab46c9c6e80b265648481aafb01f8",
+        "rev": "0e6684e6c5755325f801bda1751a8a4038145d7d",
         "type": "github"
       },
       "original": {
@@ -533,13 +569,29 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1752596105,
+        "lastModified": 1756819007,
-        "narHash": "sha256-lFNVsu/mHLq3q11MuGkMhUUoSXEdQjCHvpReaGP1S2k=",
+        "narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dab3a6e781554f965bde3def0aa2fda4eb8f1708",
+        "rev": "aaff8c16d7fc04991cac6245bee1baa31f72b1e1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1756819007,
+        "narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "aaff8c16d7fc04991cac6245bee1baa31f72b1e1",
         "type": "github"
       },
       "original": {
@@ -565,6 +617,7 @@
       },
       "original": {
         "owner": "hgl",
+        "ref": "084a07f43829857fc760e70212c497d2f40eaa3c",
         "repo": "nixverse",
         "type": "github"
       }
@@ -597,14 +650,17 @@
     },
     "root": {
       "inputs": {
+        "auto-cpufreq-stable-nixos": "auto-cpufreq-stable-nixos",
         "disko-stable-nixos": "disko-stable-nixos",
         "home-manager-stable-nixos": "home-manager-stable-nixos",
         "hyprpanel-stable-nixos": "hyprpanel-stable-nixos",
         "impermanence-stable-nixos": "impermanence-stable-nixos",
         "nix-flatpak-stable-nixos": "nix-flatpak-stable-nixos",
         "nix-gaming-stable-nixos": "nix-gaming-stable-nixos",
+        "nixos-hardware-stable-nixos": "nixos-hardware-stable-nixos",
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-stable-nixos": "nixpkgs-stable-nixos",
+        "nixpkgs-unstable": "nixpkgs-unstable",
         "nixverse": "nixverse",
         "sops-nix-stable-nixos": "sops-nix-stable-nixos",
         "stylix-stable-nixos": "stylix-stable-nixos",
@@ -618,11 +674,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752544651,
+        "lastModified": 1754988908,
-        "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=",
+        "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "2c8def626f54708a9c38a5861866660395bb3461",
+        "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48",
         "type": "github"
       },
       "original": {
@@ -652,11 +708,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1752672274,
+        "lastModified": 1756812894,
-        "narHash": "sha256-UpUSLSoH31iV2QttW3/BO2i+QZqcPMVVPZ+gNm/66O8=",
+        "narHash": "sha256-wZfNe3ms+dS2cUEGe8ygqNxBHGQCRoJQuQM9xFgGad0=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "ab4ae25851db16a6abd4c8e08dd1afb49ec37944",
+        "rev": "a9553a7486c86259b7678235cc26cfd70296251d",
         "type": "github"
       },
       "original": {
@@ -829,11 +885,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752584655,
+        "lastModified": 1756941389,
-        "narHash": "sha256-nPHrsq0vSh0+BqV2xAAVsfoVqzP9KYG7Zicc6oA0nfk=",
+        "narHash": "sha256-r7Km2PY1gxpNmq7dPbs89JiyHiJ5zRCF6cBPyb2WWGY=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "759a7860416dfd8c86f383d4ea4009bb034d869c",
+        "rev": "d197dd7556567a7a4174dee543286e5e65198379",
         "type": "github"
       },
       "original": {

flake.nix

@@ -2,11 +2,19 @@
   inputs = {
     self.submodules = true;
     nixpkgs-stable-nixos.url = "github:nixos/nixpkgs/nixos-25.05";
+    
+    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    
     nixverse = {
-      url = "github:hgl/nixverse";
+      url = "github:hgl/nixverse?ref=084a07f43829857fc760e70212c497d2f40eaa3c";
       inputs.nixpkgs.follows = "nixpkgs-stable-nixos";
     };
 
+    auto-cpufreq-stable-nixos = {
+      url = "github:AdnanHodzic/auto-cpufreq";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     disko-stable-nixos = {
       url = "github:nix-community/disko";
       inputs.nixpkgs.follows = "nixpkgs-stable-nixos";
@@ -38,6 +46,10 @@
     #  url = "github:kaylorben/nixcord";
     #};
 
+    nixos-hardware-stable-nixos = {
+      url = "github:NixOS/nixos-hardware/master";
+    };
+
     sops-nix-stable-nixos = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs-stable-nixos";

nodes/hosts/common/configuration.nix

@@ -6,6 +6,7 @@
     inputs.home-manager.nixosModules.home-manager
     inputs.sops-nix.nixosModules.sops
     inputs.nix-gaming.nixosModules.pipewireLowLatency
+    ./programs/appimage.nix
     ./programs/emulation.nix
     ./programs/firefox.nix
     ./programs/fonts.nix
@@ -16,6 +17,7 @@
     ./programs/hyprland.nix
     ./programs/kde.nix
     ./programs/obs-studio.nix
+    ./programs/open-tv.nix
     ./programs/session-desktop.nix
     ./programs/steam.nix
     ./programs/zen-browser.nix

nodes/hosts/common/home/jay/home.nix

@@ -12,14 +12,16 @@
     ./programs/alacritty.nix
     ./programs/bash.nix
     ./programs/btop.nix
+    ./programs/emacs.nix
     ./programs/git.nix
     ./programs/hyprland.nix
     ./programs/hyprlock.nix
     ./programs/hyprpanel.nix
     ./programs/lazygit.nix
     ./programs/mangohud.nix
-    #./programs/nixcord.nix
+    ./programs/discord.nix
     ./programs/oh-my-posh.nix
+    ./programs/qutebrowser.nix
     ./programs/rbw.nix
     ./programs/rofi.nix
     ./programs/stylix.nix
@@ -42,8 +44,9 @@
   # The home.packages option allows you to install Nix packages into your
   # environment.
   home.packages = [
-    pkgs.legcord
     pkgs.libgtop
+    pkgs.powertop
+    pkgs.upower
     #pkgs.mpvpaper 
     # pkgs.hyprlandPlugins.hyprtrails
   ];

nodes/hosts/common/home/jay/programs/discord.nix

@@ -0,0 +1,9 @@
+{ pkgs, ... }: {
+  home.packages = [
+    pkgs.betterdiscordctl
+    pkgs.discord
+    pkgs.legcord
+    pkgs.discover-overlay
+  ];
+}
+

nodes/hosts/common/home/jay/programs/emacs.nix

@@ -0,0 +1,5 @@
+{ ... }: {
+  programs.emacs = {
+    enable = true;
+  };
+}

nodes/hosts/common/home/jay/programs/hyprland.nix

@@ -207,7 +207,7 @@
         # "systemctl --user start hyprpolkitagent"
         "steam --disable-gpu-compositing" # nvidia pls let me have nice things
         #"vesktop"
-        "legcord"
+        "goofcord"
         # "[workspace 9 silent] ELECTRON_OZONE_PLATFORM_HINT=x11 1password" # fix for promts not showing up anymore
         "zen-twilight"
         # "${pkgs.xorg.xhost}/bin/xhost +"
@@ -225,7 +225,7 @@
       windowrulev2 = [
         "workspace 1 silent, class:^(zen-twilight)$"
         "workspace 2 silent, class:^(steam)$"
-        "workspace 3 silent, class:^(legcord)$"
+        "workspace 3 silent, class:^(goofcord)$"
         "workspace 4 silent, class:^(com.core447.StreamController)$"
         "float,class:(clipse)$"
         "size 622 652,class:(clipse)$"

nodes/hosts/common/home/jay/programs/hyprpanel.nix

@@ -6,7 +6,7 @@
         "0" = {
           left = [ "dashboard" "separator" "microphone" "volume" "bluetooth" "hypridle" "separator" "network" "separator" "workspaces" "windowtitle" ];
           middle = [ "media" "cava" ];
-          right = [ "cpu" "cputemp" "ram" "storage" "separator" "systray" "notifications" "separator" "weather" "clock" ];
+          right = [ "cpu" "cputemp" "ram" "storage" "separator" "systray" "notifications" "battery" "separator" "weather" "clock" ];
         };
       };
 

nodes/hosts/common/home/jay/programs/qutebrowser.nix

@@ -0,0 +1,6 @@
+{ ... }: {
+  programs.qutebrowser = {
+    enable = true;
+  };
+}
+

nodes/hosts/common/home/jay/services/arrpc.nix

@@ -1,3 +1,3 @@
 { ... }: {
-  #services.arrpc.enable = true;
+  services.arrpc.enable = true;
 }

nodes/hosts/common/programs/appimage.nix

@@ -0,0 +1,5 @@
+{ ... }: {
+  programs.appimage.enable = true;
+  programs.appimage.binfmt = true;
+}
+

nodes/hosts/common/programs/appimages/drop.nix

@@ -0,0 +1,40 @@
+{ pkgs, ... }: let
+  pname = "Drop%20Desktop%20Client";
+  version = "0.3.0";
+
+  src = pkgs.fetchurl {
+    url = "https://github.com/Drop-OSS/drop-app/releases/download/v0.3.0/Drop.Desktop.Client_0.3.0_amd64.AppImage";
+    hash = "sha256-VVDzotrgu68CAGr4EqpWlW8ZOhf4cbt4a46WHJTnxjo=";
+  };
+  appimageContents = pkgs.appimageTools.extract {inherit pname version src;};
+in
+    pkgs.appimageTools.wrapType2 {
+      inherit pname version src;
+      pkgs = pkgs;
+      extraInstallCommands = ''
+        install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
+        substituteInPlace $out/share/applications/${pname}.desktop \
+          --replace 'Exec=AppRun' 'Exec=${pname}'
+        cp -r ${appimageContents}/usr/share/icons $out/share
+
+        # unless linked, the binary is placed in $out/bin/cursor-someVersion
+        # ln -s $out/bin/${pname}-${version} $out/bin/${pname}
+      '';
+
+      extraBwrapArgs = [
+        "--bind-try /etc/nixos/ /etc/nixos/"
+      ];
+
+      # vscode likes to kill the parent so that the
+      # gui application isn't attached to the terminal session
+      dieWithParent = false;
+
+      extraPkgs = pkgs: with pkgs; [
+        unzip
+        autoPatchelfHook
+        asar
+        haskellPackages.gi-ayatana-appindicator3
+        # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651
+        (buildPackages.wrapGAppsHook.override {inherit (buildPackages) makeWrapper;})
+      ];
+    }

nodes/hosts/common/programs/drop.nix

@@ -0,0 +1,11 @@
+{ pkgs, lib, inputs, ... }:
+
+let 
+  dropApp = import ./appimages/drop.nix { inherit pkgs; };
+in
+{
+  # ...
+  environment.systemPackages = with pkgs; [
+    dropApp
+  ];
+}

nodes/hosts/common/programs/emulation.nix

@@ -13,5 +13,9 @@
   services.flatpak.packages = [
     "io.github.ryubing.Ryujinx"
   ];
+
+  environment.shellAliases = {
+    ryujinx = "flatpak run io.github.ryubing.Ryujinx";
+  };
 }
 

nodes/hosts/common/programs/gaming.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ pkgs, pkgs-unstable, ... }: {
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = [
@@ -11,6 +11,8 @@
     pkgs.protonup-qt
     pkgs.wineWowPackages.stable
     pkgs.winetricks
+    pkgs-unstable.nero-umu
+    pkgs-unstable.protonplus
   ];
 }
 

nodes/hosts/common/programs/general.nix

@@ -17,10 +17,12 @@
     pkgs.btop
     pkgs.chatterino2
     pkgs.clipse
+    #(pkgs.discord.override { withMoonlight = true; })
     pkgs.dmidecode
     pkgs.dysk
     pkgs.elinks
     pkgs.fastfetch
+    pkgs.gearlever
     pkgs.git
     pkgs.gnumake
     #pkgs.gpustat
@@ -38,6 +40,7 @@
     pkgs.nix-search-tv
     pkgs.nvd
     pkgs.nyxt
+    pkgs.overlayed
     pkgs.p7zip-rar
     pkgs.pciutils
     pkgs.pinentry-curses
@@ -54,6 +57,7 @@
     pkgs.usbutils
     pkgs.vlc
     pkgs.wf-recorder
+    pkgs.zip
     pkgs'.nixverse
   ];
 }

nodes/hosts/common/programs/open-tv.nix

@@ -0,0 +1,10 @@
+{ ... }: {
+  services.flatpak.packages = [
+    "dev.fredol.open-tv"
+  ];
+
+  environment.shellAliases = {
+    open-tv = "flatpak run dev.fredol.open-tv";
+  };
+}
+

nodes/hosts/common/programs/steam.nix

@@ -28,5 +28,9 @@
       };
     };
   };
+
+  environment.systemPackages = [
+    pkgs.samrewritten
+  ];
 }
 

nodes/hosts/common/services/sound.nix

@@ -11,11 +11,11 @@
     alsa.enable = true;
     alsa.support32Bit = true;
     pulse.enable = true;
-    wireplumber.enable = true;
+    #wireplumber.enable = true;
     # If you want to use JACK applications, uncomment this
     jack.enable = true;
 
-    lowLatency.enable = true;
+    lowLatency.enable = false;
 
     # use the example session manager (no others are packaged yet so this is enabled by default,
     # no need to redefine it in your config for now)

nodes/hosts/common/system/bootloader.nix

@@ -4,33 +4,33 @@
   ];
 
   boot = {
-    initrd.verbose = false;
+    #initrd.verbose = false;
     loader = {
       systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;
     };
     
     kernelPackages = pkgs.linuxPackages_xanmod_stable;
-    kernelParams = [
+    #kernelParams = [
-      "quiet"
+      #"quiet"
-      "splash"
+      #"splash"
-      "boot.shell_on_fail"
+      #"boot.shell_on_fail"
-      "udev.log_priority=3"
+      #"udev.log_priority=3"
-      "rc.systemd.show_status=auto"
+      #"rc.systemd.show_status=auto"
-    ];
+    #];
 
     extraModprobeConfig = ''
       options bluetooth enable_ecred=1
     '';
 
-    plymouth = {
+    #plymouth = {
-      enable = true;
+    #  enable = true;
-      theme = lib.mkForce "glitch";
+    #  theme = lib.mkForce "glitch";
-      themePackages = [
+    #  themePackages = [
-        (pkgs.adi1090x-plymouth-themes.override { selected_themes = [ "glitch" ]; })
+    #    (pkgs.adi1090x-plymouth-themes.override { selected_themes = [ "glitch" ]; })
-      ];
+    #  ];
-    };
+    #};
-    consoleLogLevel = 3;
+    #consoleLogLevel = 3;
     loader.timeout = 3;
   };
 }

nodes/hosts/common/system/environment.nix

@@ -9,7 +9,6 @@
 
     shellAliases = {
       ls = "lsd -la";
-      ryujinx = "flatpak run io.github.ryubing.Ryujinx";
     };
 
     # Get plasma integration with browsers to work better.

nodes/hosts/group.nix

@@ -7,4 +7,5 @@
   nixy = {
     deploy.local = true;
   };
+  nixwork = {};
 }

nodes/hosts/nixwork/configuration.nix

@@ -0,0 +1,24 @@
+# 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`).
+
+{ inputs, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+      inputs.nixos-hardware.nixosModules.framework-16-7040-amd
+      ./programs/sof-firmware.nix
+      # Not working yet.
+      ./services/fprintd.nix
+      ./services/lidswitch.nix
+      ./services/touchpad.nix
+      ./system/bootloader.nix
+      ./system/filesystems.nix
+      ./system/networking.nix
+    ];
+
+  system.stateVersion = "25.05"; # Did you read the comment?
+}
+

nodes/hosts/nixwork/disk-config.nix

@@ -0,0 +1,110 @@
+{
+  disko.devices = {
+    disk = {
+      nvme1n1 = {
+        type = "disk";
+        device = "/dev/nvme0n1";
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              label = "boot";
+              name = "ESP";
+              size = "4500M";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = [ 
+                  "umask=0077" 
+                  "defaults"
+                ];
+              };
+            };
+            luks = {
+              size = "100%";
+              label = "luks";
+              content = {
+                type = "luks";
+                name = "cryptroot";
+                # disable settings.keyFile if you want to use interactive password entry
+                #passwordFile = "/tmp/secret.key"; # Interactive
+                settings = {
+                  allowDiscards = true;
+                  #keyFile = "/tmp/secret.key";
+                };
+                
+                #additionalKeyFiles = [ "/tmp/additionalSecret.key" ];
+                content = {
+                  type = "btrfs";
+                  extraArgs = [ "-L" "nixos" "-f" ];
+                  subvolumes = {
+                    "/root" = {
+                      mountpoint = "/";
+                      mountOptions = [
+                        "subvol=root"
+                        "compress=zstd"
+                        "noatime"
+                      ];
+                    };
+                    "/root-blank" = {
+                      mountOptions = [
+                        "subvol=root-blank" 
+                        "nodatacow" 
+                        "noatime"
+                      ];
+                    };
+                    "/home" = {
+                      mountpoint = "/home";
+                      mountOptions = [
+                        "subvol=home"
+                        "compress=zstd"
+                        "noatime"
+                      ];
+                    };
+                    "/nix" = {
+                      mountpoint = "/nix";
+                      mountOptions = [
+                        "subvol=nix"
+                        "compress=zstd"
+                        "noatime"
+                      ];
+                    };
+                    "/persist" = {
+                      mountpoint = "/persist";
+                      mountOptions = [
+                        "subvol=persist"
+                        "compress=zstd"
+                        "noatime"
+                      ];
+                    };
+                    "/log" = {
+                      mountpoint = "/var/log";
+                      mountOptions = [
+                        "subvol=log"
+                        "compress=zstd"
+                        "noatime"
+                      ];
+                    };
+                    "/lib" = {
+                      mountpoint = "/var/lib";
+                      mountOptions = [
+                        "subvol=lib" 
+                        "compress=zstd"
+                        "noatime"
+                      ];
+                    };
+                  };
+                };
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+  fileSystems."/persist".neededForBoot = true;
+  fileSystems."/var/log".neededForBoot = true;
+  fileSystems."/var/lib".neededForBoot = true;
+}

nodes/hosts/nixwork/hardware-configuration.nix

@@ -0,0 +1,26 @@
+# 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" "thunderbolt" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  # 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.enp193s0f3u1.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

nodes/hosts/nixwork/home/jay/home.nix

@@ -0,0 +1,8 @@
+{ ... }:
+{
+  imports = [
+    ./programs/hyprland.nix
+    ./programs/hyprpanel.nix
+  ];
+}
+

nodes/hosts/nixwork/home/jay/programs/hyprland.nix

@@ -0,0 +1,7 @@
+{ ... }: { 
+  wayland.windowManager.hyprland = {
+    settings = {
+      "monitor" = "eDP-1, 2560x1600@60, 0x0, 1";
+    };
+  };
+}

nodes/hosts/nixwork/home/jay/programs/hyprpanel.nix

@@ -0,0 +1,13 @@
+{ lib, ... }: { 
+  programs.hyprpanel = {
+    settings = {
+      bar = {
+        customModules = {
+          cava = {
+            framerate = lib.mkForce 120;
+          };
+        };
+      };
+    };
+  };
+}

nodes/hosts/nixwork/node.nix

@@ -0,0 +1,4 @@
+{
+  os = "nixos";
+  channel = "stable";
+}

nodes/hosts/nixwork/programs/sof-firmware.nix

@@ -0,0 +1,8 @@
+{ pkgs, ... }: {
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  environment.systemPackages = [
+    pkgs.sof-firmware
+  ];
+}
+

nodes/hosts/nixwork/services/fprintd.nix

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

nodes/hosts/nixwork/services/lidswitch.nix

@@ -0,0 +1,4 @@
+{ pkgs, ...}: {
+  services.logind.lidSwitch = "poweroff";
+  services.logind.lidSwitchExternalPower = "lock";
+}

nodes/hosts/nixwork/services/touchpad.nix

@@ -0,0 +1,4 @@
+{ ... }: {
+  # Enable touchpad support (enabled default in most desktopManager).
+  services.libinput.enable = true;
+}

nodes/hosts/nixwork/system/bootloader.nix

@@ -0,0 +1,52 @@
+{ config, ... }: {
+  boot = {
+    tmp = {
+      useTmpfs = true;
+      tmpfsSize = "50%";
+    };
+    kernelModules = [ "kvm-intel" ];
+    extraModulePackages = with config.boot.kernelPackages; [ xpadneo ];
+    extraModprobeConfig = '' options bluetooth disable_ertm=1 '';
+
+    initrd = {
+    
+    # OLD CONFIG
+    # NAME                                           FSTYPE      FSVER LABEL UUID                                 FSAVAIL FSUSE% MOUNTPOINTS
+    # nvme0n1
+    #  └─nvme0n1p1                                   crypto_LUKS 2           e174181f-828c-44fd-97c1-0e2fdc2322e5
+    #    └─luks-e174181f-828c-44fd-97c1-0e2fdc2322e5 btrfs             home  f8ed950a-5cc9-4b87-901c-4cfece6daf6c    3.3T     9% /home
+    #  luks.devices."luks-e174181f-828c-44fd-97c1-0e2fdc2322e5".device = "/dev/disk/by-uuid/e174181f-828c-44fd-97c1-0e2fdc2322e5";
+    #  nvme1n1
+    #  ├─nvme1n1p1                                   vfat        FAT32       D19B-1967                               4.3G     3% /boot
+    #  ├─nvme1n1p2                                   crypto_LUKS 2           300fdb2a-d887-4e53-bc97-9fdc123856ce
+    #  │ └─luks-300fdb2a-d887-4e53-bc97-9fdc123856ce swap        1     swap  66b9e1f6-1fc5-4c32-afc7-724880504495                [SWAP]
+    #  luks.devices."luks-300fdb2a-d887-4e53-bc97-9fdc123856ce".device = "/dev/disk/by-uuid/300fdb2a-d887-4e53-bc97-9fdc123856ce";
+    #  └─nvme1n1p3                                   crypto_LUKS 2           e69c5d63-f5a7-4cb1-a858-4e6396d8def7
+    #    └─luks-e69c5d63-f5a7-4cb1-a858-4e6396d8def7 btrfs             root  f53b22d4-df74-4ee0-9f85-3fb0eb087150                /nix/store
+    #  luks.devices."luks-e69c5d63-f5a7-4cb1-a858-4e6396d8def7".device = "/dev/disk/by-uuid/e69c5d63-f5a7-4cb1-a858-4e6396d8def7";
+
+    # NEW CONFIG
+    # nvme0n1
+    #  └─nvme0n1p1   crypto_LUKS 2                                           1976c849-c317-46c0-af98-d2dfc455c489
+    #    └─crypthome btrfs                        home                       c63ca365-e963-4ea4-bb71-ed1c7e1b6bc8                /mnt/home
+    #  luks.devices."crypthome".device = "/dev/disk/by-uuid/1976c849-c317-46c0-af98-d2dfc455c489";
+    # nvme1n1
+    #  ├─nvme1n1p1   vfat        FAT32                                       CDA0-8838                               4.4G     0% /mnt/boot
+    #  └─nvme1n1p2   crypto_LUKS 2                                           e948662c-ae57-46aa-b7bf-cc09dbaa8cdb
+    #    └─cryptroot btrfs                        nixos                      77021dd1-9fa5-4e9f-9be2-ba943e6de77c  925.1G     0% /mnt/var/log
+    #                                                                                                                            /mnt/persist
+    #                                                                                                                            /mnt/nix
+    #                                                                                                                            /mnt
+      luks.devices."cryptroot" = {
+        device = "/dev/disk/by-partlabel/luks";
+        allowDiscards = true;
+      };
+
+      kernelModules = [ ];
+
+      availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];
+
+    };
+  };
+}
+

nodes/hosts/nixwork/system/filesystems.nix

@@ -0,0 +1,54 @@
+{ ... }: {
+  
+  fileSystems."/" =
+    { device = "/dev/mapper/cryptroot";
+      fsType = "btrfs";
+      options = [ "subvol=root" "compress=zstd" "noatime" ];
+    };
+
+  fileSystems."/home" =
+    { device = "/dev/mapper/cryptroot";
+      fsType = "btrfs";
+      options = [ "subvol=home" "compress=zstd" "noatime" ];
+    };
+
+  fileSystems."/nix" =
+    { device = "/dev/mapper/cryptroot";
+      fsType = "btrfs";
+      options = [ "subvol=nix" "compress=zstd" "noatime" ];
+    };
+
+  fileSystems."/var/log" =
+    { device = "/dev/mapper/cryptroot";
+      fsType = "btrfs";
+      options = [ "subvol=log" "compress=zstd" "noatime" ];
+      neededForBoot = true;
+    };
+
+  fileSystems."/var/lib" =
+    { device = "/dev/mapper/cryptroot";
+      fsType = "btrfs";
+      options = [ "subvol=lib" "compress=zstd" "noatime" ];
+      neededForBoot = true;
+    };
+
+  fileSystems."/persist" =
+    { device = "/dev/mapper/cryptroot";
+      fsType = "btrfs";
+      options = [ "subvol=persist" "compress=zstd" "noatime" ];
+      neededForBoot = true;
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-partlabel/boot";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  swapDevices = [{
+    device = "/swapfile";
+    size = 18 * 1024;
+  }];
+
+}
+

nodes/hosts/nixwork/system/networking.nix

@@ -0,0 +1,4 @@
+{ ... }: {
+  networking.hostName = "nixwork"; # Define your hostname.
+}
+