From 43523cf2d8a8561678a02b816016d9305c07f7de Mon Sep 17 00:00:00 2001 From: m3tm3re Date: Sat, 21 Mar 2026 09:39:19 +0100 Subject: [PATCH] +television, flake-update --- flake.lock | 71 ++++++++++++++---------------- flake.nix | 4 +- home/features/cli/default.nix | 2 + home/features/cli/nushell.nix | 2 + home/features/cli/television.nix | 65 +++++++++++++++++++++++++++ home/features/coding/default.nix | 7 ++- home/features/desktop/hyprland.nix | 2 + home/m3tam3re/m3-kratos.nix | 1 + hosts/m3-kratos/default.nix | 6 +-- 9 files changed, 117 insertions(+), 43 deletions(-) create mode 100644 home/features/cli/television.nix diff --git a/flake.lock b/flake.lock index f0143ab..948aad2 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ "agents": { "flake": false, "locked": { - "lastModified": 1773479083, - "narHash": "sha256-qwope4VrtrMsebTjyqhiwO6NxZ4t8kk+65K8y41ada0=", + "lastModified": 1773654477, + "narHash": "sha256-de+B85eBY2SyT0uPLlVxKCy6lsKYXhtA2mo2zO6MXlg=", "ref": "refs/heads/master", - "rev": "8bcb5e11fbfeb4c00b81358163162324d0893ff8", - "revCount": 64, + "rev": "a4ae041e1d2343000da7b7098195f166b58c0d11", + "revCount": 65, "type": "git", "url": "https://code.m3ta.dev/m3tam3re/AGENTS" }, @@ -141,11 +141,11 @@ ] }, "locked": { - "lastModified": 1772867152, - "narHash": "sha256-RIFgZ4O6Eg+5ysZ8Tqb3YvcqiRaNy440GEY22ltjRrs=", + "lastModified": 1773889306, + "narHash": "sha256-PAqwnsBSI9SVC2QugvQ3xeYCB0otOwCacB1ueQj2tgw=", "owner": "nix-community", "repo": "disko", - "rev": "eaafb89b56e948661d618eefd4757d9ea8d77514", + "rev": "5ad85c82cc52264f4beddc934ba57f3789f28347", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1772845525, - "narHash": "sha256-Dp5Ir2u4jJDGCgeMRviHvEQDe+U37hMxp6RSNOoMMPc=", + "lastModified": 1774007980, + "narHash": "sha256-FOnZjElEI8pqqCvB6K/1JRHTE8o4rer8driivTpq2uo=", "owner": "nix-community", "repo": "home-manager", - "rev": "27b93804fbef1544cb07718d3f0a451f4c4cd6c0", + "rev": "9670de2921812bc4e0452f6e3efd8c859696c183", "type": "github" }, "original": { @@ -343,11 +343,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1773459162, - "narHash": "sha256-QdrMe4cftS8ALHB2+DTNOZIkw+rqddm5lcsAhm/voqk=", + "lastModified": 1774063450, + "narHash": "sha256-p1Y2iUsWyLKk1z35OdAGcEpmbpRTG3AgjdyAVh5kmc8=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "64d8585ea7ba1a88b1afa82a89bdd10d4c894f45", + "rev": "71c3b957aeb56aea79fd9a964e3f0bff2b794251", "type": "github" }, "original": { @@ -364,17 +364,14 @@ "openspec": "openspec" }, "locked": { - "lastModified": 1772876766, - "narHash": "sha256-PiikuOqrjyzTAqUbnUwIKCr9+YvKX0xTRZ4q0srkQKU=", - "ref": "refs/heads/master", - "rev": "291e3a0744d4a0192654c8afdbe3d1636c9c0890", - "revCount": 156, - "type": "git", - "url": "https://code.m3ta.dev/m3tam3re/nixpkgs" + "lastModified": 1774077311, + "narHash": "sha256-C8Jpr7YjE5SZ3RMF7q1y4wt8nil89RIg+Ryl0UQGpIQ=", + "path": "/home/m3tam3re/p/NIX/nixpkgs", + "type": "path" }, "original": { - "type": "git", - "url": "https://code.m3ta.dev/m3tam3re/nixpkgs" + "path": "/home/m3tam3re/p/NIX/nixpkgs", + "type": "path" } }, "nix-colors": { @@ -527,11 +524,11 @@ }, "nixpkgs-master_2": { "locked": { - "lastModified": 1772874821, - "narHash": "sha256-ehnRKCc/qq0hjyi5aaE/H4RPUPfSDqjndWqAGZFesfY=", + "lastModified": 1774078191, + "narHash": "sha256-nyxxxW1/2ouu9dU0I02ul5pHrmUrE1JVFhfFlmYe3Lw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "10e7894b40eb0ad14d3a3184d20cc1beace1414d", + "rev": "09061f748ee21f68a089cd5d91ec1859cd93d0be", "type": "github" }, "original": { @@ -543,11 +540,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1772598333, - "narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=", + "lastModified": 1773814637, + "narHash": "sha256-GNU+ooRmrHLfjlMsKdn0prEKVa0faVanm0jrgu1J/gY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239", + "rev": "fea3b367d61c1a6592bc47c72f40a9f3e6a53e96", "type": "github" }, "original": { @@ -575,11 +572,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1773231277, - "narHash": "sha256-Xy3WEpUAbpsz8ydgvVAQAGGB/WB+8cNA5cshiL0McTI=", + "lastModified": 1773628058, + "narHash": "sha256-hpXH0z3K9xv0fHaje136KY872VT2T5uwxtezlAskQgY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "75690239f08f885ca9b0267580101f60d10fbe62", + "rev": "f8573b9c935cfaa162dd62cc9e75ae2db86f85df", "type": "github" }, "original": { @@ -623,11 +620,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1772624091, - "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=", + "lastModified": 1773821835, + "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353", + "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", "type": "github" }, "original": { @@ -661,11 +658,11 @@ ] }, "locked": { - "lastModified": 1772875192, - "narHash": "sha256-R706OBJ+nMQsVP2Dni+FaG3UDfhlE2zR4rz+YGnEi8I=", + "lastModified": 1774077133, + "narHash": "sha256-seaMLqcOqVmXxflfCo/porVj8mcX8qn8HMHUPXC4Now=", "owner": "nix-community", "repo": "NUR", - "rev": "2b3f4e0a0eea5a32dc78204fefba15ee83d437d3", + "rev": "800657aa193a98b84f8262300a4ccc4f5de4e7c9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ee225ef..3ecb5a4 100644 --- a/flake.nix +++ b/flake.nix @@ -22,8 +22,8 @@ nixpkgs-9e58ed7.url = "github:nixos/nixpkgs/9e58ed7ba759d81c98f033b7f5eba21ca68f53b0"; nixpkgs-master.url = "github:nixos/nixpkgs/master"; - m3ta-nixpkgs.url = "git+https://code.m3ta.dev/m3tam3re/nixpkgs"; - # m3ta-nixpkgs.url = "path:/home/m3tam3re/p/NIX/nixpkgs"; + # m3ta-nixpkgs.url = "git+https://code.m3ta.dev/m3tam3re/nixpkgs"; + m3ta-nixpkgs.url = "path:/home/m3tam3re/p/NIX/nixpkgs"; llm-agents.url = "github:numtide/llm-agents.nix"; # diff --git a/home/features/cli/default.nix b/home/features/cli/default.nix index 33fa638..5e0d0f0 100644 --- a/home/features/cli/default.nix +++ b/home/features/cli/default.nix @@ -11,6 +11,7 @@ ./nushell.nix ./secrets.nix ./starship.nix + ./television.nix ./zellij.nix ]; cli.stt-ptt = { @@ -23,6 +24,7 @@ else pkgs.whisper-cpp; model = "ggml-large-v3-turbo"; notifyTimeout = 2000; + ollamaTimeout = 120; }; programs.carapace = { diff --git a/home/features/cli/nushell.nix b/home/features/cli/nushell.nix index 01923f7..7daea55 100644 --- a/home/features/cli/nushell.nix +++ b/home/features/cli/nushell.nix @@ -176,6 +176,8 @@ in { } ] } + mkdir ($nu.data-dir | path join "vendor/autoload") + tv init nu | save -f ($nu.data-dir | path join "vendor/autoload/tv.nu") ''; }; }; diff --git a/home/features/cli/television.nix b/home/features/cli/television.nix new file mode 100644 index 0000000..58b92a1 --- /dev/null +++ b/home/features/cli/television.nix @@ -0,0 +1,65 @@ +{ + config, + lib, + pkgs, + ... +}: +with lib; let + cfg = config.features.cli.television; +in { + options.features.cli.television.enable = mkEnableOption "enable nitch"; + + config = mkIf cfg.enable { + programs.television = { + enable = true; + channels = { + tldr = { + metadata = { + description = "Browse TLDR pages"; + name = "tldr"; + requirements = [ + "tldr" + ]; + }; + preview = { + command = "tldr '{}'"; + }; + source = { + command = "tldr --list"; + }; + }; + git-diff = { + metadata = { + description = "A channel to select files from git diff commands"; + name = "git-diff"; + requirements = [ + "git" + ]; + }; + preview = { + command = "git diff HEAD --color=always -- '{}'"; + }; + source = { + command = "git diff --name-only HEAD"; + }; + }; + git-log = { + metadata = { + description = "A channel to select from git log entries"; + name = "git-log"; + requirements = [ + "git" + ]; + }; + preview = { + command = "git show -p --stat --pretty=fuller --color=always '{0}'"; + }; + source = { + command = "git log --oneline --date=short --pretty=\"format:%h %s %an %cd\" \"$@\""; + output = "{split: :0}"; + }; + }; + }; + }; + }; +} diff --git a/home/features/coding/default.nix b/home/features/coding/default.nix index e616e20..84da838 100644 --- a/home/features/coding/default.nix +++ b/home/features/coding/default.nix @@ -1,4 +1,8 @@ -{pkgs, videoDrivers, ...}: { +{ + pkgs, + videoDrivers, + ... +}: { imports = [ ./opencode.nix ]; @@ -69,6 +73,7 @@ cudaSupport = videoDrivers == ["nvidia"]; }) pi + openspec alejandra sidecar tailwindcss diff --git a/home/features/desktop/hyprland.nix b/home/features/desktop/hyprland.nix index 614ee33..766c328 100644 --- a/home/features/desktop/hyprland.nix +++ b/home/features/desktop/hyprland.nix @@ -181,6 +181,7 @@ in { "$mainMod, P, exec, uwsm app -- rofi-pass" "$mainMod SHIFT, P, pseudo" "$mainMod, R, exec, stt-ptt start" + "$mainMod, S, exec, stt-ptt start" "$mainMod, J, togglesplit" "$mainMod, h, movefocus, l" "$mainMod, l, movefocus, r" @@ -211,6 +212,7 @@ in { ]; bindr = [ "$mainMod, R, exec, stt-ptt stop" + "$mainMod, S, exec, stt-ptt format-stop" ]; bindm = [ "$mainMod, mouse:272, movewindow" diff --git a/home/m3tam3re/m3-kratos.nix b/home/m3tam3re/m3-kratos.nix index 53bda0f..70c5824 100644 --- a/home/m3tam3re/m3-kratos.nix +++ b/home/m3tam3re/m3-kratos.nix @@ -45,6 +45,7 @@ with lib; { nitch.enable = true; secrets.enable = true; starship.enable = true; + television.enable = true; }; desktop = { crypto.enable = true; diff --git a/hosts/m3-kratos/default.nix b/hosts/m3-kratos/default.nix index ea2e04b..66d41f0 100644 --- a/hosts/m3-kratos/default.nix +++ b/hosts/m3-kratos/default.nix @@ -50,9 +50,9 @@ }; services.ollama = { environmentVariables = { - HCC_AMDGPU_TARGET = "gfx1103"; - ROCR_VISIBLE_DEVICES = "0"; + # HCC_AMDGPU_TARGET = "gfx1103"; + # ROCR_VISIBLE_DEVICES = "0"; }; - rocmOverrideGfx = "11.0.3"; + # rocmOverrideGfx = "11.0.3"; }; }