diff --git a/config/hosts/aspects/doloro-desktop/home.nix b/config/hosts/aspects/doloro-desktop/home.nix index 8bb6d9e..9f684c7 100644 --- a/config/hosts/aspects/doloro-desktop/home.nix +++ b/config/hosts/aspects/doloro-desktop/home.nix @@ -26,6 +26,7 @@ autostart = true; }) + modules.hytale-launcher # modules.helium ( { default = true; @@ -102,6 +103,9 @@ # gamescope android-studio blender + qbittorrent + mpv + krita # (tetrio-desktop.override { withTetrioPlus = true; }) # bottles # pi-coding-agent diff --git a/config/modules/ai/ai.nix b/config/modules/ai/ai.nix index 7b34ea9..6f6bd4a 100644 --- a/config/modules/ai/ai.nix +++ b/config/modules/ai/ai.nix @@ -33,6 +33,7 @@ }; programs.opencode = { enable = true; + extraPackages = with pkgs; [ rust-analyzer typescript-language-server @@ -48,9 +49,17 @@ ''; settings = { "lsp" = true; + plugin = [ + "@tarquinen/opencode-dcp@latest" + "@xberg-io/opencode-xberg" + "@xberg-io/opencode-crawlberg" + "@xberg-io/opencode-html-to-markdown" + "@xberg-io/opencode-liter-llm" + "@xberg-io/opencode-tree-sitter-language-pack" + ]; provider.litellm = { npm = "@ai-sdk/openai-compatible"; - name = "LiteLLM"; + name = "LiteLLM (scuggo)"; options = { baseURL = "https://9f5db439.fwds.scug.io/v1"; apiKey = "{env:SCUG_IO_API_KEY}"; @@ -66,8 +75,8 @@ output = 16384; }; cost = { - input = 0.0000002; - output = 0.0000006; + input = 0.00002; + output = 0.00006; }; provider = { api = "openai"; diff --git a/config/modules/ai/pi.nix b/config/modules/ai/pi.nix new file mode 100644 index 0000000..3455821 --- /dev/null +++ b/config/modules/ai/pi.nix @@ -0,0 +1,10 @@ +{ den, modules, ... }: +{ + modules.pi-coding = { + homeManager = { + programs.pi-coding-agent = { + enable = true; + }; + }; + }; +} diff --git a/config/modules/hytale-launcher.nix b/config/modules/hytale-launcher.nix new file mode 100644 index 0000000..8eea324 --- /dev/null +++ b/config/modules/hytale-launcher.nix @@ -0,0 +1,20 @@ +{ + den, + modules, + inputs, + ... +}: +{ + flake-file.inputs = { + hytale-launcher.url = "github:JPyke3/hytale-launcher-nix"; + }; + modules.hytale-launcher = { + homeManager = + { pkgs, ... }: + { + home.packages = [ + inputs.hytale-launcher.packages.${pkgs.system}.default + ]; + }; + }; +} diff --git a/config/modules/spicetify.nix b/config/modules/spicetify.nix index 78118ff..4783e5e 100644 --- a/config/modules/spicetify.nix +++ b/config/modules/spicetify.nix @@ -23,7 +23,7 @@ enable = true; enabledExtensions = with spicePkgs.extensions; [ adblockify - # hidePodcasts + hidePodcasts shuffle # shuffle+ (special characters are sanitized out of extension names) ]; theme = spicePkgs.themes.onepunch; diff --git a/flake.lock b/flake.lock index 19b6f62..d29beca 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1782073106, - "narHash": "sha256-dnS5SaZlPqR1E0dPXaPc+lFkBwLUbAgbwsVMk7uA6dY=", + "lastModified": 1784368054, + "narHash": "sha256-zF1iJkBQSDWmRO4/LEeHR1SpKY0lqZaxkoQJpPS9K9U=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "6d6e2384f381def4ea4ea81543cba4bbdac72457", + "rev": "9b5f14d9483445e766294eb8fbe0b8f370269ed0", "type": "github" }, "original": { @@ -284,11 +284,11 @@ }, "flake-file": { "locked": { - "lastModified": 1781217157, - "narHash": "sha256-N3q/SP2Ropk336e9KSgLh7kpROY6P70dprYdbPIfd5c=", + "lastModified": 1784255282, + "narHash": "sha256-srM+PTqxfyvbQ0BevsOtP8vQv/Ox6OMtY4DktoDxLKg=", "owner": "vic", "repo": "flake-file", - "rev": "ce63eaf7ebfe04a176653f66385a7f0a36380cee", + "rev": "66ddd2f69a5c4677f0095c6f70eea1217dc45749", "type": "github" }, "original": { @@ -476,11 +476,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1783756748, - "narHash": "sha256-hB8uUHBDsaZafd19ilbNVntTzaF7Sr2zGQDDb1tk8pE=", + "lastModified": 1784431410, + "narHash": "sha256-G671MLe+jUgQWte0S182mDB8vlxfbyY9hH88N5ZjLXU=", "owner": "vikingnope", "repo": "helium-browser-nix-flake", - "rev": "2efc1e5eaabb81ffcbd66ded45a18bf3aa1c21c5", + "rev": "52e6bfd6e6b5eaab2e96095f7d936e5bf6a72f24", "type": "github" }, "original": { @@ -496,11 +496,11 @@ ] }, "locked": { - "lastModified": 1784129366, - "narHash": "sha256-N5JiyICSeQF14x+OQebNyPpYowOT9Rs1iKyeCylSzOA=", + "lastModified": 1784546264, + "narHash": "sha256-jxVr5EHMYAOkFvS2k0abIvt6NqyshyWmiHHzV17sT2g=", "owner": "nix-community", "repo": "home-manager", - "rev": "165228b0efefc3e635e5174020c40ea64271dc25", + "rev": "e3dea8e4792b09a6c0eb5836b0284ad05b1acba0", "type": "github" }, "original": { @@ -584,11 +584,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1784118734, - "narHash": "sha256-sWiTb0IOA1MoLYfUIvGlG4Ahyu9gbtiOiCa3xz7HaRc=", + "lastModified": 1784574265, + "narHash": "sha256-3YP21xUS7i/FOZRNh3SqXAw7Icw8biu3BWN+YWqLMkI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "d7fc7240f4efd0abac1c1f23f09b78b30b4e0782", + "rev": "2174f26a142d32823ceb8d7039e39eef52dbd050", "type": "github" }, "original": { @@ -630,11 +630,11 @@ ] }, "locked": { - "lastModified": 1782563850, - "narHash": "sha256-rs/EzgrgPHbCtJjFZN4aR1HYldH/0NtGAempWVpWQTs=", + "lastModified": 1784196523, + "narHash": "sha256-ahtKMGXFJdlQNhatQm1+BBU/pGfGYnAqQt3vWvq4p8s=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "5ba080ee036c30cb2485f2647ff8a61f7aa08178", + "rev": "a6ccb6cb112ed5a244c0191fb972347ecfa893e0", "type": "github" }, "original": { @@ -761,11 +761,11 @@ ] }, "locked": { - "lastModified": 1783002634, - "narHash": "sha256-xGqHIUK0wIZoW7SiMalwvO6uGOO/VrlQwoRobpE7dDI=", + "lastModified": 1784323413, + "narHash": "sha256-XnAVV+H4f8Xdv0yZcSwJ5kCjLyE8fHxPeLX6a3HSrAU=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "41fb809557abd29a57151b6e1aaeabd05f9437e1", + "rev": "5f03477ab3a005ff27c527486f551883535aea2f", "type": "github" }, "original": { @@ -828,13 +828,31 @@ "type": "github" } }, + "hytale-launcher": { + "inputs": { + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1784109236, + "narHash": "sha256-2scKSCd++nRhdi4WhPw7h8HqYraM1wvR/SvT+rBBV90=", + "owner": "JPyke3", + "repo": "hytale-launcher-nix", + "rev": "1e3c190d0297fb0c28fee17a7204d41f4416f84e", + "type": "github" + }, + "original": { + "owner": "JPyke3", + "repo": "hytale-launcher-nix", + "type": "github" + } + }, "import-tree": { "locked": { - "lastModified": 1778781969, - "narHash": "sha256-Jjuz5CmSkur8KvLDoGa+vylEp+RkQtv4mt/qcMznpH0=", + "lastModified": 1784254960, + "narHash": "sha256-iI88R3wHz8wTKQb5orvpc51L/Xr64AJyxid/0MKa/b8=", "owner": "vic", "repo": "import-tree", - "rev": "d321337efd0f23a9eb14a42adb7b2c29313ab274", + "rev": "4ebb10ae17d5f1ad366e7aef5b92cb8eecf24f69", "type": "github" }, "original": { @@ -880,18 +898,21 @@ "nik-pkgs": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_5" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1783961683, - "narHash": "sha256-0kq8kOvmPKE9BfWJNpA0wn1QSKa42TWoexoUMzQ2zyo=", - "ref": "refs/heads/main", - "rev": "756a4a0507cc147f210c3d299b02269ebd297df8", - "revCount": 78, + "lastModified": 1784576541, + "narHash": "sha256-rYziS/48KX8dhQtoLwUJxbMQb7rDiRm27zaxE72rhWw=", + "ref": "main", + "rev": "10568239ced64ba5d249f4c85f1c9f7dda81d137", + "revCount": 79, "type": "git", "url": "https://git.scug.io/nikkuss/pkgs.git" }, "original": { + "ref": "main", "type": "git", "url": "https://git.scug.io/nikkuss/pkgs.git" } @@ -908,11 +929,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1784043058, - "narHash": "sha256-/LXa/IHpH6zqcxrfhtUaZOPZHfk0WXi5YUTICaslMCI=", + "lastModified": 1784541752, + "narHash": "sha256-iONvlcXqaIUzEwZHabWLMtE90kqH3/iBmg5lQHZ1StY=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "24728b7da2cde86eb119a771c16b214f0751f91e", + "rev": "85a12e471a13eff3a3c476783a5d1cb0702c9da9", "type": "github" }, "original": { @@ -941,11 +962,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1783522755, - "narHash": "sha256-dI0HkX1djETia7cD/Y64h8BNIsSOfTRMzfNum2J6UhE=", + "lastModified": 1784456420, + "narHash": "sha256-38yvDuO09V/GG19oJO+B5nn38NhvvZEWKRGFE4WPUi4=", "owner": "YaLTeR", "repo": "niri", - "rev": "0777769e719b7c9b7c980d4ea66288bfbb4da5b3", + "rev": "f036de655d309edc13fef545a3809330796cbe83", "type": "github" }, "original": { @@ -998,11 +1019,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1784100666, - "narHash": "sha256-HF/mrw5NYQfKFZgkfV2h1UL5/E3ccfsE2XJ1AbbLLJ0=", + "lastModified": 1784310968, + "narHash": "sha256-rkSPTePrKqs4dg+i7ZFCq93+HrClac6oSwXX927SVjA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "fccfa9031a85b78a437f2f153c1f6449f3bc3185", + "rev": "779c32a00155994c86cde8213a8dd4df139d4355", "type": "github" }, "original": { @@ -1097,11 +1118,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1783707519, - "narHash": "sha256-VJ+eK/EB7aIZ246bXjkYalr4YWQAtHRJeh15Qw2LxUs=", + "lastModified": 1784255083, + "narHash": "sha256-0Jz8G3+3g6i/l4aISUri0EidLnREelCff0m6+pE6aZg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2b35450a66cf6ee8492099a6eb1903796965d32d", + "rev": "fc51889f81924f15fba77a3c0b79cfb3f78fe0d4", "type": "github" }, "original": { @@ -1144,11 +1165,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1784007870, - "narHash": "sha256-djcLt/JJphyNt4eDY9XTly+/WbCK5lqWq9lSgCmJkkQ=", + "lastModified": 1784497964, + "narHash": "sha256-vlHUuqAcbcH2RKmHbPiuQzbv1pnzzavXnI62RD0bqCU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "18b9261cb3294b6d2a06d03f96872827b8fe2698", + "rev": "241313f4e8e508cb9b13278c2b0fa25b9ca27163", "type": "github" }, "original": { @@ -1159,22 +1180,6 @@ } }, "nixpkgs_11": { - "locked": { - "lastModified": 1783915482, - "narHash": "sha256-FmieJB8/OUvNxbkboi7+IGfIuSXY3nF/hZQm8kD0r50=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6cdc7fc76e8bf7fde9fa43a849fcaaa70e230dee", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_12": { "locked": { "lastModified": 1774709303, "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", @@ -1190,7 +1195,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1745279238, "narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=", @@ -1206,13 +1211,13 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { - "lastModified": 1783776592, - "narHash": "sha256-+GVwKnbbSmf4cWMJyRzvw8H5yFknmkLoPD5v6snqPzo=", - "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", + "lastModified": 1784356753, + "narHash": "sha256-zupdTm41be2fY8cexroEOGjopl3F2Gqs3gk7ieqaM3s=", + "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1032869.e7a3ca8092b6/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1036777.61b7c44c4073/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -1250,11 +1255,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1783522502, - "narHash": "sha256-iffAls3iaNTyJC2faYcUXSI+Gp02cDjYl+MygxKl2GI=", + "lastModified": 1784356753, + "narHash": "sha256-12KrbMiWLcf8m7pCvAtZh1ZrgF85ZXDXvfR/fWTKy84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0bb7ec54c8483066ec9d7720e780a5caa71f8612", + "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a", "type": "github" }, "original": { @@ -1266,16 +1271,16 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1780011192, - "narHash": "sha256-luHrZG6I7Mwdt413XoDOYBpp9z1z6X23/5SNktwjM+k=", + "lastModified": 1783224372, + "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3242faf14b7611a62ce0f0071619438a08b65c12", + "rev": "d407951447dcd00442e97087bf374aad70c04cea", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable-small", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -1344,7 +1349,9 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_11", + "nixpkgs": [ + "nixpkgs" + ], "systems": "systems_4" }, "locked": { @@ -1388,14 +1395,14 @@ }, "omp-nix": { "inputs": { - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1784070589, - "narHash": "sha256-Tc2LeJ4iJP6xNfQWktpnQuwmeyB8LJ7LAQgZTpfg/Ug=", + "lastModified": 1784415854, + "narHash": "sha256-PShHg/pFS4owK770E5HLOEViJNWl51hcEPNUO7edk2w=", "ref": "main", - "rev": "8fb30f49c2f326dde2fb3d1e5dbb75fe3918cbad", - "revCount": 268, + "rev": "93a71a0ab703bfb44bef2645a45dba120560877c", + "revCount": 286, "type": "git", "url": "https://git.molez.org/mandlm/omp-nix" }, @@ -1414,11 +1421,11 @@ ] }, "locked": { - "lastModified": 1783008725, - "narHash": "sha256-jGiy6+sxjNWXSjp25uoJuNfyH9zBK1PEDY0lVoL4ibQ=", + "lastModified": 1784288435, + "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "bca82caa46d5ec0f5d422c61fb1e30bc51313cbe", + "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9", "type": "github" }, "original": { @@ -1431,7 +1438,7 @@ "inputs": { "libcamera-src": "libcamera-src", "libpisp-src": "libpisp-src", - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_12", "rpi-bluez-firmware-src": "rpi-bluez-firmware-src", "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src", "rpi-firmware-src": "rpi-firmware-src", @@ -1463,6 +1470,7 @@ "heliumFlake": "heliumFlake", "home-manager": "home-manager", "hyprland": "hyprland", + "hytale-launcher": "hytale-launcher", "import-tree": "import-tree", "nik-pkgs": "nik-pkgs", "niri-flake": "niri-flake", @@ -1589,15 +1597,15 @@ }, "spicetify-nix": { "inputs": { - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_13", "systems": "systems_5" }, "locked": { - "lastModified": 1783838433, - "narHash": "sha256-Zb8+v76qSPYDlUea1y30YzgdEoDjA97vRmeqfPAqwZs=", + "lastModified": 1784481035, + "narHash": "sha256-nC0QN+GPTnA5i+WBx8S2rG8+VFh+EeBnEe5mU3hlAcQ=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "c6ab7371e40abd405313af9bddafd5f37cc94f83", + "rev": "a6baa7464f9b21a106dcfabb0bdcfe96fb434409", "type": "github" }, "original": { @@ -1876,11 +1884,11 @@ ] }, "locked": { - "lastModified": 1782644412, - "narHash": "sha256-/iSa/bL1QQFLv+uJ9gI0N87J8gOeZXvca7EjoPGKE6w=", + "lastModified": 1784371182, + "narHash": "sha256-S8A1lezEalltWcCp3gAic5lssS0xTSISK6fKODefhOk=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "c01c99fc278ec68c82e9865923088f043c7c1621", + "rev": "08d99f727944dd15e4740090305e31c5fb92a50a", "type": "github" }, "original": { @@ -1929,11 +1937,11 @@ ] }, "locked": { - "lastModified": 1783668749, - "narHash": "sha256-EDJjJYGT5pQKTBqmz+OA2sqE20kjj6mP699JFGDzse4=", + "lastModified": 1784354557, + "narHash": "sha256-z2XthIV/68GNghbqmaPVrShPIfMPwpZKTA47REKC5bA=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "e8041a3571e8cadb57dc18a3d6362d753510b94a", + "rev": "239dc504b56eabcfc1dce945e7e22ca99694be89", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0874f08..3f55a10 100644 --- a/flake.nix +++ b/flake.nix @@ -21,8 +21,12 @@ inputs.nixpkgs.follows = "nixpkgs"; }; hyprland.url = "github:hyprwm/Hyprland"; + hytale-launcher.url = "github:JPyke3/hytale-launcher-nix"; import-tree.url = "github:vic/import-tree"; - nik-pkgs.url = "git+https://git.scug.io/nikkuss/pkgs.git"; + nik-pkgs = { + url = "git+https://git.scug.io/nikkuss/pkgs.git?ref=main"; + inputs.nixpkgs.follows = "nixpkgs"; + }; niri-flake = { url = "github:sodiboo/niri-flake"; inputs.nixpkgs.follows = "nixpkgs"; @@ -33,7 +37,10 @@ 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"; + nixvim = { + url = "github:nix-community/nixvim"; + inputs.nixpkgs.follows = "nixpkgs"; + }; omp-nix.url = "git+https://git.molez.org/mandlm/omp-nix?ref=main"; raspberry-pi-nix.url = "github:cmyk/raspberry-pi-nix"; sops-nix = {