Move ai-usage to module

Reviewed-on: #19

.devcontainer/devcontainer.json

@@ -0,0 +1,15 @@
+{
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "mkhl.direnv"
+      ]
+    },
+    "zed": {
+      "extensions": []
+    }
+  },
+  "image": "ghcr.io/cachix/devenv/devcontainer:latest",
+  "overrideCommand": false,
+  "updateContentCommand": "devenv test"
+}

devenv.lock

@@ -3,11 +3,11 @@
     "devenv": {
       "locked": {
         "dir": "src/modules",
-        "lastModified": 1786490576,
+        "lastModified": 1790701375,
-        "narHash": "sha256-TH5K1TBi5YNUEEVXoPe99Wzy6XOxsuzkypEJofWc/fU=",
+        "narHash": "sha256-0FpLHIRDYiyo3EMTnMQSobZQknZaa3JuWo6vmMCK76o=",
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "5706f600b4b6799d5dade8602f85cfd2e060b2f3",
+        "rev": "fe20b5cba7ab5e93ae73f956a8d3efc50e1753f4",
         "type": "github"
       },
       "original": {
@@ -41,11 +41,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1784288435,
+        "lastModified": 1790500375,
-        "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=",
+        "narHash": "sha256-XN3sDtn8TU9hAc9xqZ+SqRB/HHm2wjxM6aSWYLJU+oo=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9",
+        "rev": "a0e4241b51206fbcbf52fd322eb5f0cd80f153c4",
         "type": "github"
       },
       "original": {
@@ -59,11 +59,11 @@
         "nixpkgs-src": "nixpkgs-src"
       },
       "locked": {
-        "lastModified": 1786472144,
+        "lastModified": 1789506231,
-        "narHash": "sha256-W1wLGKZKGtnTWGRFgjbsVQleuO6jgMweaSAbFltLkN0=",
+        "narHash": "sha256-vNkJbtmqyBfFhn/HnzQo4ROuoyYWuy/allqTfJb4kMY=",
         "owner": "cachix",
         "repo": "devenv-nixpkgs",
-        "rev": "ea21d30f66a051c7cd750692a2af8d56e0ec4bfb",
+        "rev": "c2f38fe7f9e04d9aadd354d380f2bd40531d9737",
         "type": "github"
       },
       "original": {
@@ -76,11 +76,11 @@
     "nixpkgs-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1786098110,
+        "lastModified": 1789370336,
-        "narHash": "sha256-shi1tjDhCGGd0kIgVPNY03V8NBWSTzhMSFDb7IqSoec=",
+        "narHash": "sha256-6RSEDHIWQtesQKWSu5qRai8L2h4KgCgMEfJHstW99G4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "afb4584a80bbf779ce0f691509ff902d188c2b3d",
+        "rev": "c7def046b9a883d46974757852106483d741586f",
         "type": "github"
       },
       "original": {
@@ -105,11 +105,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1785945821,
+        "lastModified": 1791203292,
-        "narHash": "sha256-NLSyTCW4K4ofhNBllt3omPasm6QpralXH1DBZOc91Dw=",
+        "narHash": "sha256-vuzVwvjeucSnwKwMBpyP8r5IzdrMKCHEdwTrRFwUN7I=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "ae7910970dddc408fe6ab1c8e4b277bb21d72dc0",
+        "rev": "03d8ee1bcbc8f9638907bb79edb9673151d0e22b",
         "type": "github"
       },
       "original": {

devenv.nix

@@ -5,6 +5,8 @@
 }:
 
 {
+  devcontainer.enable = true;
+
   treefmt.enable = true;
 
   treefmt.config.programs.nixpkgs-fmt.enable = true;

flake.lock

@@ -1,5 +1,25 @@
 {
   "nodes": {
+    "ai-usage": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1791553507,
+        "narHash": "sha256-Zrzq6ISt8BAG5ArLJP6qJTIn5YgAPZ1jL2lLlxjpFaM=",
+        "ref": "refs/heads/master",
+        "rev": "69605d7e5414786cfe004e93e392f8a90ac1638c",
+        "revCount": 1,
+        "type": "git",
+        "url": "https://git.een.ninja/armel/ai-usage.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.een.ninja/armel/ai-usage.git"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -7,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1785119570,
+        "lastModified": 1790996401,
-        "narHash": "sha256-Rgs2xKnGLFWQscxUaXX07oyZeuMDOHEbqDOsgliLFGM=",
+        "narHash": "sha256-f+kOxEmOUnQazVAmGg0i8hzwgd1kX/geY+k/Dpheye8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d4fd24667c8cbef124bb70a20380cab75ec8474d",
+        "rev": "db7d5e2332710f5abb088f6b5de927d7f9511b35",
         "type": "github"
       },
       "original": {
@@ -23,11 +43,11 @@
     },
     "nix-flatpak": {
       "locked": {
-        "lastModified": 1783368811,
+        "lastModified": 1790428548,
-        "narHash": "sha256-0H8jDwR4Kegb3heaTrH1ftbgKfZVDT8JE+46uXxDy/Q=",
+        "narHash": "sha256-OsZ/I7v3ArCrk0XOUvkiU1dFtGtE1qZTHRGjvBXIKUU=",
         "owner": "gmodena",
         "repo": "nix-flatpak",
-        "rev": "20d42f0ee98c9fe9f85e8d1de474f1409ed10d05",
+        "rev": "f1f045fc8b35ff59f88982c1752d3f3a42ca6a61",
         "type": "github"
       },
       "original": {
@@ -38,11 +58,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1786430034,
+        "lastModified": 1791426274,
-        "narHash": "sha256-Vux08kA5PICwS2sViCMfwVLAHNoH8TkKAeBo25LjpMI=",
+        "narHash": "sha256-MWhktfFtFE8Jl7bf9Pkp7TR5MSdYCjCswSo0Gkb4ywc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "70cc4559b10a6062b05ff1af17e0add065ccaed9",
+        "rev": "7c8764b7c7b09b34f632464276218ef9090eaa11",
         "type": "github"
       },
       "original": {
@@ -54,11 +74,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1786348146,
+        "lastModified": 1791366222,
-        "narHash": "sha256-we5zDEFfn8TgzeWKjKDMIjeQZ59omEPl23NIF+13/ys=",
+        "narHash": "sha256-o0N4g6uSOIppU7CGToNvGlMf5vC+B6O6ukFHKY/TKOY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d482ef84049d9b7276b83a06e4e4d76983830097",
+        "rev": "39ad350a0602fa0a58a544344e3e9187526ea45c",
         "type": "github"
       },
       "original": {
@@ -70,6 +90,7 @@
     },
     "root": {
       "inputs": {
+        "ai-usage": "ai-usage",
         "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs",

flake.nix

@@ -19,6 +19,11 @@
       url = "github:gmodena/nix-flatpak";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    ai-usage = {
+      url = "git+https://git.een.ninja/armel/ai-usage.git";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   # This strange syntax is a workaround for the intentional limitations of `flake.nix` files.

hosts/gandalf/default.nix

@@ -17,7 +17,7 @@
     ../../modules/matrix.nix
     ../../modules/kdenlive.nix
     ../../modules/audacity.nix
-    ../../modules/ollama.nix
+    #../../modules/ollama.nix
     ../../modules/wireguard.nix
     ../../modules/qbittorrent.nix
     ../../modules/gimp.nix
@@ -31,10 +31,14 @@
     ../../modules/discord.nix
     ../../modules/lazygit.nix
     ../../modules/yazi.nix
-    ./mtp-fix.nix
+    ../../modules/cursor-cli.nix
+    ../../modules/openrct2.nix
+    ../../modules/jazz2.nix
+    ../../modules/opencode.nix
+    ../../modules/git-churn.nix
   ];
 
-  boot.kernelPackages = pkgs.linuxPackages_latest;
+  #  boot.kernelPackages = pkgs.linuxPackages_7_2;
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -42,7 +46,7 @@
   networking.hostName = "gandalf";
   networking.networkmanager.enable = true;
   networking.nameservers = [
-    "192.168.68.56"
+    #    "192.168.68.56"
     "1.1.1.1"
     "8.8.8.8"
   ];

hosts/gandalf/mtp-fix.nix

@@ -1,30 +0,0 @@
-{ pkgs, ... }:
-
-{
-  nixpkgs.overlays = [
-    (
-      final: prev:
-        let
-          targetVersion = "1.1.23";
-        in
-        {
-          libmtp =
-            if builtins.compareVersions prev.libmtp.version targetVersion >= 0 then
-              prev.libmtp
-            else
-              prev.libmtp.overrideAttrs (_: {
-                version = targetVersion;
-
-                src = final.fetchFromGitHub {
-                  owner = "libmtp";
-                  repo = "libmtp";
-                  rev = "v${targetVersion}";
-                  hash = "sha256-FlPj9PEeOAWabU11dFTzDgY9TBbgmJclbeL0iULYw6A=";
-                };
-
-                patches = [ ];
-              });
-        }
-    )
-  ];
-}

hosts/work/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, home-manager, pkgs, ... }:
 
 {
   imports = [
@@ -29,6 +29,9 @@
     ../../modules/yazi.nix
     ../../modules/bubblewrap.nix
     ../../modules/socat.nix
+    ../../modules/cursor-cli.nix
+    ../../modules/git-churn.nix
+    ../../modules/ai-usage.nix
   ];
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
@@ -60,28 +63,6 @@
 
   virtualisation.libvirtd.enable = true;
 
-  specialisation = {
-    "top floor".configuration = {
-      home-manager.users.avravels.home.hyprland.monitors = [
-        {
-          output = "DP-3";
-          mode = "2560x1440";
-          position = "0x0";
-        }
-        {
-          output = "DP-1";
-          mode = "2560x1440";
-          position = "2560x0";
-        }
-        {
-          output = "eDP-1";
-          mode = "1920x1200";
-          position = "5120x0";
-        }
-      ];
-    };
-  };
-
   networking.hosts = {
     "127.0.0.1" = [
       "local.wormundco.de"
@@ -92,5 +73,6 @@
     "149.210.174.226" = [ "kindertelefoon" ];
   };
 
+
   system.stateVersion = "25.11"; # Did you read the comment?
 }

modules/ai-usage.nix

@@ -0,0 +1 @@
+

modules/cursor-cli.nix

@@ -0,0 +1,8 @@
+{ config, pkgsUnstable, ... }:
+
+{
+  environment.systemPackages = with pkgsUnstable; [
+    cursor-cli
+  ];
+}
+

modules/git-churn.nix

@@ -0,0 +1,23 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = [
+    (pkgs.writeShellApplication {
+      name = "git-churn";
+
+      runtimeInputs = with pkgs; [
+        git
+        coreutils
+        gnugrep
+      ];
+
+      text = ''
+        git log -M -C --name-only --format='format:' "$@" |
+          sort |
+          grep -v '^$' |
+          uniq -c |
+          sort -n
+      '';
+    })
+  ];
+}

modules/home-manager.nix

@@ -1,11 +1,11 @@
-{ pkgs, pkgsUnstable, ... }:
+{ pkgs, ai-usage, pkgsUnstable, ... }:
 
 {
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
     extraSpecialArgs = {
-      inherit pkgsUnstable;
+      inherit pkgsUnstable ai-usage;
     };
 
     users.avravels = import home/home.nix;

modules/home/programs/vscode.nix

@@ -8,7 +8,6 @@ let
     mkhl.direnv
     catppuccin.catppuccin-vsc
     bmewburn.vscode-intelephense-client
-    continue.continue
     vue.volar
     ms-vscode-remote.remote-containers
     (pkgs.vscode-utils.buildVscodeMarketplaceExtension {
@@ -49,12 +48,12 @@ let
     "editor.lineNumbers" = "relative";
     "workbench.colorTheme" = "Catppuccin Mocha";
     "workbench.editor.enablePreview" = false;
+    "workbench.activityBar.orientation" = "vertical";
     "direnv.restart.automatic" = true;
     "terminal.integrated.defaultProfile.linux" = "zsh";
     "terminal.integrated.profiles.linux".zsh = {
       path = "${pkgs.zsh}/bin/zsh";
     };
-    "coverage-gutters.coverageBaseDir" = "test-reports";
     # PHPUnit
     "phpunit.command" =
       "docker compose exec laravel.test \${php} \${phpargs} \${phpunit} \${phpunitargs}";
@@ -62,6 +61,7 @@ let
     "phpunit.paths" = {
       "\${workspaceFolder}" = "/var/www/html";
     };
+    "LaravelExtraIntellisense.basePathForCode" = "/var/www/html";
   };
 
   editors = {

modules/jazz2.nix

@@ -0,0 +1,8 @@
+{ pkgsUnstable, ... }:
+
+{
+  environment.systemPackages = with pkgsUnstable; [
+    jazz2
+  ];
+}
+

modules/opencode.nix

@@ -0,0 +1,8 @@
+{ pkgsUnstable, ... }:
+
+{
+  environment.systemPackages = with pkgsUnstable; [
+    opencode
+  ];
+}
+

modules/openrct2.nix

@@ -0,0 +1,8 @@
+{ pkgsUnstable, ... }:
+
+{
+  environment.systemPackages = with pkgsUnstable; [
+    openrct2
+  ];
+}
+

outputs.nix

@@ -2,6 +2,7 @@
 , nixpkgs-unstable
 , home-manager
 , nix-flatpak
+, ai-usage
 , ...
 }:
 
@@ -19,7 +20,7 @@ let
       inherit system;
 
       specialArgs = {
-        inherit pkgsUnstable;
+        inherit pkgsUnstable ai-usage;
         nixFlatpak = nix-flatpak;
       };