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"
+}

.envrc

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+eval "$(devenv direnvrc)"
+
+# You can pass flags to the devenv command
+# For example: use devenv --impure --option services.postgres.enable:bool true
+use devenv

devenv.lock

@@ -3,11 +3,11 @@
     "devenv": {
       "locked": {
         "dir": "src/modules",
-        "lastModified": 1781800860,
+        "lastModified": 1790701375,
-        "narHash": "sha256-LrEo0eC5ckMvjpBRCuk5q5/vjItKlxnb4n/clHNRZlk=",
+        "narHash": "sha256-0FpLHIRDYiyo3EMTnMQSobZQknZaa3JuWo6vmMCK76o=",
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "d59d872d80876d9eeb3e214d3b088bc4a14a9c4f",
+        "rev": "fe20b5cba7ab5e93ae73f956a8d3efc50e1753f4",
         "type": "github"
       },
       "original": {
@@ -36,17 +36,16 @@
     "git-hooks": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "gitignore": "gitignore",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1781733627,
+        "lastModified": 1790500375,
-        "narHash": "sha256-U3yTuGBnmXvXoQI3qkpfEDsn9RovQPAjN7ndRco+3u0=",
+        "narHash": "sha256-XN3sDtn8TU9hAc9xqZ+SqRB/HHm2wjxM6aSWYLJU+oo=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "3bbec39bc90eadfa031e6f3b77272f3f60803e39",
+        "rev": "a0e4241b51206fbcbf52fd322eb5f0cd80f153c4",
         "type": "github"
       },
       "original": {
@@ -55,37 +54,16 @@
         "type": "github"
       }
     },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "git-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"
-      }
-    },
     "nixpkgs": {
       "inputs": {
         "nixpkgs-src": "nixpkgs-src"
       },
       "locked": {
-        "lastModified": 1781620901,
+        "lastModified": 1789506231,
-        "narHash": "sha256-UF6scQlG+6lRkZBUpn/3KNavhOo5G8kDWhjVHcno8uc=",
+        "narHash": "sha256-vNkJbtmqyBfFhn/HnzQo4ROuoyYWuy/allqTfJb4kMY=",
         "owner": "cachix",
         "repo": "devenv-nixpkgs",
-        "rev": "2df109b343d3c68efd752e32a444a1d9b9f89afa",
+        "rev": "c2f38fe7f9e04d9aadd354d380f2bd40531d9737",
         "type": "github"
       },
       "original": {
@@ -98,11 +76,11 @@
     "nixpkgs-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1781454065,
+        "lastModified": 1789370336,
-        "narHash": "sha256-d2xfDjnfRuf/xYGdu9VVRHiav/2w5hDL/5cw2TuVAXw=",
+        "narHash": "sha256-6RSEDHIWQtesQKWSu5qRai8L2h4KgCgMEfJHstW99G4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9eac87a12312b8f60dd52e1c6e1a265f6fc7f5fc",
+        "rev": "c7def046b9a883d46974757852106483d741586f",
         "type": "github"
       },
       "original": {
@@ -127,11 +105,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780220602,
+        "lastModified": 1791203292,
-        "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=",
+        "narHash": "sha256-vuzVwvjeucSnwKwMBpyP8r5IzdrMKCHEdwTrRFwUN7I=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "db947814a175b7ca6ded66e21383d938df01c227",
+        "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": 1784350909,
+        "lastModified": 1790996401,
-        "narHash": "sha256-ZWyzLbS1yKUTeFJLmdVuWNnHttL333/ldJbEE+KzCrM=",
+        "narHash": "sha256-f+kOxEmOUnQazVAmGg0i8hzwgd1kX/geY+k/Dpheye8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4ce190229c73d44536caa7072f6308fb2d8feeb3",
+        "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": 1784432872,
+        "lastModified": 1791426274,
-        "narHash": "sha256-n3gKTBIV4ZA5VQpUakffBe3KGu4+mhPoA34rrqS0GkA=",
+        "narHash": "sha256-MWhktfFtFE8Jl7bf9Pkp7TR5MSdYCjCswSo0Gkb4ywc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fd1462031fdee08f65fd0b4c6b64e22239a77870",
+        "rev": "7c8764b7c7b09b34f632464276218ef9090eaa11",
         "type": "github"
       },
       "original": {
@@ -54,11 +74,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1784555310,
+        "lastModified": 1791366222,
-        "narHash": "sha256-/FCliTPgiuV1owejZFNx3Ch9irdvkOfOFl+HHZ+DrtM=",
+        "narHash": "sha256-o0N4g6uSOIppU7CGToNvGlMf5vC+B6O6ukFHKY/TKOY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "421eebfd0ec7bccd4abe826ce62d7e6e83129493",
+        "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 = [
@@ -27,6 +27,11 @@
     ../../modules/vlc.nix
     ../../modules/lazygit.nix
     ../../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;
@@ -58,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"
@@ -90,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/bubblewrap.nix

@@ -0,0 +1,8 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    bubblewrap
+  ];
+}
+

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/nvim.nix

@@ -10,6 +10,7 @@
     extraPackages = [
       pkgs.ueberzugpp
       pkgs.imagemagick
+      pkgs.intelephense
     ];
 
     plugins = with pkgs.vimPlugins; [

modules/home/programs/vscode.nix

@@ -8,21 +8,60 @@ let
     mkhl.direnv
     catppuccin.catppuccin-vsc
     bmewburn.vscode-intelephense-client
-    continue.continue
     vue.volar
     ms-vscode-remote.remote-containers
+    (pkgs.vscode-utils.buildVscodeMarketplaceExtension {
+      mktplcRef = {
+        publisher = "ryanluker";
+        name = "vscode-coverage-gutters";
+        version = "2.14.0"; # use the current version
+        sha256 = "sha256-waF3FmncUsXqWFWGRy9X7RQ29BDRYlaqyFhEXg4HXNo";
+      };
+    })
+    (pkgs.vscode-utils.buildVscodeMarketplaceExtension {
+      mktplcRef = {
+        publisher = "laravel";
+        name = "vscode-laravel";
+        version = "1.7.0"; # use the current version
+        sha256 = "sha256-5PVbv5hWIdsOHvYttnf2BPeqfPXsOVENrnRyiUf/Hlg=";
+      };
+    })
+    (pkgs.vscode-utils.buildVscodeMarketplaceExtension {
+      mktplcRef = {
+        publisher = "amiralizadeh9480";
+        name = "laravel-extra-intellisense";
+        version = "0.7.4"; # use the current version
+        sha256 = "sha256-EoyKm2YYfEZDmI1mqRU/SaNk0bNLPrWVINpIhglnL80=";
+      };
+    })
+    (pkgs.vscode-utils.buildVscodeMarketplaceExtension {
+      mktplcRef = {
+        publisher = "recca0120";
+        name = "vscode-phpunit";
+        version = "3.9.40"; # use the current version
+        sha256 = "sha256-EVyDT5aXu1KsGr8xrBQlIRCMOtiCyHgU7aDjl9d9ldY=";
+      };
+    })
   ];
 
   userSettings = {
     "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";
     };
+    # PHPUnit
+    "phpunit.command" =
+      "docker compose exec laravel.test \${php} \${phpargs} \${phpunit} \${phpunitargs}";
+    "phpunit.phpunit" = "artisan test";
+    "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
+  ];
+}
+

modules/socat.nix

@@ -0,0 +1,8 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    socat
+  ];
+}
+

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;
       };