nix flake update and dont remember kitty size

Reviewed-on: #19

devenv.lock

@@ -3,11 +3,11 @@
     "devenv": {
       "locked": {
         "dir": "src/modules",
-        "lastModified": 1787244866,
-        "narHash": "sha256-yRtH4Vs49zZE+u3CR1iBs6jTUp1o/4SdCyshZ5+ojbw=",
+        "lastModified": 1790701375,
+        "narHash": "sha256-0FpLHIRDYiyo3EMTnMQSobZQknZaa3JuWo6vmMCK76o=",
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "4b10b32036245a13efdb0d77d69d6990d1c8a3f5",
+        "rev": "fe20b5cba7ab5e93ae73f956a8d3efc50e1753f4",
         "type": "github"
       },
       "original": {
@@ -41,11 +41,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1784288435,
-        "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=",
+        "lastModified": 1790500375,
+        "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": 1787002832,
-        "narHash": "sha256-DGkHh88/7YLVGZ7HzSVN4YmUmR+wGKudIp6H9UsUNT0=",
+        "lastModified": 1789506231,
+        "narHash": "sha256-vNkJbtmqyBfFhn/HnzQo4ROuoyYWuy/allqTfJb4kMY=",
         "owner": "cachix",
         "repo": "devenv-nixpkgs",
-        "rev": "ee3d58d53cfcddfc0ae6fc7f04f4fe2a0c7cf0ed",
+        "rev": "c2f38fe7f9e04d9aadd354d380f2bd40531d9737",
         "type": "github"
       },
       "original": {
@@ -76,11 +76,11 @@
     "nixpkgs-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1786858016,
-        "narHash": "sha256-Vczr2zxD0orq6N2QQe5uqOGF7TRDcQJRRuAcsdHr4kg=",
+        "lastModified": 1789370336,
+        "narHash": "sha256-6RSEDHIWQtesQKWSu5qRai8L2h4KgCgMEfJHstW99G4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "54ba4bcec4043e72a4006d825e0d7aff5562008f",
+        "rev": "c7def046b9a883d46974757852106483d741586f",
         "type": "github"
       },
       "original": {
@@ -105,11 +105,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1786901030,
-        "narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=",
+        "lastModified": 1791203292,
+        "narHash": "sha256-vuzVwvjeucSnwKwMBpyP8r5IzdrMKCHEdwTrRFwUN7I=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa",
+        "rev": "03d8ee1bcbc8f9638907bb79edb9673151d0e22b",
         "type": "github"
       },
       "original": {

flake.lock

@@ -1,5 +1,25 @@
 {
   "nodes": {
+    "ai-usage": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1791814870,
+        "narHash": "sha256-z8oGuIY9I/MvgOoeNLBFg9aj9ySOEj6mw0224gQsh2U=",
+        "ref": "refs/heads/master",
+        "rev": "81ec07a9aa01d9d5773187c7ad285482f1bf1525",
+        "revCount": 3,
+        "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": 1787377438,
-        "narHash": "sha256-Sxu1NLTD/Ern6hFGLlZmtKCSct3YQXZI/lls8RE1XeM=",
+        "lastModified": 1792438572,
+        "narHash": "sha256-5mQQOcggBRBXB7NlzUxO0dbvQN4euJOISjNybrtfxPk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "65258d5c65a250189fde2e35f490d15e064c4c62",
+        "rev": "24f8f8e786f87d6a818e1746cb2389bf922afdab",
         "type": "github"
       },
       "original": {
@@ -23,11 +43,11 @@
     },
     "nix-flatpak": {
       "locked": {
-        "lastModified": 1783368811,
-        "narHash": "sha256-0H8jDwR4Kegb3heaTrH1ftbgKfZVDT8JE+46uXxDy/Q=",
+        "lastModified": 1791644268,
+        "narHash": "sha256-f7Z4PmfnRxf7+37NN48ep+KsQauGtL5REE99pJtMNp8=",
         "owner": "gmodena",
         "repo": "nix-flatpak",
-        "rev": "20d42f0ee98c9fe9f85e8d1de474f1409ed10d05",
+        "rev": "02656785ab214fa1c9655f1beaaf0269eeeec2ca",
         "type": "github"
       },
       "original": {
@@ -38,11 +58,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1788405554,
-        "narHash": "sha256-r2f1oUwixlgq9zOdYLqJLfS/lWBT60/IITjhTKI59JU=",
+        "lastModified": 1792615934,
+        "narHash": "sha256-MlvRfa1O5Cqc2/a+gG+l9TSuowEoCKCmrJ1d9oAVm0I=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a5cc6f2c37bf518436dc8d1c288ccd0c43c2f4c4",
+        "rev": "da6dc0e7b26060f2f71ce3ef7088fb56ee44fa36",
         "type": "github"
       },
       "original": {
@@ -54,11 +74,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1788400875,
-        "narHash": "sha256-JIHQ6xNAN53cdo6zZ72LRcQ9lpvnABCnNE4hldJ5uZU=",
+        "lastModified": 1792506237,
+        "narHash": "sha256-Q/8KLB6jNfpaUN1HAedE/u/Et9feE/zYSsutBLKrCFk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5545adfad2e98de106a5544ca7067e03010410bd",
+        "rev": "5adc50831c259f87faeb09ddf930d43597197473",
         "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,15 @@
     ../../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
+    ../../modules/photocraft.nix
   ];
 
-  boot.kernelPackages = pkgs.linuxPackages_7_1;
+  #  boot.kernelPackages = pkgs.linuxPackages_7_2;
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -42,7 +47,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,10 @@
     ../../modules/yazi.nix
     ../../modules/bubblewrap.nix
     ../../modules/socat.nix
+    ../../modules/cursor-cli.nix
+    ../../modules/git-churn.nix
+    ../../modules/ai-usage.nix
+    ../../modules/photocraft.nix
   ];
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
@@ -60,28 +64,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 +74,6 @@
     "149.210.174.226" = [ "kindertelefoon" ];
   };
 
+
   system.stateVersion = "25.11"; # Did you read the comment?
 }

modules/ai-usage.nix

@@ -0,0 +1,15 @@
+{ pkgs, ai-usage, home-manager, ... }:
+
+{
+  home-manager.users.avravels = {
+    imports = [ ai-usage.homeManagerModules.default ];
+    programs.ai-usage = {
+      enable = true;
+      providers.cursor.enable = true;
+      providers.codex.enable = false;
+      providers.claude.enable = false;
+      package = ai-usage.packages.${pkgs.stdenv.hostPlatform.system}.default;
+    };
+  };
+
+}

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

@@ -4,5 +4,6 @@
   programs.kitty = {
     enable = true;
     settings.confirm_quit = false;
+    settings.remember_window_size = false;
   };
 }

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

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

@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    (pkgs.callPackage ../packages/photocraft.nix { })
+  ];
+}

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

packages/photocraft.nix

@@ -0,0 +1,45 @@
+{ lib
+, appimageTools
+, fetchurl
+,
+}:
+
+let
+  pname = "photocraft";
+  version = "0.7.0";
+
+  src = fetchurl {
+    url = "https://github.com/storytold/photocraft/releases/download/v${version}/photocraft-${version}-linux-x86_64.AppImage";
+    hash = "sha256-h+vONrzfazHRapyiLOKfmtjbaBheTZgRiADRwt54rEI=";
+  };
+in
+appimageTools.wrapType2 {
+  inherit pname version src;
+
+  extraInstallCommands = ''
+    install -Dm644 ${src} $out/share/${pname}/source.AppImage
+
+    mkdir -p $out/share/applications
+    cat > $out/share/applications/${pname}.desktop <<EOF
+    [Desktop Entry]
+    Name=PhotoCraft
+    Comment=Open-source image editor
+    Exec=${pname} %F
+    Terminal=false
+    Type=Application
+    Categories=Graphics;RasterGraphics;
+    StartupNotify=true
+    EOF
+  '';
+
+  meta = {
+    description = "Open-source image editor";
+    homepage = "https://github.com/storytold/photocraft";
+    downloadPage = "https://github.com/storytold/photocraft/releases";
+    license = lib.licenses.mit;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    platforms = [ "x86_64-linux" ];
+    mainProgram = "photocraft";
+  };
+}
+