Flake update.

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.
- [ ]  Set up declarative Discord setup with nixcord and plugins.
- [ ]  Figure out how to set up sops-nix with user passwords properly.
- [X]  Fully setup private git repository for secrets.
- [X]  Integrate private git repository into 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).
- [ ]  Setup arcade machine on NixOS.
- [ ]  Setup ally machine on NixOS.
+ [ ]  Finish porting features from nixy's previous setup and get them working on lappy: impermanence.   
+ [ ]  Set up declarative Discord setup with nixcord and plugins.   
+ [ ]  Figure out how to set up sops-nix with user passwords properly.   
+ [X]  Fully setup private git repository for secrets.   
+ [X]  Integrate private git repository into 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).   
+ [ ]  Setup arcade machine on NixOS.   
+ [ ]  Setup ally machine on NixOS.   
 
 Installation
 

flake.lock

@@ -117,11 +117,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1753140376,
-        "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=",
+        "lastModified": 1756733629,
+        "narHash": "sha256-dwWGlDhcO5SMIvMSTB4mjQ5Pvo2vtxvpIknhVnSz2I8=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c",
+        "rev": "a5c4f2ab72e3d1ab43e3e65aa421c6f2bd2e12a1",
         "type": "github"
       },
       "original": {
@@ -151,11 +151,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1753121425,
-        "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=",
+        "lastModified": 1754487366,
+        "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e",
+        "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18",
         "type": "github"
       },
       "original": {
@@ -286,11 +286,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1753592768,
-        "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
+        "lastModified": 1756679287,
+        "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "fc3add429f21450359369af74c2375cb34a2d204",
+        "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8",
         "type": "github"
       },
       "original": {
@@ -328,11 +328,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1753336869,
-        "narHash": "sha256-pTDsWVppLaWMTRAGTPonz0UZlh/Xa8iJCtCB+qk5o1g=",
+        "lastModified": 1755569534,
+        "narHash": "sha256-ukXfV1cAsxoar0IVEO2/s3qnVEZpZf0wvqE3PIESobw=",
         "owner": "Jas-SinghFSU",
         "repo": "Hyprpanel",
-        "rev": "d24afbec746ed16db9637085b2f6047a2ac491b5",
+        "rev": "6385f2e15df908e0c13bed800f4b091300e5b981",
         "type": "github"
       },
       "original": {
@@ -401,11 +401,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1753841490,
-        "narHash": "sha256-rcaiQ9e/glv3s5aSYB3/y3T7cs9rY+G0TOixQZQVADA=",
+        "lastModified": 1756950352,
+        "narHash": "sha256-CkNlcUeNlDmxF1GJwEQg3aIBSCihnFcAqCwBjUQGqNY=",
         "owner": "fufexan",
         "repo": "nix-gaming",
-        "rev": "1b9569f6474bfc5b7257a8a4ba02d1f26e75f489",
+        "rev": "64ac07fae89f297beab704dce70038cdbda55c25",
         "type": "github"
       },
       "original": {
@@ -465,11 +465,11 @@
     },
     "nixos-hardware-stable-nixos": {
       "locked": {
-        "lastModified": 1753122741,
-        "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=",
+        "lastModified": 1756925795,
+        "narHash": "sha256-kUb5hehaikfUvoJDEc7ngiieX88TwWX/bBRX9Ar6Tac=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22",
+        "rev": "ba6fab29768007e9f2657014a6e134637100c57d",
         "type": "github"
       },
       "original": {
@@ -540,11 +540,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1751159883,
-        "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=",
+        "lastModified": 1753579242,
+        "narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab",
+        "rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e",
         "type": "github"
       },
       "original": {
@@ -555,11 +555,11 @@
     },
     "nixpkgs-stable-nixos": {
       "locked": {
-        "lastModified": 1753749649,
-        "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=",
+        "lastModified": 1756886854,
+        "narHash": "sha256-6tooT142NLcFjt24Gi4B0G1pgWLvfw7y93sYEfSHlLI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a",
+        "rev": "0e6684e6c5755325f801bda1751a8a4038145d7d",
         "type": "github"
       },
       "original": {
@@ -571,11 +571,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1753934836,
-        "narHash": "sha256-G06FmIBj0I5bMW1Q8hAEIl5N7IHMK7+Ta4KA+BmneDA=",
+        "lastModified": 1756819007,
+        "narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8679b16e11becd487b45d568358ddf9d5640d860",
+        "rev": "aaff8c16d7fc04991cac6245bee1baa31f72b1e1",
         "type": "github"
       },
       "original": {
@@ -587,11 +587,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1753934836,
-        "narHash": "sha256-G06FmIBj0I5bMW1Q8hAEIl5N7IHMK7+Ta4KA+BmneDA=",
+        "lastModified": 1756819007,
+        "narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8679b16e11becd487b45d568358ddf9d5640d860",
+        "rev": "aaff8c16d7fc04991cac6245bee1baa31f72b1e1",
         "type": "github"
       },
       "original": {
@@ -674,11 +674,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752544651,
-        "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=",
+        "lastModified": 1754988908,
+        "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "2c8def626f54708a9c38a5861866660395bb3461",
+        "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48",
         "type": "github"
       },
       "original": {
@@ -708,11 +708,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1753979771,
-        "narHash": "sha256-MdMdQymbivEWWkC5HqeLYtP8FYu0SqiSpiRlyw9Fm3Y=",
+        "lastModified": 1756812894,
+        "narHash": "sha256-wZfNe3ms+dS2cUEGe8ygqNxBHGQCRoJQuQM9xFgGad0=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "5b81b0c4fbab3517b39d63f493760d33287150ad",
+        "rev": "a9553a7486c86259b7678235cc26cfd70296251d",
         "type": "github"
       },
       "original": {
@@ -885,11 +885,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1753933355,
-        "narHash": "sha256-4QxMcKS6oc+cG8efwwAin4M+YOokBak1dVS8u5P3b5M=",
+        "lastModified": 1756941389,
+        "narHash": "sha256-r7Km2PY1gxpNmq7dPbs89JiyHiJ5zRCF6cBPyb2WWGY=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "fa795a139a8c92b140bc21f11f61da1c97ad5b1d",
+        "rev": "d197dd7556567a7a4174dee543286e5e65198379",
         "type": "github"
       },
       "original": {

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

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

@@ -45,6 +45,8 @@
   # environment.
   home.packages = [
     pkgs.libgtop
+    pkgs.powertop
+    pkgs.upower
     #pkgs.mpvpaper 
     # pkgs.hyprlandPlugins.hyprtrails
   ];

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/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/general.nix

@@ -22,6 +22,7 @@
     pkgs.dysk
     pkgs.elinks
     pkgs.fastfetch
+    pkgs.gearlever
     pkgs.git
     pkgs.gnumake
     #pkgs.gpustat

nodes/hosts/nixwork/configuration.nix

@@ -9,13 +9,10 @@
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
       inputs.nixos-hardware.nixosModules.framework-16-7040-amd
-      inputs.auto-cpufreq.nixosModules.default
-      ./programs/auto-cpufreq.nix
       ./programs/sof-firmware.nix
       # Not working yet.
       ./services/fprintd.nix
       ./services/lidswitch.nix
-      ./services/power-profiles-daemon.nix
       ./services/touchpad.nix
       ./system/bootloader.nix
       ./system/filesystems.nix

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

@@ -1,12 +1,6 @@
 { lib, ... }: { 
   programs.hyprpanel = {
     settings = {
-      "bar.layouts" = {
-        "0" = {
-          right = [ "battery" ];
-        };
-      };
-
       bar = {
         customModules = {
           cava = {

nodes/hosts/nixwork/programs/auto-cpufreq.nix

@@ -1,18 +0,0 @@
-{ pkgs, ... }: {
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  programs.auto-cpufreq = {
-    enable = false;
-    settings = {
-      charger = {
-        governor = "performance";
-        turbo = "auto";
-      };
-      battery = {
-        governor = "power-saver";
-        turbo = "never";
-      };
-    };
-  };
-}
-

nodes/hosts/nixwork/services/power-profiles-daemon.nix

@@ -1,3 +0,0 @@
-{ pkgs, ...}: {
-  # services.power-profiles-daemon.enable = "true";
-}

nodes/hosts/nixy/system/bootloader.nix

@@ -48,7 +48,5 @@
 
     };
   };
-
-  powerManagement.cpuFreqGovernor = "ondemand";
 }