diff --git a/configs/games.nix b/configs/games.nix index eb6903a..b7e2744 100755 --- a/configs/games.nix +++ b/configs/games.nix @@ -15,7 +15,7 @@ enable = true; extraPackages = with pkgs; [ gamescope - mangohud + mangohud_git libkrb5 keyutils ]; @@ -41,7 +41,7 @@ wine winetricks # proton-ge-bin - pcsx2 - mangohud + # pcsx2 + mangohud_git ]; } diff --git a/flake.lock b/flake.lock index f9e1cba..aa75f16 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1728392601, - "narHash": "sha256-0ZuowheyMfLuxr4ViAWiKjs0aow1pn8xtKlsYx+NVR4=", + "lastModified": 1728587571, + "narHash": "sha256-vQmYKJ9sLQP6VivCdKNdpisXrB6xpDaaTif5U+IogzQ=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "147c0997fe3451b09fa30c47afa1577f91aa7524", + "rev": "d73c548a001f367048d4f22cf2ae626cd2002503", "type": "github" }, "original": { @@ -32,11 +32,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1728196311, - "narHash": "sha256-JoDDlmjPj0sGo1beOo3bRh7BDppm0Kuet7I7BqTmSl4=", + "lastModified": 1728455642, + "narHash": "sha256-abYGwrL6ak5sBRqwPh+V3CPJ6Pa89p378t51b7BO1lE=", "owner": "nix-community", "repo": "fenix", - "rev": "26971356e387b5ec0578f52be1bbd82ecf6dbad4", + "rev": "3b47535a5c782e4f4ad59cd4bdb23636b6926e03", "type": "github" }, "original": { @@ -105,11 +105,11 @@ ] }, "locked": { - "lastModified": 1728041527, - "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", + "lastModified": 1728337164, + "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", "owner": "nix-community", "repo": "home-manager", - "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", + "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1728337164, - "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", + "lastModified": 1728791962, + "narHash": "sha256-nr5QiXwQcZmf6/auC1UpX8iAtINMtdi2mH+OkqJQVmU=", "owner": "nix-community", "repo": "home-manager", - "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", + "rev": "64c6325b28ebd708653dd41d88f306023f296184", "type": "github" }, "original": { @@ -148,11 +148,11 @@ ] }, "locked": { - "lastModified": 1728183036, - "narHash": "sha256-aq8i8LCbbo2gIBcFiMTFxyE4fdAKrjFU1c//zZn0bZM=", + "lastModified": 1728410210, + "narHash": "sha256-vn6qupt1U0M6Hf3eXhK3/K4Du0Z7A60qYS1G14QsRY8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "751641e82a34709ed2a177e69e23b1ea08a75561", + "rev": "a25f915ec05196d15e3f7f8555ffb612d4f1045d", "type": "github" }, "original": { @@ -207,11 +207,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728269138, - "narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", + "lastModified": 1728729581, + "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", + "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", "type": "github" }, "original": { @@ -223,11 +223,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728241625, - "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -255,11 +255,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1728241625, - "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -283,11 +283,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1728064742, - "narHash": "sha256-tFvUGvqUZjES1yxYT2zEFiTAE0iQKYd+eWKX/6ZqeVw=", + "lastModified": 1728386838, + "narHash": "sha256-Lk64EoJkvp3WMGVJK3CR1TYcNghX0/BqHPLW5zdvmLE=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "5982d9c420d0dc90739171829f0d2e9c80d98979", + "rev": "efaf8bd5de34e2f47bd57425b83e0c7974902176", "type": "github" }, "original": { diff --git a/machine/desktop/configuration.nix b/machine/desktop/configuration.nix index c539f4e..a35c555 100755 --- a/machine/desktop/configuration.nix +++ b/machine/desktop/configuration.nix @@ -91,20 +91,21 @@ in efi = { canTouchEfiVariables = true; }; }; - kernelPackages = pkgs.linuxPackages_cachyos-rc; + kernelPackages = pkgs.pkgs.linuxPackages_cachyos-rc; kernelModules = [ "nct6775" ]; + extraModulePackages = with pkgs.pkgs.linuxPackages_cachyos-rc; [ ryzen-smu ]; # kernelParams = [ "clearcpuid=514" ]; # kernelParams = [ "amdgpu.ppfeaturemask=0xffffffff" ]; }; - # systemd.services = { - # monitor = { - # description = "AMDGPU Control Daemon"; - # wantedBy = [ "multi-user.target" ]; - # after = [ "multi-user.target" ]; - # serviceConfig = { ExecStart = "${pkgs.lact}/bin/lact daemon"; }; - # }; - # }; + systemd.services = { + monitor = { + description = "AMDGPU Control Daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "multi-user.target" ]; + serviceConfig = { ExecStart = "${pkgs.lact}/bin/lact daemon"; }; + }; + }; networking = { hostName = "desktop"; @@ -117,26 +118,17 @@ in inputs.kwin-effects-forceblur.packages.${pkgs.system}.default lact amdgpu_top - python3 python311Packages.tkinter - snapraid mergerfs - gimp - clinfo - gparted - mission-center resources - - # monitorets - stressapptest - + ryzen-monitor-ng qdiskinfo # fan2go # unigine-superposition @@ -153,23 +145,6 @@ in enable32Bit = true; }; - # fancontrol = { - # enable = true; - # config = '' - # INTERVAL=10 - # DEVPATH=hwmon3=devices/platform/it87.656 - # DEVNAME=hwmon3=it8665 - # FCTEMPS=hwmon3/pwm1=hwmon6/temp1_input hwmon3/pwm2=hwmon6/temp3_input hwmon3/pwm3=hwmon6/temp3_input - # FCFANS=hwmon3/pwm1=hwmon3/fan1_input hwmon3/pwm2=hwmon3/fan2_input hwmon3/pwm3=hwmon3/fan3_input - # MINTEMP=hwmon3/pwm1=60 hwmon3/pwm2=60 hwmon3/pwm3=60 - # MAXTEMP=hwmon3/pwm1=80 hwmon3/pwm2=80 hwmon3/pwm3=80 - # MINSTART=hwmon3/pwm1=51 hwmon3/pwm2=102 hwmon3/pwm3=102 - # MINSTOP=hwmon3/pwm1=51 hwmon3/pwm2=102 hwmon3/pwm3=102 - # MINPWM=hwmon3/pwm1=51 hwmon3/pwm2=102 hwmon3/pwm3=102 - # MAXPWM=hwmon3/pwm1=127 hwmon3/pwm2=127 hwmon3/pwm3=127 - # ''; - # }; - pulseaudio.enable = false; }; @@ -181,10 +156,15 @@ in }; }; + # powerManagement = { + # enable = true; + # powertop.enable = true; + # }; + services = { power-profiles-daemon.enable = true; - netdata.enable = true; - printing.enable = true; + # netdata.enable = true; + # printing.enable = true; fwupd.enable = true; # xserver.videoDrivers = [ "amdgpu" ];