Compare commits

..

5 Commits

Author SHA1 Message Date
jay
41ecfa25f1 Disable powermanagement. 2025-08-02 22:01:14 -04:00
jay
1b9070c79e Flake update. 2025-08-02 22:01:04 -04:00
jay
a20c7f5789 Enable powermanagement, set default cpu governor. 2025-08-02 12:14:49 -04:00
jay
0053d89359 Flake update. 2025-08-02 12:14:40 -04:00
jay
b0e594a547 Set nixy cpu governor to ondemand. 2025-08-02 12:07:41 -04:00
13 changed files with 79 additions and 109 deletions

View File

@@ -15,15 +15,15 @@ Machines
To-Do List 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 Installation

78
flake.lock generated
View File

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

View File

@@ -6,7 +6,6 @@
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
inputs.nix-gaming.nixosModules.pipewireLowLatency inputs.nix-gaming.nixosModules.pipewireLowLatency
./programs/appimage.nix
./programs/emulation.nix ./programs/emulation.nix
./programs/firefox.nix ./programs/firefox.nix
./programs/fonts.nix ./programs/fonts.nix

View File

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

View File

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

View File

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

View File

@@ -1,40 +0,0 @@
{ 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;})
];
}

View File

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

View File

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

View File

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

View File

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

View File

@@ -0,0 +1,18 @@
{ 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";
};
};
};
}

View File

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