flake.lock

@@ -171,11 +171,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1731463490,
+        "lastModified": 1731290007,
-        "narHash": "sha256-AtyI66bBn9IX9s+rXQEJHrkAQv3430urS6IxK5m1Uzs=",
+        "narHash": "sha256-E8Caw6l/73iVFEYGch8Yc31fXCtSY30xxb+CsTN1gG0=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "395675b281ab1aea12ab75a6296b83e3b3152f13",
+        "rev": "e94b9aef9633ffb9ea2bebe8c9b999618ec15109",
         "type": "github"
       },
       "original": {
@@ -509,11 +509,11 @@
     },
     "nixos-facter-modules": {
       "locked": {
-        "lastModified": 1731425281,
+        "lastModified": 1730798058,
-        "narHash": "sha256-azk9oxzHkfYZcgBzAK3J9qdUQG0UjLSOjt8KzJ9rb8g=",
+        "narHash": "sha256-2KexAe17KRg2191SdBxVXqJKwV6MxKzlE35DDcAX+Ds=",
         "owner": "numtide",
         "repo": "nixos-facter-modules",
-        "rev": "505386dda29452140f93734509b03de57986af57",
+        "rev": "d0e205eafca7091caad3925ff82a46fea08351e1",
         "type": "github"
       },
       "original": {
@@ -524,11 +524,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1731403644,
+        "lastModified": 1730919458,
-        "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=",
+        "narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "f6581f1c3b137086e42a08a906bdada63045f991",
+        "rev": "e1cc1f6483393634aee94514186d21a4871e78d7",
         "type": "github"
       },
       "original": {
@@ -567,11 +567,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1731239293,
+        "lastModified": 1730963269,
-        "narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=",
+        "narHash": "sha256-rz30HrFYCHiWEBCKHMffHbMdWJ35hEkcRVU0h7ms3x0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9256f7c71a195ebe7a218043d9f93390d49e6884",
+        "rev": "83fb6c028368e465cd19bb127b86f971a5e41ebc",
         "type": "github"
       },
       "original": {
@@ -651,11 +651,11 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1731363552,
+        "lastModified": 1730814269,
-        "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
+        "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
+        "rev": "d70155fdc00df4628446352fc58adc640cd705c2",
         "type": "github"
       },
       "original": {
@@ -697,11 +697,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731464916,
+        "lastModified": 1731292155,
-        "narHash": "sha256-WZ5rpjr/wCt7yBOUsvDE2i22hYz9g8W921jlwVktRQ4=",
+        "narHash": "sha256-fYVoUUtSadbOrH0z0epVQDsStBDS/S/fAK//0ECQAAI=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "2c19bad6e881b5a154cafb7f9106879b5b356d1f",
+        "rev": "7c4cd99ed7604b79e8cb721099ac99c66f656b3a",
         "type": "github"
       },
       "original": {
@@ -718,11 +718,11 @@
         "nixpkgs-stable": "nixpkgs-stable_3"
       },
       "locked": {
-        "lastModified": 1731364708,
+        "lastModified": 1731213149,
-        "narHash": "sha256-HC0anOL+KmUQ2hdRl0AtunbAckasxrkn4VLmxbW/WaA=",
+        "narHash": "sha256-jR8i6nFLmSmm0cIoeRQ8Q4EBARa3oGaAtEER/OMMxus=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "4c91d52db103e757fc25b58998b0576ae702d659",
+        "rev": "f1675e3b0e1e663a4af49be67ecbc9e749f85eb7",
         "type": "github"
       },
       "original": {

home-manager/modules/emacs/config.org

@@ -1425,7 +1425,7 @@ Enable and configure =auto-insert-mode= for Horus projects
 
   (when (file-executable-p my/generate-cpp-file-executable)
     (define-auto-insert
-      "\\.[ch]pp\\'"
+      (rx ".[ch]pp" eos)
       (lambda nil (call-process my/generate-cpp-file-executable nil t nil buffer-file-name))))
 
 

home-manager/modules/git/default.nix

@@ -74,8 +74,6 @@ in
 
       difftastic = {
         enable = true;
-        background = "dark";
-        display = "inline";
       };
 
       aliases = {

home-manager/modules/jujutsu/default.nix

@@ -1,84 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}:
-with lib;
-let
-  cfg = config.eboskma.programs.jujutsu;
-in
-{
-  options.eboskma.programs.jujutsu = {
-    enable = mkEnableOption "jujutsu";
-    name = mkOption {
-      description = "your name";
-      type = types.nonEmptyStr;
-    };
-
-    email = mkOption {
-      description = "your e-mail address";
-      type = types.nonEmptyStr;
-    };
-
-    signingKey = mkOption {
-      description = "your signing key";
-      type = types.nullOr types.str;
-      default = null;
-    };
-
-    signingBackend = mkOption {
-      description = "the type of signing key";
-      type = types.enum [
-        "gpg"
-        "ssh"
-      ];
-      default = "openpgp";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    programs.jujutsu = {
-      enable = true;
-      settings = {
-        user = {
-          name = cfg.name;
-          email = cfg.email;
-        };
-
-        core = {
-          fsmonitor = "watchman";
-          watchman.register_snapshot_triggers = true;
-        };
-
-        ui = {
-          diff = {
-            tool = "difftastic";
-          };
-          pager = lib.getExe pkgs.bat;
-        };
-
-        diff.difftastic = {
-          program = lib.getExe pkgs.difftastic;
-          diff-args = [
-            "--color=auto"
-            "--background=dark"
-            "--display=side-by-side-show-both"
-            "$left"
-            "$right"
-          ];
-
-        };
-
-        signing = {
-          sign-all = true;
-          backend = cfg.signingBackend;
-          key = cfg.signingKey;
-        };
-
-      };
-    };
-
-    home.packages = with pkgs; [ watchman ];
-  };
-}

users/erwin/home.nix

@@ -199,8 +199,7 @@ in
         username = "erwin";
         homeDirectory = "/home/erwin";
         sessionVariables = {
-          EDITOR = "${config.home-manager.users.erwin.eboskma.programs.emacs.package}/bin/emacs -nw";
+          EDITOR = "${config.home-manager.users.erwin.eboskma.programs.emacs.package}/bin/emacsclient -c";
-          VISUAL = "${config.home-manager.users.erwin.eboskma.programs.emacs.package}/bin/emacsclient -c";
         };
 
         stateVersion = "24.05";

users/erwin/work.nix

@@ -93,13 +93,6 @@ in
               }
             ];
           };
-          jujutsu = {
-            enable = true;
-            name = "Erwin Boskma";
-            email = "erwin@horus.nu";
-            signingKey = "~/.ssh/id_ed25519_sk_horus.pub";
-            signingBackend = "ssh";
-          };
           mpd.enable = true;
           neovim.enable = true;
           nushell.enable = true;
@@ -222,8 +215,7 @@ in
         username = "erwin";
         homeDirectory = "/home/erwin";
         sessionVariables = {
-          EDITOR = "${config.home-manager.users.erwin.eboskma.programs.emacs.package}/bin/emacs -nw";
+          EDITOR = "${config.home-manager.users.erwin.eboskma.programs.emacs.package}/bin/emacsclient -c";
-          VISUAL = "${config.home-manager.users.erwin.eboskma.programs.emacs.package}/bin/emacsclient -c";
         };
         stateVersion = "24.05";
 
@@ -274,7 +266,6 @@ in
             ripgrep
             s-tui
             stress
-            tio
             units
             unzip
             xdg-utils