From 08f1b760858371149784df6b399b8fbba7bbae55 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Tue, 20 Aug 2024 18:13:34 +0200
Subject: ...

---
 _sources/generated.json          |  6 +++---
 _sources/generated.nix           |  6 +++---
 accounts/gkleen@sif/default.nix  | 12 +++++++++---
 accounts/gkleen@sif/zshrc        |  1 -
 nvfetcher.toml                   |  2 +-
 overlays/gup.nix                 |  8 ++++++++
 shell.nix                        |  2 +-
 system-profiles/core/default.nix |  2 +-
 8 files changed, 26 insertions(+), 13 deletions(-)
 create mode 100644 overlays/gup.nix

diff --git a/_sources/generated.json b/_sources/generated.json
index 2720c8d2..934d83a2 100644
--- a/_sources/generated.json
+++ b/_sources/generated.json
@@ -105,11 +105,11 @@
         "passthru": null,
         "pinned": false,
         "src": {
-            "sha256": "sha256-O9Z4ctYL9v0cgQQ0czYU1Gg+sNbd3jwUSI/Luu+MHcI=",
+            "sha256": "sha256-SEFyiKxfKC2Rx5tQ2OK8zEiCBFex2kZUY/vnnDsdCoc=",
             "type": "tarball",
-            "url": "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.13.tar.gz"
+            "url": "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.14.tar.gz"
         },
-        "version": "2.13"
+        "version": "2.14"
     },
     "mpv-autosave": {
         "cargoLocks": null,
diff --git a/_sources/generated.nix b/_sources/generated.nix
index 8bbe4a22..d4d97c03 100644
--- a/_sources/generated.nix
+++ b/_sources/generated.nix
@@ -61,10 +61,10 @@
   };
   lesspipe = {
     pname = "lesspipe";
-    version = "2.13";
+    version = "2.14";
     src = fetchTarball {
-      url = "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.13.tar.gz";
-      sha256 = "sha256-O9Z4ctYL9v0cgQQ0czYU1Gg+sNbd3jwUSI/Luu+MHcI=";
+      url = "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.14.tar.gz";
+      sha256 = "sha256-SEFyiKxfKC2Rx5tQ2OK8zEiCBFex2kZUY/vnnDsdCoc=";
     };
   };
   mpv-autosave = {
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 214b18a1..ed0de55b 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -163,7 +163,7 @@ in {
           enable = true;
 	        package = pkgs.emacs29-pgtk;
           extraPackages = epkgs: with epkgs; [
-            evil evil-dvorak undo-tree magit haskell-mode nix-mode
+            evil evil-dvorak undo-tree magit haskell-tng-mode nix-mode
             yaml-mode json-mode shakespeare-mode smart-mode-line
             highlight-parentheses highlight-symbol ag sass-mode lua-mode
             fira-code-mode use-package wanderlust # notmuch
@@ -171,6 +171,7 @@ in {
             edit-server mediawiki editorconfig typescript-mode
             markdown-mode nftables-mode rustic lsp-mode lsp-ui
             direnv company projectile tomorrow-night-paradise-theme
+            treesit-grammars.with-all-grammars
           ];
           overrides = self: super: {
             tomorrow-night-paradise-theme = super.trivialBuild {
@@ -558,7 +559,7 @@ in {
           socketActivation.enable = true;
           client = {
             enable = true;
-            arguments = mkForce ["-a" "\"\""];
+            arguments = mkForce ["--reuse-frame" "--alternate-editor" "\"\""];
           };
         };
         gpg-agent = {
@@ -693,7 +694,7 @@ in {
         ];
 
         file = {
-          ".emacs".source = ./emacs.el;
+          ".emacs.d/init.el".source = ./emacs.el;
           ".backup-munin".source = ./backup-patterns;
           ".mozilla/firefox/default/chrome/userChrome.css".source = ./firefox-chrome.css;
           ".mozilla/firefox/default/chrome/userContent.css".source = ./firefox-content.css;
@@ -711,6 +712,11 @@ in {
           QT_QPA_PLATFORMTHEME = "qt5ct";
           LIBVIRT_DEFAULT_URI = "qemu:///system";
           STACK_XDG = 1;
+          EDITOR = pkgs.writeShellScript "editor" ''
+            args=("--reuse-frame" "--alternate-editor" "")
+            args+=("$@")
+            exec -a emacsclient ${cfg.services.emacs.package}/bin/emacsclient "''${args[@]}"
+          '';
         };
 
         extraProfileCommands = ''
diff --git a/accounts/gkleen@sif/zshrc b/accounts/gkleen@sif/zshrc
index 82e66337..91c177c3 100644
--- a/accounts/gkleen@sif/zshrc
+++ b/accounts/gkleen@sif/zshrc
@@ -309,7 +309,6 @@ alias -g B='&> /dev/null &'
 alias -g BB='&> /dev/null &!'
 
 export DEFAULT_USER=gkleen
-export EDITOR=emacsclient
 
 bindkey -e
 bindkey ';5C' emacs-forward-word
diff --git a/nvfetcher.toml b/nvfetcher.toml
index c8b5efac..dcf5bd64 100644
--- a/nvfetcher.toml
+++ b/nvfetcher.toml
@@ -97,4 +97,4 @@ fetch.git = "https://github.com/jimeh/tomorrow-night-paradise-theme.el"
 [emoji-data]
 src.github_tag = "Mange/emoji-data"
 fetch.github = "Mange/emoji-data"
-git.fetchSubmodules = true
\ No newline at end of file
+git.fetchSubmodules = true
diff --git a/overlays/gup.nix b/overlays/gup.nix
new file mode 100644
index 00000000..9f738442
--- /dev/null
+++ b/overlays/gup.nix
@@ -0,0 +1,8 @@
+{ final, prev, sources, ... }: {
+  gup = prev.gup.overrideAttrs (oldAttrs: rec {
+    PYLINTRC = prev.writeText "pylintrc" ''
+      [MESSAGES CONTROL]
+      disable=E0606
+    '';
+  });
+}
diff --git a/shell.nix b/shell.nix
index 005187c7..5bcb8180 100644
--- a/shell.nix
+++ b/shell.nix
@@ -7,7 +7,7 @@ in pkgs.mkShell {
   nativeBuildInputs = builtins.attrValues self.packages.${system} ++ (with pkgs; [
     sops
     wireguard-tools
-    # gup
+    gup
     nftables
     deploy-rs.packages.${system}.deploy-rs
     knot-dns
diff --git a/system-profiles/core/default.nix b/system-profiles/core/default.nix
index b1898903..63b9a2b5 100644
--- a/system-profiles/core/default.nix
+++ b/system-profiles/core/default.nix
@@ -147,7 +147,7 @@ in {
           ).defaultNix.overlays
         ''}"
         "L+ /etc/nixos - - - - ${flake}"
-      ];
+      ] ++ map (input: "L+ /run/flake-inputs/${input} - - - - ${flakeInputs.${input}.outPath}") (attrNames flakeInputs);
 
       users.mutableUsers = false;
 
-- 
cgit v1.2.3