diff --git a/config/hosts/aspects/doloro-desktop/home.nix b/config/hosts/aspects/doloro-desktop/home.nix index 8e131c1..0e01fc0 100644 --- a/config/hosts/aspects/doloro-desktop/home.nix +++ b/config/hosts/aspects/doloro-desktop/home.nix @@ -12,6 +12,7 @@ den.aspects.doloro-shared modules.sops modules.flatpaks + modules.gamemode modules.hyprland modules.fish modules.tuigreet @@ -35,7 +36,7 @@ modules.nix-ld modules.spotify # modules.easyeffects - modules.lavd + # modules.lavd modules.ai # modules.omp modules.podman @@ -91,7 +92,7 @@ prismlauncher # deadlock-mod-manager inputs.nik-pkgs.packages.x86_64-linux.grimorie - gamescope + # gamescope android-studio blender bottles diff --git a/config/hosts/aspects/doloro-desktop/host.nix b/config/hosts/aspects/doloro-desktop/host.nix index 83b556c..2b60d9a 100644 --- a/config/hosts/aspects/doloro-desktop/host.nix +++ b/config/hosts/aspects/doloro-desktop/host.nix @@ -98,6 +98,14 @@ boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; + services.scx = { + enable = true; + package = pkgs.scx.rustscheds; + }; + systemd.services.scx.environment = { + SCX_SCHEDULER_OVERRIDE = "scx_lavd"; + SCX_FLAGS_OVERRIDE = "--performance --no-core-compaction"; + }; }; }; } diff --git a/config/modules/gaming/gamemode.nix b/config/modules/gaming/gamemode.nix new file mode 100644 index 0000000..8d2d302 --- /dev/null +++ b/config/modules/gaming/gamemode.nix @@ -0,0 +1,40 @@ +{ modules, ... }: +{ + modules.gamemode = { + homeManager = + { home, ... }: + { + + }; + nixos = + { nixos, ... }: + { + programs.gamemode = { + enable = true; + enableRenice = true; + settings = { + general = { + renice = 10; + ioprio = 0; + inhibit_screensaver = 1; + disable_splitlock = 1; + }; + cpu = { + park_cores = "no"; + pin_cores = "yes"; + }; + gpu = { + apply_gpu_optimisations = "accept-responsibility"; + gpu_device = 1; + nv_powermizer_mode = 1; + nv_perf_level = -1; + }; + script = { + gamestart = "nvidia-smi --power-limit=175"; + gamestop = "nvidia-smi --power-limit=125"; + }; + }; + }; + }; + }; +} diff --git a/config/modules/gaming/steam.nix b/config/modules/gaming/steam.nix index d7dc854..32357b8 100644 --- a/config/modules/gaming/steam.nix +++ b/config/modules/gaming/steam.nix @@ -4,6 +4,18 @@ nixos = { pkgs, ... }: { + programs.gamescope = { + enable = true; + package = ( + pkgs.gamescope.overrideAttrs { + enableWsi = true; + # Fixes some games being blurry under wayland backend + NIX_CFLAGS_COMPILE = [ "-fno-fast-math" ]; + } + ); + # Breaks steam launching gamescope + # capSysNice = true; + }; programs.steam = { enable = true; remotePlay.openFirewall = true; @@ -26,13 +38,8 @@ libkrb5 keyutils mangohud - gamemode + # gamemode lsof - (gamescope.overrideAttrs { - enableWsi = true; - # Fixes some games being blurry under wayland backend - NIX_CFLAGS_COMPILE = [ "-fno-fast-math" ]; - }) ]; }; }; diff --git a/config/modules/nixvim/default.nix b/config/modules/nixvim/default.nix index 86e481b..41e3fea 100644 --- a/config/modules/nixvim/default.nix +++ b/config/modules/nixvim/default.nix @@ -10,7 +10,7 @@ flake-file.inputs = { nixvim = { url = "github:nix-community/nixvim"; - inputs.nixpkgs.follows = "nixpkgs"; + # inputs.nixpkgs.follows = "nixpkgs"; }; }; modules = { @@ -22,6 +22,13 @@ homeManager = { pkgs, ... }: let + # REPLACE THIS ONCE ITS FIXED IN UPSTREAM + cssLsFixed = pkgs.vscode-langservers-extracted.overrideAttrs (old: { + postInstall = (old.postInstall or "") + '' + sed -i 's/import\.meta\.url/"file:\/\/"+__filename/g' \ + $out/lib/node_modules/vscode-langservers-extracted/lib/css-language-server/node/cssServerMain.js + ''; + }); tiny-code-action = pkgs.vimUtils.buildVimPlugin { name = "tiny-code-action.nvim"; src = pkgs.fetchFromGitHub { @@ -44,6 +51,7 @@ config = { allowUnfree = true; }; + # source = pkgs; }; colorschemes.gruvbox-material.enable = true; # colorschemes.melange = { @@ -138,7 +146,10 @@ ts_ls = { enable = true; }; - cssls.enable = true; + cssls = { + enable = true; + package = cssLsFixed; + }; svelte.enable = true; }; }; diff --git a/config/modules/power-management/lavd.nix b/config/modules/power-management/lavd.nix index 71f5585..d92d90e 100644 --- a/config/modules/power-management/lavd.nix +++ b/config/modules/power-management/lavd.nix @@ -18,7 +18,7 @@ # Most energy efficent scheduler setup.. systemd.services.scx.environment = { SCX_SCHEDULER_OVERRIDE = "scx_lavd"; - SCX_FLAGS_OVERRIDE = "--powersave --cpu-pref-order=0-4,5-11"; + SCX_FLAGS_OVERRIDE = "--powersave --no-core-compaction"; }; }; }; diff --git a/flake.lock b/flake.lock index a1f29f7..738a7e8 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1781455283, - "narHash": "sha256-/71qSmWc0vIyGsvtADG8/uHnC/NvXPEY6TXRoDMufeo=", + "lastModified": 1781883168, + "narHash": "sha256-raAojJGk0aWdscfFn/9ikZ6V5oUuAZcAz5kjAZ2QN3E=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "3bd5b77999c4180ed01bdd0669bfabc5171b090a", + "rev": "daed450e9b1a4fadfef68fb4fa5e2f3391fedb34", "type": "github" }, "original": { @@ -136,11 +136,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1781257359, - "narHash": "sha256-J2/PBS+5u6osnWZUB7UTjLaD+S8diM+6hlOWDoX/+bw=", + "lastModified": 1781953785, + "narHash": "sha256-YgEE1a5QdKd47AfRoU5G8nm0gGzeCuPN2emupNDMQcc=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "46b45d26b536195f3ee8bc510b96b7fa47567163", + "rev": "e8e9d325eea25f5664e045787c19baac661828de", "type": "github" }, "original": { @@ -172,11 +172,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1781161664, - "narHash": "sha256-pALZH5SItoXJChOILlncSDlevnrxwaQrCmNVGrcn8ME=", + "lastModified": 1781766454, + "narHash": "sha256-f4yQVdfmgflkqah/bSzgamaZPajl73TQYpvkWptujko=", "owner": "Mic92", "repo": "direnv-instant", - "rev": "57f5385e4c3df324201079553a98dd8e36c83858", + "rev": "0dcf752d9476f7f8b75a9e94a43ca376f0716be4", "type": "github" }, "original": { @@ -497,11 +497,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1781324208, - "narHash": "sha256-bygOOsF1MFbhpl420ja6Md5bGIyRIJ2/UDS2nqEX1eA=", + "lastModified": 1781798188, + "narHash": "sha256-OLv+WvKNVX1aOgDYa94MecwQAH7VEv+s1htqVsaYeug=", "owner": "vikingnope", "repo": "helium-browser-nix-flake", - "rev": "87c5dbbabd13547db8e14937c77bd3abce315d56", + "rev": "715cacbdf9f719cfe562675783efd86102b948d5", "type": "github" }, "original": { @@ -517,11 +517,11 @@ ] }, "locked": { - "lastModified": 1781615165, - "narHash": "sha256-CFF4fNNfr2GZSx1xJhBNBi7VMj8OtOqZGOV+fiBSbzw=", + "lastModified": 1782159472, + "narHash": "sha256-S+/v+BWz9c8IbGhRM8L4UUVC5j2oZuAHj1b5XlkBjyw=", "owner": "nix-community", "repo": "home-manager", - "rev": "34dd288e65012954cf7170658e0e6a61255b0327", + "rev": "351959fcdbe5cadec1c3434d7abd14dff31af2d5", "type": "github" }, "original": { @@ -605,11 +605,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1781551294, - "narHash": "sha256-6cHkPGrQmd8RI/YdEgHmY3ebnPHHq07DxOxST70jYhI=", + "lastModified": 1782070887, + "narHash": "sha256-rwKRD8h3bxVebEDNyoaPh+q0dqdqvrAE8+1T4Jo3xxs=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "88262e1f860adc56f528ef68b2909ee33a27186b", + "rev": "5a7078d20a14bb199ef9bb81faa4faeaf5e92117", "type": "github" }, "original": { @@ -929,11 +929,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1781610921, - "narHash": "sha256-PXyfDFGyW+UYteu3uHJgp49sFHRU16iocf5K2ltqn3M=", + "lastModified": 1781795508, + "narHash": "sha256-VKrApQ3WCkEe9D8DbaeFjGqLAh7zqYGYjbQYtY5ikxc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "e5857dc58304b3d5bbac6340820f7d4450688538", + "rev": "493ce1e33e72f86312584f331c8cf52b3432ec99", "type": "github" }, "original": { @@ -962,11 +962,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1781588278, - "narHash": "sha256-Fw/Zo0hwgn9ulgY5duQy51WHtqpNoLjNDZYLdEI1SS4=", + "lastModified": 1781781064, + "narHash": "sha256-Ii/koEm/sRyg65qbAQWqEgboSEIhdH0EL4KglAc14p0=", "owner": "YaLTeR", "repo": "niri", - "rev": "fdb6d85fc78355762bcf3cf71fe4037681a766f9", + "rev": "49fc6117fd6c043adaa2ead316b82db5ed735d36", "type": "github" }, "original": { @@ -984,11 +984,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1781463250, - "narHash": "sha256-gYE/0gtSedmA21UWRZ2DA+iXhySh1JGKOssuqejV7cQ=", + "lastModified": 1782068713, + "narHash": "sha256-Vujeg1QyOCnEMCNV1U7aFDllD0w2lEl8c0uJyKM+cOI=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "4039d20f1495f2c521e7d12723a0c45348b118e8", + "rev": "756ed060ca6adcdf3e65371e3725b89c58a1354d", "type": "github" }, "original": { @@ -1019,11 +1019,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1781168557, - "narHash": "sha256-LOnLQ2tpYF9gqIDDr3+j3DbpJJr/QCH6zPRT2GzEUOE=", + "lastModified": 1781622756, + "narHash": "sha256-JrPh4M6S7aPsEE9tOENuZrxC6o2szSLlK+t4+nLke9s=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6358ff76821101c178e3ab4919a62799bfe3652e", + "rev": "08018c72174a4df5657f8d94178ac69fb9c243e5", "type": "github" }, "original": { @@ -1102,11 +1102,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1780749050, - "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=", + "lastModified": 1781577229, + "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", "type": "github" }, "original": { @@ -1149,11 +1149,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1781074563, - "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=", + "lastModified": 1781577229, + "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", "type": "github" }, "original": { @@ -1164,6 +1164,22 @@ } }, "nixpkgs_11": { + "locked": { + "lastModified": 1781607440, + "narHash": "sha256-rxO+uc/KFbSJp+pgyXRuAX6QlG9hJdnt0BXpEQRXY+U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3e41b24abd260e8f71dbe2f5737d24122f972158", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_12": { "locked": { "lastModified": 1774709303, "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", @@ -1179,7 +1195,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1745279238, "narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=", @@ -1195,13 +1211,13 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_14": { "locked": { - "lastModified": 1781074563, - "narHash": "sha256-d34lhgOet4IqYMnCxbIvwFBMOyTV6PT4TyNEOP0/ZhU=", - "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca", + "lastModified": 1781577229, + "narHash": "sha256-rcUHdUtJEvMdNEl2Wq+YpHraHKfcer3KsBscpZEF2Yg=", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1014179.9ae611a455b9/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1017464.567a49d1913c/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -1271,11 +1287,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1781421111, - "narHash": "sha256-2xSTHlKBF5h/tgAeHyQPR/g48qk9ACz7dED3jc3pGKA=", + "lastModified": 1782014548, + "narHash": "sha256-zYKx9xcbPvk4zOzkny3w2/AkuKhJqGwRD+piA3urkx8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7fe8f446d9475534dc54591ccb5c87c1ce6eaf8b", + "rev": "72349305fb839e27697873de7a4ce3a98c378f48", "type": "github" }, "original": { @@ -1333,17 +1349,15 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts_4", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_11", "systems": "systems_4" }, "locked": { - "lastModified": 1781713417, - "narHash": "sha256-Kaj44jTNmnaFhKrcADx8nXmUYPa7l2HYfb7m6lEPy7Q=", + "lastModified": 1782145918, + "narHash": "sha256-xYx+9aM7JzFSy7F5xCnbMgDlzjRFxoXbRl+eL4rcfMQ=", "owner": "nix-community", "repo": "nixvim", - "rev": "caee4e5d4161778815f522d9ea1c9e3dc42462b7", + "rev": "7f813fc7a6a2f92103208a69a98d6afa24f5bb23", "type": "github" }, "original": { @@ -1379,7 +1393,7 @@ }, "omp-nix": { "inputs": { - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1781618766, @@ -1423,7 +1437,7 @@ "inputs": { "libcamera-src": "libcamera-src", "libpisp-src": "libpisp-src", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_13", "rpi-bluez-firmware-src": "rpi-bluez-firmware-src", "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src", "rpi-firmware-src": "rpi-firmware-src", @@ -1566,11 +1580,11 @@ ] }, "locked": { - "lastModified": 1780547341, - "narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=", + "lastModified": 1781943681, + "narHash": "sha256-NFHmA7H47adqiyp+0iEOyZOQhmigDqA/NBAlf4imB6U=", "owner": "Mic92", "repo": "sops-nix", - "rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a", + "rev": "420f8d2e9882911f65cfac15cc706f639ba96cca", "type": "github" }, "original": { @@ -1581,15 +1595,15 @@ }, "spicetify-nix": { "inputs": { - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_14", "systems": "systems_5" }, "locked": { - "lastModified": 1781425310, - "narHash": "sha256-GTBka4Df/ZOacmisI/DI2LICyNChEqn/giah83LucdM=", + "lastModified": 1782031037, + "narHash": "sha256-a7oWSyS7SN81UOqVt481yIEMDsMpaJ7GNdV6Eaz5Yqg=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "aeaf7c81a45d3761da61cb05bfc370ac6d1b0441", + "rev": "9cb27462cfd20edac174353f1e95bc03aa888863", "type": "github" }, "original": { @@ -1618,11 +1632,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1781018772, - "narHash": "sha256-C+cGIUaC6dqfwTbI+BwCd572PbESGA3WYxR1sLTqxkY=", + "lastModified": 1781997134, + "narHash": "sha256-muBZG4O/agq/ljgHr6c3AsobIWgODAS6vf50xIS7o+Q=", "owner": "nix-community", "repo": "stylix", - "rev": "a378e4c09031fb15a4d65da88aa628f71fc52f6b", + "rev": "a6a493119e492e15874caf6f7f8c7e572e64c655", "type": "github" }, "original": { @@ -1827,11 +1841,11 @@ }, "x1e-kernel": { "locked": { - "lastModified": 1781581349, - "narHash": "sha256-KCKvmmFhLVrUQ10qUfPPam7nTvriMrlVPHeo2Ey0CO8=", + "lastModified": 1781643843, + "narHash": "sha256-Vpx5yF7Rw3YXADnlUINsBv8OzMSxpUfTpBtR5+x6qvs=", "ref": "refs/heads/main", - "rev": "30c7f18e474fe8b6584600946c1fe9f688def838", - "revCount": 7, + "rev": "c8afdbf71a964c64de9eddd586f1ccc8de5a3f9b", + "revCount": 8, "type": "git", "url": "https://git.scug.io/nikkuss/x1e-nixos.git" }, @@ -1921,11 +1935,11 @@ ] }, "locked": { - "lastModified": 1781415399, - "narHash": "sha256-t7l/1scSsVAlw1r/vjEIX+SquZa/z6ibcOLBuXdJH7E=", + "lastModified": 1781847955, + "narHash": "sha256-1OSYOGuJp/NoODmSHjsz+6TB/kSilJ+BsFihjY7TTnc=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "83ab3c3da2ba1a76a20882dbd253711d2cb8dcba", + "rev": "4bca251cd556677f7b765ff324d1638ae215be13", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a19e3a5..0874f08 100644 --- a/flake.nix +++ b/flake.nix @@ -33,10 +33,7 @@ nixos-raspberrypi.url = "github:nvmd/nixos-raspberrypi/main"; nixos-wsl.url = "github:nix-community/NixOS-WSL"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixvim = { - url = "github:nix-community/nixvim"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + nixvim.url = "github:nix-community/nixvim"; omp-nix.url = "git+https://git.molez.org/mandlm/omp-nix?ref=main"; raspberry-pi-nix.url = "github:cmyk/raspberry-pi-nix"; sops-nix = {