From bb870d667e2911b5335bea9322b6550f4374477f Mon Sep 17 00:00:00 2001 From: pupbrained Date: Thu, 15 Aug 2024 01:18:37 -0400 Subject: [PATCH] testing --- _sources/generated.json | 15 +++++++++++++++ _sources/generated.nix | 8 ++++++++ config/default.nix | 11 ++++------- config/init.org | 21 +++++++++++++++++---- nvfetcher.toml | 6 +++++- 5 files changed, 49 insertions(+), 12 deletions(-) diff --git a/_sources/generated.json b/_sources/generated.json index b38d85d..f9a7dd6 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -1,4 +1,19 @@ { + "fix-window-role": { + "cargoLocks": null, + "date": null, + "extract": null, + "name": "fix-window-role", + "passthru": null, + "pinned": false, + "src": { + "name": null, + "sha256": "sha256-H4Qj6n5uZsmsbdjjexGZctqhJk3gAXKiSnmnEO/LgTA=", + "type": "url", + "url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-28/fix-window-role.patch" + }, + "version": "0.1.0" + }, "intuitive-tab-line": { "cargoLocks": null, "date": "2024-07-13", diff --git a/_sources/generated.nix b/_sources/generated.nix index 3c5e480..b9a20a8 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -1,6 +1,14 @@ # This file was generated by nvfetcher, please do not modify it manually. { fetchgit, fetchurl, fetchFromGitHub, dockerTools }: { + fix-window-role = { + pname = "fix-window-role"; + version = "0.1.0"; + src = fetchurl { + url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-28/fix-window-role.patch"; + sha256 = "sha256-H4Qj6n5uZsmsbdjjexGZctqhJk3gAXKiSnmnEO/LgTA="; + }; + }; intuitive-tab-line = { pname = "intuitive-tab-line"; version = "7af75e46bbb22927e53df8d3664e1873234416f5"; diff --git a/config/default.nix b/config/default.nix index 2c00207..c96194f 100644 --- a/config/default.nix +++ b/config/default.nix @@ -1,7 +1,7 @@ {pkgs, ...}: -with pkgs; -let sources = import ../_sources/generated.nix {inherit (pkgs) fetchurl fetchFromGitHub fetchgit dockerTools;}; - in +with pkgs; let + sources = import ../_sources/generated.nix {inherit (pkgs) fetchurl fetchFromGitHub fetchgit dockerTools;}; +in emacsWithPackagesFromUsePackage { config = ./init.org; defaultInitFile = true; @@ -14,10 +14,7 @@ let sources = import ../_sources/generated.nix {inherit (pkgs) fetchurl fetchFro (old.patches or []) ++ [ # Fix OS window role (needed for window managers like yabai) - (fetchpatch { - url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-28/fix-window-role.patch"; - sha256 = "0c41rgpi19vr9ai740g09lka3nkjk48ppqyqdnncjrkfgvm2710z"; - }) + (sources.fix-window-role.src) # Use poll instead of select to get file descriptors (fetchpatch { url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-29/poll.patch"; diff --git a/config/init.org b/config/init.org index 7758934..47dc27f 100644 --- a/config/init.org +++ b/config/init.org @@ -185,7 +185,7 @@ (setq treesit-font-lock-level 4)) (use-package tree-sitter-langs) - + (use-package tree-sitter :diminish :after (tree-sitter-langs) @@ -338,6 +338,8 @@ ** Intuitive Tabline #+begin_src emacs-lisp + (use-package powerline) + (use-package intuitive-tab-line :load-path "git/intuitive-tab-line-mode" :custom @@ -346,9 +348,20 @@ :config (global-tab-line-mode 1) (recentf-mode 1) - (setq - tab-line-separator " | " ;; delimitation between tabs - )) + (setq tab-line-separator "")) + + (setq tab-line-new-button-show nil) + (setq tab-line-close-button-show nil) + (defvar my/tab-height 24) + (defvar my/tab-left (powerline-wave-right 'tab-line nil my/tab-height)) + (defvar my/tab-right (powerline-wave-left nil 'tab-line my/tab-height)) + + (defun my/tab-line-tab-name-buffer (buffer &optional _buffers) + (powerline-render (list my/tab-left + (format "%s" (buffer-name buffer)) + my/tab-right))) + + (setq tab-line-tab-name-function #'my/tab-line-tab-name-buffer) (global-set-key (kbd "C-S-") 'tab-line-switch-to-prev-tab) (global-set-key (kbd "C-") 'tab-line-switch-to-next-tab) diff --git a/nvfetcher.toml b/nvfetcher.toml index 60b191d..9c6b6d3 100644 --- a/nvfetcher.toml +++ b/nvfetcher.toml @@ -4,4 +4,8 @@ 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" \ No newline at end of file +fetch.github = "thread314/intuitive-tab-line-mode" + +[fix-window-role] +src.manual = "latest" +fetch.url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-28/fix-window-role.patch" \ No newline at end of file