From cbbd94a130290459929316a602408d29814a4f35 Mon Sep 17 00:00:00 2001 From: 4DBug <4DBug@github.com> Date: Sat, 22 Aug 2026 21:46:30 -0500 Subject: [PATCH] push --- flake.lock | 172 ++++++++++++++++++++++---- flake.nix | 3 +- modules/core/desktop/niri.nix | 9 +- modules/hosts/styx.nix | 2 + modules/software/fish.nix | 2 + modules/software/{ => llm}/ollama.nix | 0 modules/software/llm/opencode.nix | 25 ++++ modules/users/bug.nix | 1 + 8 files changed, 184 insertions(+), 30 deletions(-) rename modules/software/{ => llm}/ollama.nix (100%) create mode 100644 modules/software/llm/opencode.nix diff --git a/flake.lock b/flake.lock index 7bdda2c..fee782c 100644 --- a/flake.lock +++ b/flake.lock @@ -727,11 +727,67 @@ "type": "github" } }, + "niri": { + "inputs": { + "niri-stable": "niri-stable", + "niri-unstable": "niri-unstable", + "nixpkgs": "nixpkgs_7", + "nixpkgs-stable": "nixpkgs-stable", + "xwayland-satellite-stable": "xwayland-satellite-stable", + "xwayland-satellite-unstable": "xwayland-satellite-unstable" + }, + "locked": { + "lastModified": 1785857305, + "narHash": "sha256-25q05zpF1sqOCxPPUG9DPPGd+EDW7SiAOWCzBWRS7r0=", + "owner": "sodiboo", + "repo": "niri-flake", + "rev": "9ee3e13b60643448228353097880521658b2fe0e", + "type": "github" + }, + "original": { + "owner": "sodiboo", + "repo": "niri-flake", + "type": "github" + } + }, + "niri-stable": { + "flake": false, + "locked": { + "lastModified": 1756556321, + "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "ref": "v25.08", + "repo": "niri", + "type": "github" + } + }, + "niri-unstable": { + "flake": false, + "locked": { + "lastModified": 1785701241, + "narHash": "sha256-ircVOzPWRircI39ac/tqJajr5OoJxEVrDlBb05TULEk=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "feb3e43f1475e0865bb89cbd1e898b34d1d2ccf6", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "repo": "niri", + "type": "github" + } + }, "nix-cachyos-kernel": { "inputs": { "flake-compat": "flake-compat", "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1785870829, @@ -754,7 +810,7 @@ "nix-gaming": [ "nix-gaming" ], - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -792,7 +848,7 @@ "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_4", "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1785898401, @@ -811,7 +867,7 @@ "nixcord": { "inputs": { "flake-parts": "flake-parts_5", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_11", "nixpkgs-nixcord": "nixpkgs-nixcord", "treefmt-nix": "treefmt-nix_2" }, @@ -834,7 +890,7 @@ "blobs": "blobs", "flake-compat": "flake-compat_4", "git-hooks": "git-hooks_2", - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1785702596, @@ -939,7 +995,39 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1782847189, + "narHash": "sha256-twXPFqFsrrY5r28Zh7Homgcp2gUMBgQ6WDS98Q/3xFI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b6018f87da91d19d0ab4cf979885689b469cdd41", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_10": { + "locked": { + "lastModified": 1785542685, + "narHash": "sha256-sjfvXMbG5pCFgpvw2OZAFcZiTvrppCWvnB6cuGrSY08=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f8e81fc7eb063db454f563cdd596fb96a5ad1497", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1785386831, "narHash": "sha256-sPS3CaXH8RAT3FZRuy4VcV47iuYIWMMfa0GbyJKC3o4=", @@ -955,7 +1043,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1785672624, "narHash": "sha256-TWz27RiQZf38j17BYGN/V4U2SQVtOE2pFc9u2cy3H3g=", @@ -971,7 +1059,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1785747939, "narHash": "sha256-D740uKsMbgsfK2oaDenJLLPIZfq7W0/g4KN/Fls8eKs=", @@ -1065,6 +1153,22 @@ } }, "nixpkgs_7": { + "locked": { + "lastModified": 1785828668, + "narHash": "sha256-8fsyqeO+mJqvIzeO4xIpgJe/f7MTbbVTEC6RT6WSXNs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e72e4f299401a3689d4b3d5fc6496b11db7064eb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { "locked": { "lastModified": 1785859399, "narHash": "sha256-pY4X50au95QrTpAbEm08pURmeU3/Ud2oa0s2XzpDdz8=", @@ -1080,7 +1184,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1784796856, "narHash": "sha256-wWFrV5/Qbm+lyt5x20E/bSbfJiGKMo4RCxZV8cl/WZI=", @@ -1096,22 +1200,6 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1785542685, - "narHash": "sha256-sjfvXMbG5pCFgpvw2OZAFcZiTvrppCWvnB6cuGrSY08=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f8e81fc7eb063db454f563cdd596fb96a5ad1497", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "inputs": { "flake-parts": [ @@ -1154,13 +1242,14 @@ "minecraft": "minecraft", "minecraft-metadata": "minecraft-metadata", "neu-nix": "neu-nix", + "niri": "niri", "nix-cachyos-kernel": "nix-cachyos-kernel", "nix-citizen": "nix-citizen", "nix-flatpak": "nix-flatpak", "nix-gaming": "nix-gaming", "nixcord": "nixcord", "nixos-mailserver": "nixos-mailserver", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_13", "nixpkgs-lib": [ "nixpkgs" ], @@ -1382,6 +1471,39 @@ "repo": "treefmt-nix", "type": "github" } + }, + "xwayland-satellite-stable": { + "flake": false, + "locked": { + "lastModified": 1755491097, + "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "388d291e82ffbc73be18169d39470f340707edaa", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "ref": "v0.7", + "repo": "xwayland-satellite", + "type": "github" + } + }, + "xwayland-satellite-unstable": { + "flake": false, + "locked": { + "lastModified": 1784679892, + "narHash": "sha256-Mb7jpqnrcYCfNSItIkkHpuR3YxWFxPuIBfcwNKlRBkk=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "8d135d3b2854b30fd01ea6cd6c27e523dd50a839", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 7328954..9e8e223 100644 --- a/flake.nix +++ b/flake.nix @@ -79,8 +79,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - wrappers.url = "github:Lassulus/wrappers"; - wrapper-modules.url = "github:BirdeeHub/nix-wrapper-modules"; + niri.url = "github:sodiboo/niri-flake"; nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; diff --git a/modules/core/desktop/niri.nix b/modules/core/desktop/niri.nix index b10b2d5..2094104 100644 --- a/modules/core/desktop/niri.nix +++ b/modules/core/desktop/niri.nix @@ -1,7 +1,10 @@ { inputs, ...}: { - den.aspects.nix7 = { - nixos = { pkgs, lib, ...}: { - packages.niri = inputs.wrapper-modules.wrappers.niri.wrap { + den.aspects.niri = { + homeManager = { pkgs, lib, ...}: { + imports = [ inputs.niri.nixosModules.niri ]; + + programs.niri = { + enable = true; settings = { input.keyboard = { xkb.layout = "us,ua"; diff --git a/modules/hosts/styx.nix b/modules/hosts/styx.nix index 3a5a6a8..3f89fbc 100644 --- a/modules/hosts/styx.nix +++ b/modules/hosts/styx.nix @@ -16,6 +16,8 @@ neu #nix7 + + #niri ]; nixos = { diff --git a/modules/software/fish.nix b/modules/software/fish.nix index 35bfc4d..0461e52 100644 --- a/modules/software/fish.nix +++ b/modules/software/fish.nix @@ -1,6 +1,8 @@ { den.aspects.fish = { nixos = { pkgs, ...}: { + environment.sessionVariables.SHELL = "${pkgs.fish}"; + programs.fish = { shellAliases = { fetch = "fastfetch --file ~/nix/nix.ans"; diff --git a/modules/software/ollama.nix b/modules/software/llm/ollama.nix similarity index 100% rename from modules/software/ollama.nix rename to modules/software/llm/ollama.nix diff --git a/modules/software/llm/opencode.nix b/modules/software/llm/opencode.nix new file mode 100644 index 0000000..d437f5e --- /dev/null +++ b/modules/software/llm/opencode.nix @@ -0,0 +1,25 @@ +{ pkgs, lib, ... }: + +let + opencode-json = pkgs.writeText "opencode.json" (builtins.toJSON { + "$schema" = "https://opencode.ai/config.json"; + plugin = [ "opencode-plugin-llama.cpp@latest" ]; + provider = { + llama.cpp = { + npm = "@ai-sdk/openai-compatible"; + name = "llama.cpp"; + options.baseURL = "https://llama.bug.tools/v1"; + models.qwen3.6-35b-a3b.name = "qwen3.6-35b-a3b"; + }; + }; + }); +in { + den.aspects.opencode = { + nixos = { ... }: { + # opencode config: ${opencode-json} + }; + home-manager = { ... }: { + home.file.".config/opencode/opencode.json".source = opencode-json; + }; + }; +} diff --git a/modules/users/bug.nix b/modules/users/bug.nix index cb99427..bdcdb2b 100644 --- a/modules/users/bug.nix +++ b/modules/users/bug.nix @@ -7,6 +7,7 @@ den.aspects.librewolf den.aspects.catppuccin #den.provides.home-manager + #den.aspects.niri ]; homeManager = {