Flake update.

Fix appimage.

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "private"]
 	path = private
-        url = ssh://git@192.168.86.189:222/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": 1752718651,
+        "lastModified": 1756733629,
-        "narHash": "sha256-PkaR0qmyP9q/MDN3uYa+RLeBA0PjvEQiM0rTDDBXkL8=",
+        "narHash": "sha256-dwWGlDhcO5SMIvMSTB4mjQ5Pvo2vtxvpIknhVnSz2I8=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "d5ad4485e6f2edcc06751df65c5e16572877db88",
+        "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": 1752780124,
+        "lastModified": 1756679287,
-        "narHash": "sha256-5dn97vIYxn6VozKePOQSDxVCsrl38nDdMJXx86KIJH0=",
+        "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c718918222bdb104397762dea67e6b397a7927fe",
+        "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8",
         "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": 1752977425,
+        "lastModified": 1756950352,
-        "narHash": "sha256-Ae7I3Q5Odds6hvWY0+ZCnlvngq7MVWJD4TV/NUGyiZw=",
+        "narHash": "sha256-CkNlcUeNlDmxF1GJwEQg3aIBSCihnFcAqCwBjUQGqNY=",
         "owner": "fufexan",
         "repo": "nix-gaming",
-        "rev": "b8fad5f070ed53a72dbcc6c60bce04be943887fe",
+        "rev": "64ac07fae89f297beab704dce70038cdbda55c25",
         "type": "github"
       },
       "original": {
@@ -445,11 +465,11 @@
     },
     "nixos-hardware-stable-nixos": {
       "locked": {
-        "lastModified": 1752666637,
+        "lastModified": 1756925795,
-        "narHash": "sha256-P8J72psdc/rWliIvp8jUpoQ6qRDlVzgSDDlgkaXQ0Fw=",
+        "narHash": "sha256-kUb5hehaikfUvoJDEc7ngiieX88TwWX/bBRX9Ar6Tac=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153",
+        "rev": "ba6fab29768007e9f2657014a6e134637100c57d",
         "type": "github"
       },
       "original": {
@@ -520,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": {
@@ -535,11 +555,11 @@
     },
     "nixpkgs-stable-nixos": {
       "locked": {
-        "lastModified": 1752620740,
+        "lastModified": 1756886854,
-        "narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=",
+        "narHash": "sha256-6tooT142NLcFjt24Gi4B0G1pgWLvfw7y93sYEfSHlLI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e",
+        "rev": "0e6684e6c5755325f801bda1751a8a4038145d7d",
         "type": "github"
       },
       "original": {
@@ -551,11 +571,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1752900028,
+        "lastModified": 1756819007,
-        "narHash": "sha256-dPALCtmik9Wr14MGqVXm+OQcv7vhPBXcWNIOThGnB/Q=",
+        "narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6b4955211758ba47fac850c040a27f23b9b4008f",
+        "rev": "aaff8c16d7fc04991cac6245bee1baa31f72b1e1",
         "type": "github"
       },
       "original": {
@@ -567,11 +587,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1752900028,
+        "lastModified": 1756819007,
-        "narHash": "sha256-dPALCtmik9Wr14MGqVXm+OQcv7vhPBXcWNIOThGnB/Q=",
+        "narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6b4955211758ba47fac850c040a27f23b9b4008f",
+        "rev": "aaff8c16d7fc04991cac6245bee1baa31f72b1e1",
         "type": "github"
       },
       "original": {
@@ -630,6 +650,7 @@
     },
     "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",
@@ -653,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": {
@@ -687,11 +708,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1752962561,
+        "lastModified": 1756812894,
-        "narHash": "sha256-45R7e+u63LcrSuq/zseu6aWdzwmxr06pR89JRJ0XJdM=",
+        "narHash": "sha256-wZfNe3ms+dS2cUEGe8ygqNxBHGQCRoJQuQM9xFgGad0=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "249f2686ea8a3452ec102f3754f97e238e55af18",
+        "rev": "a9553a7486c86259b7678235cc26cfd70296251d",
         "type": "github"
       },
       "original": {
@@ -864,11 +885,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752986546,
+        "lastModified": 1756941389,
-        "narHash": "sha256-vHuALOq4OJZhdh+T/Btei4WtydWf5CD+dJnsyUWRJYw=",
+        "narHash": "sha256-r7Km2PY1gxpNmq7dPbs89JiyHiJ5zRCF6cBPyb2WWGY=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "755e04275f33a883e21eb2446a52b50db21a62e7",
+        "rev": "d197dd7556567a7a4174dee543286e5e65198379",
         "type": "github"
       },
       "original": {

flake.nix

@@ -10,6 +10,11 @@
       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";

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

@@ -19,7 +19,7 @@
     ./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
@@ -44,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/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/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/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
@@ -55,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/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/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/nixwork/configuration.nix

@@ -12,6 +12,7 @@
       ./programs/sof-firmware.nix
       # Not working yet.
       ./services/fprintd.nix
+      ./services/lidswitch.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/services/lidswitch.nix

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

nodes/hosts/nixwork/system/networking.nix

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