From 69ffbf83611c9f0601d77456cae7f5a8b4210642 Mon Sep 17 00:00:00 2001 From: Faris Date: Mon, 12 Jan 2026 14:20:10 +0000 Subject: [PATCH] bluh --- config/desktop.nix | 16 +++-- flake.lock | 125 ++++++++++++++++++++++++++++++++++--- flake.nix | 11 ++++ hosts/desktop/settings.nix | 11 +++- hosts/server/settings.nix | 3 +- 5 files changed, 148 insertions(+), 18 deletions(-) diff --git a/config/desktop.nix b/config/desktop.nix index 279bf2b..2df0f93 100644 --- a/config/desktop.nix +++ b/config/desktop.nix @@ -67,9 +67,9 @@ systemd.services."getty@tty1".enable = false; systemd.services."autovt@tty1".enable = false; - services.xserver.desktopManager.retroarch.extraArgs = [ - "--config=/mnt/services/emulators/retroarch/retroarch.cfg" - ]; + #services.xserver.desktopManager.retroarch.extraArgs = [ + # "--config=/mnt/services/emulators/retroarch/retroarch.cfg" + #]; services.ollama = { enable = true; @@ -125,6 +125,8 @@ tor-browser wireshark monero-gui + moonlight-qt + nvtopPackages.nvidia vscodium dconf-editor via @@ -156,8 +158,9 @@ # emu ryubing xemu - retroarch-full + #retroarch-full rpcs3 + dolphin-emu cemu # media @@ -195,6 +198,9 @@ autoStart = true; capSysAdmin = true; openFirewall = true; + package = pkgs.sunshine.override { + cudaSupport = true; + }; }; programs = { @@ -324,4 +330,6 @@ }; virtualisation.spiceUSBRedirection.enable = true; + services.flatpak.enable = true; + } diff --git a/flake.lock b/flake.lock index ea8a870..59e8c2c 100644 --- a/flake.lock +++ b/flake.lock @@ -21,6 +21,38 @@ "type": "github" } }, + "cachyos-kernel": { + "flake": false, + "locked": { + "lastModified": 1767984036, + "narHash": "sha256-lcHdWENZAMakHEpjLRpi6DHPmqbUHji0TZTAsdyVIKA=", + "owner": "CachyOS", + "repo": "linux-cachyos", + "rev": "46822116e738fbe7f1696d592761606fec514247", + "type": "github" + }, + "original": { + "owner": "CachyOS", + "repo": "linux-cachyos", + "type": "github" + } + }, + "cachyos-kernel-patches": { + "flake": false, + "locked": { + "lastModified": 1768135201, + "narHash": "sha256-cXF8TfRVMgdD0pxlWs5sknJRokqgwb4cunto3ycjWHk=", + "owner": "CachyOS", + "repo": "kernel-patches", + "rev": "1378678080cdff989e935f374e4f9e92af720043", + "type": "github" + }, + "original": { + "owner": "CachyOS", + "repo": "kernel-patches", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -43,6 +75,40 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -71,11 +137,11 @@ ] }, "locked": { - "lastModified": 1764536451, - "narHash": "sha256-BgtcUkBfItu9/yU14IgUaj4rYOanTOUZjUfBP20/ZB4=", + "lastModified": 1767910483, + "narHash": "sha256-MOU5YdVu4DVwuT5ztXgQpPuRRBjSjUGIdUzOQr9iQOY=", "owner": "nix-community", "repo": "home-manager", - "rev": "3fdd076e08049a9c7a83149b270440d9787d2df5", + "rev": "82fb7dedaad83e5e279127a38ef410bcfac6d77c", "type": "github" }, "original": { @@ -85,13 +151,38 @@ "type": "github" } }, + "nix-cachyos-kernel": { + "inputs": { + "cachyos-kernel": "cachyos-kernel", + "cachyos-kernel-patches": "cachyos-kernel-patches", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1768153598, + "narHash": "sha256-ub5LZmQ6LEaV7k2pTlFXNc7BZj/rUooSR4hpUp3snYw=", + "owner": "xddxdd", + "repo": "nix-cachyos-kernel", + "rev": "8f448feca5af93c79fdd2187af392f692192b2f3", + "type": "github" + }, + "original": { + "owner": "xddxdd", + "ref": "release", + "repo": "nix-cachyos-kernel", + "type": "github" + } + }, "nixos-hardware": { "locked": { - "lastModified": 1764440730, - "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", + "lastModified": 1767185284, + "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", + "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe", "type": "github" }, "original": { @@ -117,13 +208,28 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1765674936, + "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs_2": { "locked": { - "lastModified": 1764494334, - "narHash": "sha256-x2xCEXUlU4Ap56+t5HaoReOQ/bV/bIQ5rzTn/m+V3HQ=", + "lastModified": 1768028080, + "narHash": "sha256-50aDK+8eLvsLK39TzQhKNq50/HcXyP4hyxOYoPoVxjo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d542db745310b6929708d9abea513f3ff19b1341", + "rev": "d03088749a110d52a4739348f39a63f84bb0be14", "type": "github" }, "original": { @@ -137,6 +243,7 @@ "inputs": { "agenix": "agenix", "home-manager": "home-manager_2", + "nix-cachyos-kernel": "nix-cachyos-kernel", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2" } diff --git a/flake.nix b/flake.nix index 235e1c1..6df893b 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,8 @@ nixos-hardware.url = "github:nixos/nixos-hardware/master"; home-manager.url = "github:nix-community/home-manager/release-25.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; + nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release"; + nix-cachyos-kernel.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = @@ -16,11 +18,20 @@ nixos-hardware, home-manager, agenix, + nix-cachyos-kernel, }: { nixosConfigurations.desktop = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ + ( + { pkgs, ... }: + { + nixpkgs.overlays = [ + nix-cachyos-kernel.overlays.pinned + ]; + } + ) ./config/common.nix ./config/desktop.nix ./hosts/desktop/hardware.nix diff --git a/hosts/desktop/settings.nix b/hosts/desktop/settings.nix index eb6d2e7..607fcc6 100644 --- a/hosts/desktop/settings.nix +++ b/hosts/desktop/settings.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ config, pkgs, ... }: { @@ -43,15 +43,20 @@ powerManagement.finegrained = false; open = false; nvidiaSettings = true; - package = config.boot.kernelPackages.nvidiaPackages.stable; + package = config.boot.kernelPackages.nvidiaPackages.beta; }; - # this fixes the sleep/wake issue + # this fixes the sleep/wake issue FUCK NVIDIA systemd.services."systemd-suspend" = { serviceConfig = { Environment = ''"SYSTEMD_SLEEP_FREEZE_USER_SESSIONS=false"''; }; }; + # cachyos kernel + boot.kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest; + nix.settings.substituters = [ "https://attic.xuyh0120.win/lantian" ]; + nix.settings.trusted-public-keys = [ "lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc=" ]; + system.stateVersion = "24.11"; } diff --git a/hosts/server/settings.nix b/hosts/server/settings.nix index 2affe2e..325881b 100644 --- a/hosts/server/settings.nix +++ b/hosts/server/settings.nix @@ -11,8 +11,7 @@ age.identityPaths = [ "${config.users.users.admin.home}/.ssh/id_ed25519" ]; - - boot.loader.limine.biosDevice = "/dev/vda"; + #boot.loader.limine.biosDevice = "/dev/vda"; networking = { hostName = "nixos-server";