diff --git a/apps/gui/default.nix b/apps/gui/default.nix index ad6da8ff9e7e90ced415cc22a9786ccc7720f665..9cf3f0a49b3ca0d97beebde9da617b54948e7a29 100644 --- a/apps/gui/default.nix +++ b/apps/gui/default.nix @@ -13,7 +13,7 @@ ]; home = { packages = with pkgs; [ # Tools - #cinny-desktop + cinny-desktop delve discord obsidian diff --git a/apps/nogui/llm.nix b/apps/nogui/llm.nix index 4ec4703db8b60ae54a081a5322e727a97a838479..07a62753081e8e6529fc23e0d98a64fc61538246 100644 --- a/apps/nogui/llm.nix +++ b/apps/nogui/llm.nix @@ -49,19 +49,8 @@ license = lib.licenses.asl20; maintainers = with lib.maintainers; [ jkachmar ]; }; }; - pyWithPackages = ( - pkgs.python3.withPackages (py: [ - py.llm - claude - ]) - ); in { - home.packages = [ - (pkgs.runCommand "llm" { } '' - inherit (pkgs) fetchFromGitHub nix-update-script python3Packages; inherit (python3Packages) - ln -s ${pyWithPackages}/bin/llm $out/bin/llm - '') - ]; +{ pkgs, lib, ... }: } diff --git a/apps/nogui/nushell/config.nu b/apps/nogui/nushell/config.nu index 7a387c767183f4545bcd1760c8e48b6dc08b6af3..8b9e456f70bce65996ede263920e08befe64da09 100644 --- a/apps/nogui/nushell/config.nu +++ b/apps/nogui/nushell/config.nu @@ -393,6 +393,7 @@ metric: true # true => KB, MB, GB (ISO standard), false => KiB, MiB, GiB (Windows standard) format: "auto" # b, kb, kib, mb, mib, gb, gib, tb, tib, pb, pib, eb, eib, zb, zib, auto } color_config: $dark_theme # if you want a light theme, replace `$dark_theme` to `$light_theme` + use_grid_icons: true footer_mode: "25" # always, never, number_of_rows, auto float_precision: 2 # buffer_editor: "emacs" # command that will be used to edit the current line buffer with ctrl+o, if unset fallback to $env.EDITOR and $env.VISUAL diff --git a/apps/nogui/nushell/jolheiser.nu b/apps/nogui/nushell/jolheiser.nu index 6cc998de81d9e1f58d698af93d8b6d90839ec825..09b3de6dd43ddba3bd2dbff138ccb1651ad8639a 100644 --- a/apps/nogui/nushell/jolheiser.nu +++ b/apps/nogui/nushell/jolheiser.nu @@ -98,7 +98,7 @@ ^nix run $"nixpkgs#($cmd)" -- ...$args } ## Other ## -$env.EDITOR = 'hx' +$env.EDITOR = hx $env.SSH_AUTH_SOCK = '/run/user/1000/ssh-agent' source ~/.config/nushell/ohmyposh.nu source ~/.config/nushell/ssh.nu diff --git a/flake.lock b/flake.lock index 46362327de6aaa97586f677a19f29289fb713944..b030d1acdd53c0c2a45c47f87554376d79c6ea0a 100644 --- a/flake.lock +++ b/flake.lock @@ -7,13 +7,15 @@ "nixpkgs" ] }, "locked": { - "lastModified": 1728580104, + "lastModified": 1719973663, - "narHash": "sha256-M+t/DmOj4cjF7/M9qBW5OK/Lam69z4LX+hXraqegz0w=", + "narHash": "sha256-SybjMpCVUWG998EkvcwjHH3fTbG05FUSbB/Gqjz63tE=", "ref": "refs/heads/main", -{ "actual": { + "inputs": { { + "actual": { "inputs": { + "nodes": { "type": "git", "url": "https://git.xeno.science/xenofem/actual-nix.git" }, @@ -31,11 +34,11 @@ ], "systems": "systems" }, "locked": { - "lastModified": 1723293904, + "lastModified": 1712079060, - "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", + "narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=", "owner": "ryantm", "repo": "agenix", - "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", + "rev": "1381a759b205dff7a6818733118d02253340fd5e", "type": "github" }, "original": { @@ -74,14 +77,19 @@ "templ" ] }, "locked": { + "actual": { "inputs": { + "nixpkgs" + "actual": { "inputs": { -{ + ] "ref": "refs/heads/main", + "actual": { "inputs": { - "nodes": { + }, + "actual": { "inputs": { - "actual": { + "locked": { "type": "git", "url": "https://git.jolheiser.com/blog.git" }, @@ -96,11 +105,11 @@ "nixpkgs" ] }, "locked": { - "lastModified": 1721703140, + "lastModified": 1718847949, - "narHash": "sha256-SxxJm6b8xrlp3+ucPc65XrMgm42ITi1ULg7Wk9YwA5w=", + "narHash": "sha256-boTq4/82qkzO2U8UHi6+/xxhTECd0y/nufqK9lIf9+g=", "ref": "refs/heads/main", - "rev": "5edec76b62d532dbb0e67a427b43377277660ad2", + "rev": "ae0d93434ee831ae427615ee7ef02f2d07232f11", - "revCount": 9, + "revCount": 8, "type": "git", "url": "https://git.jolheiser.com/cfg.git" }, @@ -150,12 +159,12 @@ "inputs": { "systems": "systems_2" }, "locked": { - "lastModified": 1726560853, + "lastModified": 1694529238, - "nixpkgs" ] + "locked": { "owner": "numtide", "repo": "flake-utils", - ] + }, "type": "github" }, "original": { @@ -187,6 +196,42 @@ "inputs": { "systems": "systems_4" }, "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_5" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { + "inputs": { + "systems": "systems_6" + }, + "locked": { "lastModified": 1694529238, "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", @@ -200,7 +245,7 @@ "repo": "flake-utils", "type": "github" } }, - "flake-utils_4": { + "flake-utils_6": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -220,11 +265,11 @@ "inputs": { "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1726638033, + "lastModified": 1724255099, - "narHash": "sha256-+hcgXKG5t/9wibv+8T9WASWItBAWb0tsmcZXH+VIYdw=", + "narHash": "sha256-sFAdYSD8nq3uo/TlVBn7hmZTWU17yy1DLubmfQIQk+Q=", "owner": "reckenrode", "repo": "nix-foundryvtt", - "rev": "bf07f9dd916a97a091f8ab83358c2f295bea9ec9", + "rev": "b4b1c18856bf6fead7fcc9382f47866e32b1c7a4", "type": "github" }, "original": { @@ -237,18 +282,19 @@ "ghostty": { "inputs": { "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", - "locked": { + "zig": "zig", + "url": "https://git.jolheiser.com/bennet.git" "nixpkgs": [ }, "locked": { - "locked": { + "url": "https://git.jolheiser.com/bennet.git" "nixpkgs" - "locked": { + "url": "https://git.jolheiser.com/bennet.git" ] "ref": "refs/heads/main", - "locked": { + "url": "https://git.jolheiser.com/bennet.git" }, - "locked": { + "url": "https://git.jolheiser.com/bennet.git" "locked": { "type": "git", "url": "ssh://git@github.com/ghostty-org/ghostty" @@ -308,31 +354,57 @@ "nixpkgs" ] }, "locked": { - "lastModified": 1724120640, + "lastModified": 1721495099, -{ + "blog": { { - "nixpkgs" "ref": "refs/heads/main", - "narHash": "sha256-M+t/DmOj4cjF7/M9qBW5OK/Lam69z4LX+hXraqegz0w=", + "actual": { ] + "nodes": { + "revCount": 9, + "type": "git", "narHash": "sha256-M+t/DmOj4cjF7/M9qBW5OK/Lam69z4LX+hXraqegz0w=", + "locked": { }, { + ] +{ "nixpkgs": [ "url": "https://git.jolheiser.com/git-pr-nix.git" +{ }, { + "locked": { + "gitignore": { + "inputs": { + "nixpkgs": [ + "lastModified": 1720757073, ] + "zls", + "nixpkgs" + ] + }, + "locked": { { - "nixpkgs": [ + "home-manager": [], { + ], { - "locked": { + "systems": "systems" + "repo": "gitignore.nix", { + "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", + "type": "github" }, { - "locked": { + ] + "owner": "hercules-ci", "ref": "refs/heads/main", + "nixpkgs": [ + "actual": { + } + }, + "gitignore_2": { "inputs": { "nixpkgs": [ "templ", @@ -363,13 +435,12 @@ "nixpkgs" ] }, "locked": { - "lastModified": 1726797346, + "lastModified": 1712083196, - "narHash": "sha256-Sj9WrvoV+U1YSYriUD/M+Q5tmQDGbJDXsqrFzqKTPc4=", + "narHash": "sha256-k+9Cj5LHyif4YuH6mpzZfnS5MzF4pdQi55o7FVtZ488=", "owner": "tailscale", "repo": "golink", -{ "actual": { - "nodes": { + "systems": "systems_4" "type": "github" }, "original": { @@ -390,14 +461,13 @@ "nixpkgs" ] }, "locked": { -{ "actual": { - "nixpkgs" + "lastModified": 1694529238, -{ "blog": { + "locked": { "owner": "tweag", "repo": "gomod2nix", - "revCount": 16, + "templ": [ "type": "github" }, "original": { @@ -408,22 +478,21 @@ } }, "gomod2nix_2": { "inputs": { + "templ": [ { - "rev": "03a7f37a42affd2689a72340b8d86731bfd3d28c", "nixpkgs": [ "templ", "nixpkgs" ] }, "locked": { - "revCount": 16, "actual": { + "lastModified": 1667395993, - "narHash": "sha256-sbbA8b6Q2vB/t/r1znHawoXLysCyD4L/6n6/RykiSnA=", + "narHash": "sha256-4c3zQ2YY4BZOufaBJB4v9VBBeN2dH7iVdoJw8SDNCfI=", "owner": "nix-community", "repo": "gomod2nix", -{ + "templ": [ "inputs": { - "nixpkgs" "type": "github" }, "original": { @@ -439,12 +508,13 @@ "nixpkgs" ] }, "locked": { - "revCount": 16, + "actual": { }, + "nixpkgs": [ - "narHash": "sha256-58zWfVOlqDLXy2BI/o/cnyhtEsdRfA4CGxstPgG2xPQ=", + "narHash": "sha256-rP9yqEogOJvro4GLysAOx7jgWL4TU0mydRCgK13spkw=", "ref": "refs/heads/main", - "rev": "14884cafd8d4267777b40a3c13e3973ec9a81cf2", + "rev": "6686d6491326ec79522d262ea150602d6bcb6c7a", - "revCount": 9, + "revCount": 5, "type": "git", "url": "https://git.jolheiser.com/gomodinit.git" }, @@ -480,13 +550,13 @@ "nixpkgs" ] }, "locked": { - "type": "git", + "templ": [ "locked": { - "url": "https://git.xeno.science/xenofem/actual-nix.git" + "templ" "owner": "nix-community", "repo": "home-manager", + "templ" { - "repo": "flake-compat", "type": "github" }, "original": { @@ -495,20 +565,37 @@ "repo": "home-manager", "type": "github" } }, - "url": "https://git.xeno.science/xenofem/actual-nix.git" + "langref": { + "flake": false, + "locked": { + "templ" "actual": { + "actual": { "locked": { + "inputs": { + "url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in" + }, { - "nixpkgs" + ] + "templ" "inputs": { - "url": "https://git.xeno.science/xenofem/actual-nix.git" + "templ" "nixpkgs": [ { + }, + }, +{ "nixpkgs" + "actual": { + "locked": { + "templ" "nixpkgs" + "narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=", "url": "https://git.xeno.science/xenofem/actual-nix.git" - ] + "nixpkgs" "url": "https://git.xeno.science/xenofem/actual-nix.git" + ] + "templ" }, "type": "github" }, @@ -521,12 +608,12 @@ } }, "nixpkgs": { "locked": { - "lastModified": 1726447378, + "lastModified": 1719838683, - "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", + "narHash": "sha256-Zw9rQjHz1ilNIimEXFeVa1ERNRBF8DoXDhLAZq5B4pE=", "owner": "nixos", "repo": "nixpkgs", - "original": { "inputs": { +{ "type": "github" }, "original": { @@ -538,16 +625,17 @@ } }, "nixpkgs-stable": { "locked": { - "lastModified": 1726062281, + "lastModified": 1705957679, - "narHash": "sha256-PyFVySdGj3enKqm8RQuo4v1KLJLmNLOq2yYOHsI6e2Q=", + "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e65aa8301ba4f0ab8cb98f944c14aa9da07394f8", + "rev": "9a333eaa80901efe01df07eade2c16d183761fa3", "type": "github" }, "original": { "owner": "nixos", - } + "inputs": { + "nixpkgs": [ "repo": "nixpkgs", "type": "github" } @@ -570,16 +658,14 @@ } }, "nixpkgs_2": { "locked": { - } + "lastModified": 1722813957, + "lastModified": 1728680363, ] { - "narHash": "sha256-+hcgXKG5t/9wibv+8T9WASWItBAWb0tsmcZXH+VIYdw=", -{ "lastModified": 1726560853, "repo": "nixpkgs", -{ + "lastModified": 1728680363, }, - "locked": { "type": "github" }, "original": { @@ -591,15 +677,15 @@ } }, "nixpkgs_3": { "locked": { -{ + "lastModified": 1728680363, "locked": { - "nodes": { + "inputs": { { - "nixpkgs-stable": "nixpkgs-stable", "owner": "NixOS", "repo": "nixpkgs", + "inputs": { { - "zig": "zig" +{ "type": "github" }, "original": { @@ -610,12 +695,13 @@ } }, "nur": { "locked": { + "inputs": { { - "revCount": 7679, "nodes": { + "narHash": "sha256-t8gWve5gzFJ7rkRyS7wCVrAshUtiIGxebSFzsacawvs=", "owner": "nix-community", "repo": "NUR", - "rev": "7bdbe27588a3338324806750628048d2e5f68f35", + "rev": "bca4a289a944eb9aba71e500080945fb464a2c8b", "type": "github" }, "original": { @@ -757,6 +844,36 @@ "repo": "default", "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tailwind-ctp": { "inputs": { "nixpkgs": [ @@ -850,13 +967,13 @@ "flake-utils" ] }, "locked": { - "nodes": { + "narHash": "sha256-0aJJUY0lKcDnkqLBESOFju8cgIYYrt8jvMwyFTii2Do=", ] "inputs": { - "narHash": "sha256-Ro6LEvG4cC27UXJSMXxv1a9pe41BefQxB7bbCAD8C9Q=", + } "owner": "tailscale-dev", "repo": "tclip", - "rev": "a0cf1c78e1014df1b36dc158e4c9019af9d0856e", + "rev": "5382625af90019d2b4ef29be8e15de3a8cb21238", "type": "github" }, "original": { @@ -867,8 +983,8 @@ } }, "templ": { "inputs": { + "inputs": { "nodes": { - }, "gomod2nix": "gomod2nix_2", "nixpkgs": [ "nixpkgs" @@ -876,14 +992,17 @@ ], "xc": "xc" }, "locked": { + "inputs": { "nodes": { - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", +{ + "inputs": { "nodes": { - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "nodes": { "owner": "a-h", "repo": "templ", + "inputs": { "nodes": { - "lastModified": 1726638033, + "actual": { "type": "github" }, "original": { @@ -919,14 +1038,17 @@ "nixpkgs" ] }, "locked": { + "inputs": { "nodes": { - "zig": "zig" + "inputs": { + "inputs": { "nodes": { - "lastModified": 1728604055, + "nixpkgs": [ "ref": "refs/heads/main", + "inputs": { "nodes": { - "narHash": "sha256-qFzvnwoWhGob+Huh3RlCxC+j16uF0LQKKV4dJxY4nDQ=", + "nixpkgs" - "revCount": 12, + "revCount": 8, "type": "git", "url": "https://git.jolheiser.com/tsnet-serve-nix.git" }, @@ -944,13 +1066,13 @@ "tailwind-ctp": "tailwind-ctp", "tailwind-ctp-lsp": "tailwind-ctp-lsp" }, "locked": { - "lastModified": 1728680554, + "lastModified": 1727210005, - "type": "github" "inputs": { + "repo": "agenix", "ref": "refs/heads/main", - "rev": "39efc9d853717bf4a85ebb348a18e541a6890fdc", + "rev": "94d45f0462c7ee39687445413713d2e859ee9ef8", + "inputs": { "type": "github" - "nixpkgs" "type": "git", "url": "https://git.jolheiser.com/ugit.git" }, @@ -974,18 +1096,18 @@ "templ" ] }, "locked": { + "inputs": { "actual": { -{ { + "inputs": { "actual": { -{ "nodes": { "ref": "refs/heads/main", + "inputs": { "actual": { -{ "actual": { + "inputs": { "actual": { -{ "inputs": { "type": "git", "url": "https://git.jolheiser.com/jolheiser.com.git" @@ -997,22 +1119,26 @@ } }, "xc": { "inputs": { + "inputs": { "actual": { - "original": { + "nixpkgs": [ "nixpkgs": [ "templ", "nixpkgs" ] }, "locked": { + "inputs": { "actual": { - } + "nixpkgs" + "inputs": { "actual": { - }, + ] "owner": "joerdav", "repo": "xc", + "inputs": { "actual": { - "home-manager": [], + }, "type": "github" }, "original": { @@ -1043,6 +1169,56 @@ }, "original": { "owner": "mitchellh", "repo": "zig-overlay", + "type": "github" + } + }, + "zig-overlay": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils_4", + "nixpkgs": [ + "ghostty", + "zls", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1718539737, + "narHash": "sha256-hvQ900gSqzGnJWMRQwv65TixciIbC44iX0Nh5ENRwCU=", + "owner": "mitchellh", + "repo": "zig-overlay", + "rev": "6eb42ce6f85d247b1aecf854c45d80902821d0ad", + "type": "github" + }, + "original": { + "owner": "mitchellh", + "repo": "zig-overlay", + "type": "github" + } + }, + "zls": { + "inputs": { + "flake-utils": "flake-utils_3", + "gitignore": "gitignore", + "langref": "langref", + "nixpkgs": [ + "ghostty", + "nixpkgs-stable" + ], + "zig-overlay": "zig-overlay" + }, + "locked": { + "lastModified": 1718930611, + "narHash": "sha256-FtfVhs6XHNfSQRQorrrz03nD0LCNp2FCnGllRntHBts=", + "owner": "zigtools", + "repo": "zls", + "rev": "0b9746b60c2020ab948f6556f1c729858b82a0f0", + "type": "github" + }, + "original": { + "owner": "zigtools", + "ref": "master", + "repo": "zls", "type": "github" } }