From e33187bf0cc6d75ab873d552753a74927d44c8f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christopher=20M=C3=BChl?= Date: Fri, 6 Feb 2026 00:35:53 +0100 Subject: [PATCH] Some installs --- flake.lock | 413 ++++++++++++++++++++- flake.nix | 35 +- home/by-host/endurance/config/dev.nix | 5 + home/by-host/endurance/config/jujutsu.nix | 11 + home/by-host/endurance/misc/everything.nix | 14 +- 5 files changed, 436 insertions(+), 42 deletions(-) create mode 100644 home/by-host/endurance/config/jujutsu.nix diff --git a/flake.lock b/flake.lock index 11641bf..2a546bf 100644 --- a/flake.lock +++ b/flake.lock @@ -115,6 +115,33 @@ "type": "github" } }, + "buildbot-nix": { + "inputs": { + "flake-parts": "flake-parts_4", + "hercules-ci-effects": "hercules-ci-effects", + "nixpkgs": [ + "ngipkgs", + "nixpkgs" + ], + "treefmt-nix": [ + "ngipkgs", + "treefmt-nix" + ] + }, + "locked": { + "lastModified": 1769920146, + "narHash": "sha256-Co8wpqWe5SWzsx0Fy2Q7+tpnDlvHe+ksX+9Lis4NJFw=", + "owner": "nix-community", + "repo": "buildbot-nix", + "rev": "21a138e5230c23fb253559bea63ec0979156aff3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "buildbot-nix", + "type": "github" + } + }, "community-solid-server": { "inputs": { "flake-parts": "flake-parts_2", @@ -238,6 +265,29 @@ "type": "github" } }, + "dream2nix": { + "inputs": { + "nixpkgs": [ + "ngipkgs", + "nixpkgs" + ], + "purescript-overlay": "purescript-overlay", + "pyproject-nix": "pyproject-nix" + }, + "locked": { + "lastModified": 1765953015, + "narHash": "sha256-5FBZbbWR1Csp3Y2icfRkxMJw/a/5FGg8hCXej2//bbI=", + "owner": "nix-community", + "repo": "dream2nix", + "rev": "69eb01fa0995e1e90add49d8ca5bcba213b0416f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "dream2nix", + "type": "github" + } + }, "easy-hosts": { "locked": { "lastModified": 1755470564, @@ -301,6 +351,38 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { + "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": [ @@ -359,6 +441,28 @@ } }, "flake-parts_4": { + "inputs": { + "nixpkgs-lib": [ + "ngipkgs", + "buildbot-nix", + "nixpkgs" + ] + }, + "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" + } + }, + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "nur", @@ -379,7 +483,7 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_6": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -400,7 +504,7 @@ "type": "github" } }, - "flake-parts_6": { + "flake-parts_7": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_3" }, @@ -436,6 +540,27 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": [ + "ngipkgs", + "systems" + ] + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flatpak": { "locked": { "lastModified": 1739444422, @@ -509,6 +634,28 @@ "type": "github" } }, + "gitignore_2": { + "inputs": { + "nixpkgs": [ + "ngipkgs", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "gnome-shell": { "flake": false, "locked": { @@ -528,6 +675,33 @@ "type": "gitlab" } }, + "hercules-ci-effects": { + "inputs": { + "flake-parts": [ + "ngipkgs", + "buildbot-nix", + "flake-parts" + ], + "nixpkgs": [ + "ngipkgs", + "buildbot-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1768476106, + "narHash": "sha256-V0YOJRum50gtKgwavsAfwXc9+XAsJCC7386YZx1sWGQ=", + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "rev": "c19e263e6e22ec7379d972f19e6a322f943c73fb", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -603,6 +777,36 @@ "type": "github" } }, + "ngipkgs": { + "inputs": { + "buildbot-nix": "buildbot-nix", + "dream2nix": "dream2nix", + "flake-utils": "flake-utils_2", + "nixdoc-to-github": "nixdoc-to-github", + "nixpkgs": [ + "nixpkgs" + ], + "pre-commit-hooks": "pre-commit-hooks_2", + "sbt-derivation": "sbt-derivation", + "sops-nix": "sops-nix", + "systems": "systems_4", + "treefmt-nix": "treefmt-nix_2" + }, + "locked": { + "lastModified": 1769442174, + "narHash": "sha256-J0DqkOiV4DhFL9NHSNY5Qu794dMYRVm+estBM54ojXM=", + "owner": "ngi-nix", + "repo": "ngipkgs", + "rev": "672c78f6c140b480ca37cd04a4ee250fb00b1b7d", + "type": "github" + }, + "original": { + "owner": "ngi-nix", + "repo": "ngipkgs", + "rev": "672c78f6c140b480ca37cd04a4ee250fb00b1b7d", + "type": "github" + } + }, "niri": { "inputs": { "niri-stable": "niri-stable", @@ -659,6 +863,22 @@ "type": "github" } }, + "nixdoc-to-github": { + "flake": false, + "locked": { + "lastModified": 1717409038, + "narHash": "sha256-P4ZfOrlnRPNiZwiQn2pY44nPfk9cqI7FxOVaTnZwDCI=", + "owner": "fricklerhandwerk", + "repo": "nixdoc-to-github", + "rev": "47054a3b3a0f072ecd0402de3911d0979d09a7ab", + "type": "github" + }, + "original": { + "owner": "fricklerhandwerk", + "repo": "nixdoc-to-github", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1767051569, @@ -838,7 +1058,7 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_5", "nixpkgs": [ "nixpkgs" ] @@ -905,6 +1125,75 @@ "type": "github" } }, + "pre-commit-hooks_2": { + "inputs": { + "flake-compat": "flake-compat_4", + "gitignore": "gitignore_2", + "nixpkgs": [ + "ngipkgs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1769939035, + "narHash": "sha256-Fok2AmefgVA0+eprw2NDwqKkPGEI5wvR+twiZagBvrg=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "a8ca480175326551d6c4121498316261cbb5b260", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "purescript-overlay": { + "inputs": { + "flake-compat": "flake-compat_3", + "nixpkgs": [ + "ngipkgs", + "dream2nix", + "nixpkgs" + ], + "slimlock": "slimlock" + }, + "locked": { + "lastModified": 1728546539, + "narHash": "sha256-Sws7w0tlnjD+Bjck1nv29NjC5DbL6nH5auL9Ex9Iz2A=", + "owner": "thomashoneyman", + "repo": "purescript-overlay", + "rev": "4ad4c15d07bd899d7346b331f377606631eb0ee4", + "type": "github" + }, + "original": { + "owner": "thomashoneyman", + "repo": "purescript-overlay", + "type": "github" + } + }, + "pyproject-nix": { + "inputs": { + "nixpkgs": [ + "ngipkgs", + "dream2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1763017646, + "narHash": "sha256-Z+R2lveIp6Skn1VPH3taQIuMhABg1IizJd8oVdmdHsQ=", + "owner": "pyproject-nix", + "repo": "pyproject.nix", + "rev": "47bd6f296502842643078d66128f7b5e5370790c", + "type": "github" + }, + "original": { + "owner": "pyproject-nix", + "repo": "pyproject.nix", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -920,6 +1209,7 @@ "home-manager": "home-manager_2", "master": "master", "musnix": "musnix", + "ngipkgs": "ngipkgs", "niri": "niri", "nixpkgs": "nixpkgs_6", "noctalia": "noctalia", @@ -929,6 +1219,75 @@ "waka-victoriametrics": "waka-victoriametrics" } }, + "sbt-derivation": { + "inputs": { + "flake-utils": [ + "ngipkgs", + "flake-utils" + ], + "nixpkgs": [ + "ngipkgs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1698464090, + "narHash": "sha256-Pnej7WZIPomYWg8f/CZ65sfW85IfIUjYhphMMg7/LT0=", + "owner": "zaninime", + "repo": "sbt-derivation", + "rev": "6762cf2c31de50efd9ff905cbcc87239995a4ef9", + "type": "github" + }, + "original": { + "owner": "zaninime", + "repo": "sbt-derivation", + "type": "github" + } + }, + "slimlock": { + "inputs": { + "nixpkgs": [ + "ngipkgs", + "dream2nix", + "purescript-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1688756706, + "narHash": "sha256-xzkkMv3neJJJ89zo3o2ojp7nFeaZc2G0fYwNXNJRFlo=", + "owner": "thomashoneyman", + "repo": "slimlock", + "rev": "cf72723f59e2340d24881fd7bf61cb113b4c407c", + "type": "github" + }, + "original": { + "owner": "thomashoneyman", + "repo": "slimlock", + "type": "github" + } + }, + "sops-nix": { + "inputs": { + "nixpkgs": [ + "ngipkgs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1769921679, + "narHash": "sha256-twBMKGQvaztZQxFxbZnkg7y/50BW9yjtCBWwdjtOZew=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "1e89149dcfc229e7e2ae24a8030f124a31e4f24f", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "sops-nix", + "type": "github" + } + }, "stylix": { "inputs": { "base16": "base16", @@ -936,13 +1295,13 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_6", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" ], "nur": "nur_2", - "systems": "systems_4", + "systems": "systems_5", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1009,6 +1368,21 @@ } }, "systems_4": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1125,13 +1499,34 @@ "type": "github" } }, + "treefmt-nix_2": { + "inputs": { + "nixpkgs": [ + "ngipkgs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1769691507, + "narHash": "sha256-8aAYwyVzSSwIhP2glDhw/G0i5+wOrren3v6WmxkVonM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "28b19c5844cc6e2257801d43f2772a4b4c050a1b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "unstable": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "type": "github" }, "original": { @@ -1161,7 +1556,7 @@ }, "waka-victoriametrics": { "inputs": { - "flake-parts": "flake-parts_6", + "flake-parts": "flake-parts_7", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 1549386..24c6218 100644 --- a/flake.nix +++ b/flake.nix @@ -47,7 +47,7 @@ inputs.nixpkgs.follows = "unstable"; }; -# affinity-nix.url = "github:mrshmllow/affinity-nix"; + # affinity-nix.url = "github:mrshmllow/affinity-nix"; musnix.url = "github:musnix/musnix"; flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.6.0"; git-global-log.url = "github:tophcodes/git-global-log"; @@ -55,6 +55,10 @@ url = "github:nix-community/NUR"; inputs.nixpkgs.follows = "nixpkgs"; }; + ngipkgs = { + url = "github:ngi-nix/ngipkgs/?ref=672c78f6c140b480ca37cd04a4ee250fb00b1b7d"; + inputs.nixpkgs.follows = "nixpkgs"; + }; community-solid-server = { url = "github:tophcodes/CommunitySolidServer.nix/main"; }; @@ -86,33 +90,4 @@ ./modules/flake ]; }); - - # # Add modules only to specific hosts - # systems.hosts = with inputs; { - # cobalt.modules = [ - # stylix.nixosModules.stylix - # ovos.nixosModules.default - # waka-victoriametrics.nixosModules.default - # ]; - # }; - - # overlays = with inputs; [ - # ovos.overlays.default - # (final: prev: { - # waka-victoriametrics = waka-victoriametrics.packages.${final.system}.default; - # }) - # ]; - - # outputs-builder = channels: { - # formatter = channels.nixpkgs.alejandra; - # }; - # }) - # // { - # agenix-rekey = inputs.agenix-rekey.configure { - # userFlake = inputs.self; - # nixosConfigurations = inputs.self.nixosConfigurations // inputs.self.darwinConfigurations; - # homeConfigurations = inputs.self.homeConfigurations; - # }; - # }; - # } } diff --git a/home/by-host/endurance/config/dev.nix b/home/by-host/endurance/config/dev.nix index f3c7f98..84e4b1f 100644 --- a/home/by-host/endurance/config/dev.nix +++ b/home/by-host/endurance/config/dev.nix @@ -98,6 +98,11 @@ command = "npx"; type = "stdio"; }; + claudezilla = { + command = "bun"; + args = ["/home/toph/code/vendor/claudezilla/mcp/server.js"]; + type = "stdio"; + }; }; }; }; diff --git a/home/by-host/endurance/config/jujutsu.nix b/home/by-host/endurance/config/jujutsu.nix new file mode 100644 index 0000000..976c979 --- /dev/null +++ b/home/by-host/endurance/config/jujutsu.nix @@ -0,0 +1,11 @@ +{...}: { + programs.jujutsu = { + enable = true; + settings = { + user = { + name = "Christopher Mühl"; + email = "toki@toph.so"; + }; + }; + }; +} diff --git a/home/by-host/endurance/misc/everything.nix b/home/by-host/endurance/misc/everything.nix index 1e62504..c776bfc 100644 --- a/home/by-host/endurance/misc/everything.nix +++ b/home/by-host/endurance/misc/everything.nix @@ -16,9 +16,6 @@ grim # Screenshots slurp # Region selection - # RDF!!! - cytoscape - # Productivity obsidian # Note taking todoist-electron # To-Do List app @@ -27,7 +24,18 @@ speedcrunch # GUI calculator app calibre # eBook Manager spacedrive-v2 + # loupe # Photo viewer + (dokieli.overrideAttrs + (final: prev: { + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp -r * $out + rm $out/LICENSE + runHook postInstall + ''; + })) cider-2 # Apple music player fractal # Matrix client gomuks # Matrix client TUI