update

.gitignore

@@ -1 +1,2 @@
 .direnv/
+.DS_Store

_sources/generated.json

@@ -0,0 +1,42 @@
+{
+    "intuitive-tab-line": {
+        "cargoLocks": null,
+        "date": "2024-07-13",
+        "extract": null,
+        "name": "intuitive-tab-line",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "owner": "thread314",
+            "repo": "intuitive-tab-line-mode",
+            "rev": "7af75e46bbb22927e53df8d3664e1873234416f5",
+            "sha256": "sha256-GQ0ERmw/7EUrTIVHAxp2ggkr9RdWVJSJ6loVzZjDEy0=",
+            "type": "github"
+        },
+        "version": "7af75e46bbb22927e53df8d3664e1873234416f5"
+    },
+    "sideline-eglot": {
+        "cargoLocks": null,
+        "date": "2024-08-05",
+        "extract": null,
+        "name": "sideline-eglot",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "owner": "emacs-sideline",
+            "repo": "sideline-eglot",
+            "rev": "d7fbb9e13edbe5b9b9de464c8dabb8b0014de78e",
+            "sha256": "sha256-/NCclLf4stF4+C1W+s2Y+LJ0TgqGAxVDa6v7+H+3/vA=",
+            "type": "github"
+        },
+        "version": "d7fbb9e13edbe5b9b9de464c8dabb8b0014de78e"
+    }
+}

_sources/generated.nix

@@ -0,0 +1,28 @@
+# This file was generated by nvfetcher, please do not modify it manually.
+{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }:
+{
+  intuitive-tab-line = {
+    pname = "intuitive-tab-line";
+    version = "7af75e46bbb22927e53df8d3664e1873234416f5";
+    src = fetchFromGitHub {
+      owner = "thread314";
+      repo = "intuitive-tab-line-mode";
+      rev = "7af75e46bbb22927e53df8d3664e1873234416f5";
+      fetchSubmodules = false;
+      sha256 = "sha256-GQ0ERmw/7EUrTIVHAxp2ggkr9RdWVJSJ6loVzZjDEy0=";
+    };
+    date = "2024-07-13";
+  };
+  sideline-eglot = {
+    pname = "sideline-eglot";
+    version = "d7fbb9e13edbe5b9b9de464c8dabb8b0014de78e";
+    src = fetchFromGitHub {
+      owner = "emacs-sideline";
+      repo = "sideline-eglot";
+      rev = "d7fbb9e13edbe5b9b9de464c8dabb8b0014de78e";
+      fetchSubmodules = false;
+      sha256 = "sha256-/NCclLf4stF4+C1W+s2Y+LJ0TgqGAxVDa6v7+H+3/vA=";
+    };
+    date = "2024-08-05";
+  };
+}

config/default.nix

@@ -1,5 +1,7 @@
 {pkgs, ...}:
 with pkgs;
+let sources = import ../_sources/generated.nix {inherit (pkgs) fetchurl fetchFromGitHub fetchgit dockerTools;};
+    in
   emacsWithPackagesFromUsePackage {
     config = ./init.org;
     defaultInitFile = true;
@@ -52,8 +54,12 @@ with pkgs;
       epkgs
       // {
         sideline-eglot = callPackage ./extraPackages/sideline-eglot.nix {
-          inherit (pkgs) fetchFromGitHub;
+          inherit sources;
           inherit (epkgs) trivialBuild sideline;
         };
+        intuitive-tab-line = callPackage ./extraPackages/intuitive-tab-line.nix {
+          inherit sources;
+          inherit (epkgs) trivialBuild;
+        };
       };
   }

config/extraPackages/intuitive-tab-line.nix

@@ -0,0 +1,7 @@
+{
+  trivialBuild,
+  sources,
+}:
+trivialBuild {
+  inherit (sources.intuitive-tab-line) pname version src;
+}

config/extraPackages/sideline-eglot.nix

@@ -1,19 +1,10 @@
 {
   sideline,
   trivialBuild,
-  fetchFromGitHub,
+  sources,
 }:
 trivialBuild rec {
-  pname = "sideline-eglot";
+  inherit (sources.sideline-eglot) pname version src;
-  version = "main-12-08-2024";
+  propagatedUserEnvPkgs = [sideline];
-  src = fetchFromGitHub {
-    owner = "emacs-sideline";
-    repo = "sideline-eglot";
-    rev = "d7fbb9e13edbe5b9b9de464c8dabb8b0014de78e";
-    hash = "sha256-/NCclLf4stF4+C1W+s2Y+LJ0TgqGAxVDa6v7+H+3/vA=";
-  };
-  propagatedUserEnvPkgs = [
-    sideline
-  ];
   buildInputs = propagatedUserEnvPkgs;
 }

config/init.org

@@ -13,6 +13,18 @@
   (unless (server-running-p) (server-start))
 #+end_src
 
+** No Scratch On Open
+
+#+begin_src emacs-lisp
+  (setq initial-scratch-message nil)
+  (setq initial-buffer-choice nil)
+  (add-hook 'emacs-startup-hook
+	    (lambda ()
+	      (when (and (get-buffer "*scratch*")
+			 (not (eq (current-buffer) (get-buffer "*scratch*"))))
+		(kill-buffer "*scratch*"))))
+#+end_src
+
 ** Fix Indents
 
 #+begin_src emacs-lisp
@@ -255,7 +267,7 @@
 
 #+begin_src emacs-lisp
   (use-package vterm-toggle :ensure t)
-  (global-set-key [C-t] 'vterm-toggle)
+  (global-set-key (kbd "C-t") 'vterm-toggle)
 #+end_src
 
 * Evil Mode and Keybindings
@@ -297,6 +309,7 @@
     (global-evil-leader-mode)
     (setq evil-leader/leader "<SPC>")
     (evil-leader/set-key "a" #'eglot-code-actions)
+    (evil-leader/set-key "bd" #'kill-this-buffer)
     (evil-leader/set-key "e" #'treemacs))
 #+end_src
 
@@ -322,16 +335,22 @@
 
 * Tab Management
 
-** Centaur Tabs
+** Intuitive Tabline
 
 #+begin_src emacs-lisp
-  (use-package centaur-tabs
+  (use-package intuitive-tab-line
-    :demand t
+    :load-path "git/intuitive-tab-line-mode"
+    :custom
+    (tab-line-tabs-function 'intuitive-tab-line-buffers-list)
+    (tab-line-switch-cycling t)
     :config
-    (centaur-tabs-mode t)
+    (global-tab-line-mode 1)
-    (setq centaur-tabs-style "wave")
+    (recentf-mode 1)
-    (setq centaur-tabs-cycle-scope 'tabs)
+    (setq
-    :bind
+     tab-line-separator " | "  ;; delimitation between tabs
-    ("C-<tab>" . centaur-tabs-forward)
+     ))
-    ("C-S-<tab>" . centaur-tabs-backward))
+
+  (global-set-key (kbd "C-S-<tab>") 'tab-line-switch-to-prev-tab)
+  (global-set-key (kbd "C-<tab>") 'tab-line-switch-to-next-tab)
+  (global-set-key (kbd "C-S-t") 'recentf-open-most-recent-file)
 #+end_src

flake.nix

@@ -21,7 +21,9 @@
         config.allowUnfree = true;
         overlays = [emacs-overlay.overlay];
       };
-    in rec {
+
+      emacs = import ./config {inherit pkgs;};
+    in {
       formatter = treefmt-nix.lib.mkWrapper pkgs {
         projectRootFile = "flake.nix";
         programs = {
@@ -31,11 +33,14 @@
         };
       };
 
-      packages.default = import ./config {inherit pkgs;};
+      packages = {
+        inherit emacs;
+        default = emacs;
+      };
 
       devShells.default = pkgs.mkShell {
         buildInputs = with pkgs; [
-          packages.default
+          emacs
           alejandra
           nvfetcher
           stylua

nvfetcher.toml

@@ -0,0 +1,7 @@
+[sideline-eglot]
+src.git = "https://github.com/emacs-sideline/sideline-eglot"
+fetch.github = "emacs-sideline/sideline-eglot"
+
+[intuitive-tab-line]
+src.git = "https://github.com/thread314/intuitive-tab-line-mode"
+fetch.github = "thread314/intuitive-tab-line-mode"