update dmenu and st and also change color themes
This commit is contained in:
		@@ -33,6 +33,7 @@ c-white-2   "#ecebec")
 | 
				
			|||||||
(set-face-attribute 'default nil :font "Monoid" :height 120)
 | 
					(set-face-attribute 'default nil :font "Monoid" :height 120)
 | 
				
			||||||
#+end_src
 | 
					#+end_src
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
** Some mode settings based on personal preferences
 | 
					** Some mode settings based on personal preferences
 | 
				
			||||||
#+begin_src emacs-lisp
 | 
					#+begin_src emacs-lisp
 | 
				
			||||||
(global-hl-line-mode 1)
 | 
					(global-hl-line-mode 1)
 | 
				
			||||||
@@ -44,6 +45,7 @@ c-white-2   "#ecebec")
 | 
				
			|||||||
(global-display-line-numbers-mode 1)
 | 
					(global-display-line-numbers-mode 1)
 | 
				
			||||||
#+end_src
 | 
					#+end_src
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
** Setting some variables
 | 
					** Setting some variables
 | 
				
			||||||
#+begin_src emacs-lisp
 | 
					#+begin_src emacs-lisp
 | 
				
			||||||
(setq initial-major-mode 'emacs-lisp-mode
 | 
					(setq initial-major-mode 'emacs-lisp-mode
 | 
				
			||||||
@@ -55,6 +57,7 @@ c-white-2   "#ecebec")
 | 
				
			|||||||
      inhibit-startup-screen t)
 | 
					      inhibit-startup-screen t)
 | 
				
			||||||
#+end_src
 | 
					#+end_src
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
** Emacs startup hook
 | 
					** Emacs startup hook
 | 
				
			||||||
#+begin_src emacs-lisp
 | 
					#+begin_src emacs-lisp
 | 
				
			||||||
(add-hook 'emacs-startup-hook
 | 
					(add-hook 'emacs-startup-hook
 | 
				
			||||||
@@ -106,6 +109,7 @@ Remap ivy keys to Colemak-DH
 | 
				
			|||||||
  (ivy-mode 1))
 | 
					  (ivy-mode 1))
 | 
				
			||||||
#+end_src
 | 
					#+end_src
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
** Evil
 | 
					** Evil
 | 
				
			||||||
*** Configure evil mode
 | 
					*** Configure evil mode
 | 
				
			||||||
#+begin_src emacs-lisp
 | 
					#+begin_src emacs-lisp
 | 
				
			||||||
@@ -135,6 +139,7 @@ To get colemak-dh bindings in evil mode
 | 
				
			|||||||
  (global-evil-colemak-basics-mode 1))
 | 
					  (global-evil-colemak-basics-mode 1))
 | 
				
			||||||
#+end_src
 | 
					#+end_src
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
** Treemacs
 | 
					** Treemacs
 | 
				
			||||||
*** Configure treemacs
 | 
					*** Configure treemacs
 | 
				
			||||||
#+begin_src emacs-lisp
 | 
					#+begin_src emacs-lisp
 | 
				
			||||||
@@ -145,6 +150,7 @@ To get colemak-dh bindings in evil mode
 | 
				
			|||||||
  (treemacs-git-mode 'deferred))
 | 
					  (treemacs-git-mode 'deferred))
 | 
				
			||||||
#+end_src
 | 
					#+end_src
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
** Configure treemacs-evil
 | 
					** Configure treemacs-evil
 | 
				
			||||||
Configure treemacs-evil to get colemak-dh bindings
 | 
					Configure treemacs-evil to get colemak-dh bindings
 | 
				
			||||||
#+begin_src emacs-lisp
 | 
					#+begin_src emacs-lisp
 | 
				
			||||||
@@ -161,6 +167,7 @@ Configure treemacs-evil to get colemak-dh bindings
 | 
				
			|||||||
 )
 | 
					 )
 | 
				
			||||||
#+end_src
 | 
					#+end_src
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
** LSP
 | 
					** LSP
 | 
				
			||||||
*** Configure lsp-mode
 | 
					*** Configure lsp-mode
 | 
				
			||||||
#+begin_src emacs-lisp
 | 
					#+begin_src emacs-lisp
 | 
				
			||||||
@@ -191,6 +198,7 @@ Configure treemacs-evil to get colemak-dh bindings
 | 
				
			|||||||
  (lsp-ui-doc-enable 1))
 | 
					  (lsp-ui-doc-enable 1))
 | 
				
			||||||
#+end_src
 | 
					#+end_src
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
** Company
 | 
					** Company
 | 
				
			||||||
*** Configure company
 | 
					*** Configure company
 | 
				
			||||||
For autocomplete
 | 
					For autocomplete
 | 
				
			||||||
@@ -211,6 +219,7 @@ For autocomplete
 | 
				
			|||||||
  :hook (company-mode . company-quickhelp-mode))
 | 
					  :hook (company-mode . company-quickhelp-mode))
 | 
				
			||||||
#+end_src
 | 
					#+end_src
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
** Treesitter
 | 
					** Treesitter
 | 
				
			||||||
#+begin_src emacs-lisp
 | 
					#+begin_src emacs-lisp
 | 
				
			||||||
(use-package tree-sitter-langs)
 | 
					(use-package tree-sitter-langs)
 | 
				
			||||||
@@ -237,11 +246,13 @@ For autocomplete
 | 
				
			|||||||
  "\\.nomad\\'")
 | 
					  "\\.nomad\\'")
 | 
				
			||||||
#+end_src
 | 
					#+end_src
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
** Magit
 | 
					** Magit
 | 
				
			||||||
#+begin_src emacs-lisp
 | 
					#+begin_src emacs-lisp
 | 
				
			||||||
(use-package magit)
 | 
					(use-package magit)
 | 
				
			||||||
#+end_src
 | 
					#+end_src
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
* VTerm
 | 
					* VTerm
 | 
				
			||||||
*** Configure vterm
 | 
					*** Configure vterm
 | 
				
			||||||
#+begin_src emacs-lisp
 | 
					#+begin_src emacs-lisp
 | 
				
			||||||
@@ -315,6 +326,7 @@ For autocomplete
 | 
				
			|||||||
(use-package general)
 | 
					(use-package general)
 | 
				
			||||||
#+end_src
 | 
					#+end_src
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
* Mode specific hooks
 | 
					* Mode specific hooks
 | 
				
			||||||
#+begin_src emacs-lisp
 | 
					#+begin_src emacs-lisp
 | 
				
			||||||
(add-hook 'c-mode-hook 'lsp)
 | 
					(add-hook 'c-mode-hook 'lsp)
 | 
				
			||||||
@@ -378,6 +390,7 @@ For autocomplete
 | 
				
			|||||||
	   ))))
 | 
						   ))))
 | 
				
			||||||
#+end_comment
 | 
					#+end_comment
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
* Pop-up terminal
 | 
					* Pop-up terminal
 | 
				
			||||||
Stolen from [[https://www.reddit.com/r/emacs/comments/ft84xy/run_shell_command_in_new_vterm/][this]] reddit post
 | 
					Stolen from [[https://www.reddit.com/r/emacs/comments/ft84xy/run_shell_command_in_new_vterm/][this]] reddit post
 | 
				
			||||||
#+begin_src emacs-lisp
 | 
					#+begin_src emacs-lisp
 | 
				
			||||||
@@ -423,6 +436,7 @@ This returns the command to run in the terminal
 | 
				
			|||||||
           ("rs" (concat "rustc" full " -o " file " && " file " && rm " file)))))
 | 
					           ("rs" (concat "rustc" full " -o " file " && " file " && rm " file)))))
 | 
				
			||||||
#+end_src
 | 
					#+end_src
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
* Keybinds
 | 
					* Keybinds
 | 
				
			||||||
** General
 | 
					** General
 | 
				
			||||||
#+begin_src emacs-lisp
 | 
					#+begin_src emacs-lisp
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,8 +2,8 @@ final: prev: {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  dmenu = prev.dmenu.overrideAttrs (oldAttrs: rec {
 | 
					  dmenu = prev.dmenu.overrideAttrs (oldAttrs: rec {
 | 
				
			||||||
    src = builtins.fetchTarball {
 | 
					    src = builtins.fetchTarball {
 | 
				
			||||||
      url = "https://dl.suckless.org/tools/dmenu-5.0.tar.gz";
 | 
					      url = "https://dl.suckless.org/tools/dmenu-5.1.tar.gz";
 | 
				
			||||||
      sha256 = "0gjjbh49j85rpbmiqj236g4c1zb1h8xh41mcjsvnzgwn72893mk6";
 | 
					      sha256 = "1zwl0qlc4mmr973km03lmnfxjibdh2inwzb0vr6pvrfhrm0glvrk";
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
    patches = [ ./patches/dmenu.patch ];
 | 
					    patches = [ ./patches/dmenu.patch ];
 | 
				
			||||||
  });
 | 
					  });
 | 
				
			||||||
@@ -18,8 +18,8 @@ final: prev: {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  st = prev.st.overrideAttrs (oldAttrs: rec {
 | 
					  st = prev.st.overrideAttrs (oldAttrs: rec {
 | 
				
			||||||
    src = builtins.fetchTarball {
 | 
					    src = builtins.fetchTarball {
 | 
				
			||||||
      url = "https://dl.suckless.org/st/st-0.8.4.tar.gz";
 | 
					      url = "https://dl.suckless.org/st/st-0.8.5.tar.gz";
 | 
				
			||||||
      sha256 = "01z6i60fmdi5h6g80rgvqr6d00jxszphrldx07w4v6nq8cq2r4nr";
 | 
					      sha256 = "0iy7sj40m5x7wr4qkicijckk3cb0h9815mzacfjb3xrlrvpx6hm5";
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
    patches = [ ./patches/st.patch ];
 | 
					    patches = [ ./patches/st.patch ];
 | 
				
			||||||
  });
 | 
					  });
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -17,12 +17,12 @@ diff --color -u a/config.def.h b/config.def.h
 | 
				
			|||||||
 	/*     fg         bg       */
 | 
					 	/*     fg         bg       */
 | 
				
			||||||
-	[SchemeNorm] = { "#bbbbbb", "#222222" },
 | 
					-	[SchemeNorm] = { "#bbbbbb", "#222222" },
 | 
				
			||||||
-	[SchemeSel] = { "#eeeeee", "#005577" },
 | 
					-	[SchemeSel] = { "#eeeeee", "#005577" },
 | 
				
			||||||
+	[SchemeNorm] = { "#bbbbbb", "#1d2021" },
 | 
					+	[SchemeNorm] = { "#839496", "#002b36" },
 | 
				
			||||||
+	[SchemeSel] = { "#1d2021", "#ebdbb2" },
 | 
					+	[SchemeSel] = { "#002b36", "#839496" },
 | 
				
			||||||
+	[SchemeSelHighlight] = { "#000080", "#ebdbb2" },
 | 
					+	[SchemeSelHighlight] = { "#d33682", "#839496" },
 | 
				
			||||||
+	[SchemeNormHighlight] = { "#ffc978", "#1d2021" },
 | 
					+	[SchemeNormHighlight] = { "#2aa198", "#002b36" },
 | 
				
			||||||
 	[SchemeOut] = { "#000000", "#00ffff" },
 | 
					 	[SchemeOut] = { "#000000", "#00ffff" },
 | 
				
			||||||
+	[SchemeOutHighlight] = { "#ffc978", "#00ffff" },
 | 
					+	[SchemeOutHighlight] = { "#fdf6e3", "#cb4b16" },
 | 
				
			||||||
 };
 | 
					 };
 | 
				
			||||||
 /* -l option; if nonzero, dmenu uses vertical list with given number of lines */
 | 
					 /* -l option; if nonzero, dmenu uses vertical list with given number of lines */
 | 
				
			||||||
 static unsigned int lines      = 0;
 | 
					 static unsigned int lines      = 0;
 | 
				
			||||||
 
 | 
				
			|||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
		Reference in New Issue
	
	Block a user