git config removed gpg signkey, rofi theme updated to catpuccin

emacs config update Signed-off-by: Nigel <nigelbarink@hotmail.com>
new emacs config
2025-01-21 21:06:59 +01:00 · 2025-01-21 20:53:08 +01:00 · 2025-01-17 22:51:33 +01:00 · 2025-01-17 22:41:24 +01:00 · 2024-09-29 02:39:41 +02:00 · 2024-05-28 21:16:06 +02:00
27 changed files with 628 additions and 365 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +0,0 @@
-[submodule "nvim"]
-	path = nvim
-	url = gitea@git.barink.dev:Nigel/neovim_config.git
--- a/README.md
+++ b/README.md
@ -7,7 +7,7 @@
 ## Rice 

 ### Tokyo Night ( KDE with I3 ) 
-![TokyoNight Rice of Debian 12](DebianRice_TokyoNight_KDE_i3.png)
+![TokyoNight Rice of Debian 12](rice/DebianRice_TokyoNight_KDE_i3.png)

 Resources used:

--- a/emacs/dot-emacs
+++ b/emacs/dot-emacs
@ -0,0 +1,90 @@
+; set variables
+(setq ido-enable-flex-matching t)
+(setq ido-everywhere t)
+(setq inhibit-splash-screen t)
+(setq tab-width 4)
+(setq custom-file "~/emacs-custom.el")
+(setq display-line-numbers 'relative)
+
+; Toggle modes
+(ido-mode 1)
+(tool-bar-mode -1)
+(toggle-scroll-bar -1)
+(menu-bar-mode -1)
+(global-display-line-numbers-mode 1)
+
+; Install and load packages
+(require 'package)
+(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t)
+(package-initialize)
+
+(require 'use-package-ensure)
+(setq use-package-always-ensure t)
+
+(use-package catppuccin-theme)
+(use-package magit)
+(use-package paredit)
+
+
+(use-package evil
+  :init
+  (setq evil-want-integration t)
+  (setq evil-want-keybinding nil)
+  :config
+  (evil-mode 1)
+  )
+
+(use-package evil-collection
+  :pin melpa
+  :after evil
+  :config
+  (evil-collection-init))
+
+(use-package all-the-icons)
+(use-package nerd-icons)
+  
+(use-package lsp-mode
+  :commands (lsp lsp-deferred)
+  :init
+  (setq lsp-keymap-prefix "C-c l")
+  )
+
+(use-package lsp-ui
+  :after lsp-mode
+  :hook (lsp-mode . lsp-ui-mode)
+  :custom
+  (lsp-ui-doc-position 'bottom))
+
+(use-package fzf
+  :bind
+  :config
+  (setq fzf/args "-x --color bw --print-query --margin=1,0 --no-hscroll"
+	fzf/executable "fzf"
+	fzf/git-grep-args "-i --line-number %s"
+	fzf/grep-command "grep -nrH"
+	fzf/position-bottom t
+	fzf/window-height 15))
+
+(use-package consult
+  :bind
+  ;; Keybindings
+  :hook (completion-list-mode . consult-preview-at-point-mode)
+  :init
+  (setq register-preview-delay 0.5)
+  (setq xref-show-xrefs-function #'consult-xref
+	xref-show-definitions-function #'consult-xref)) 
+
+(use-package magit-delta
+  :hook (magit-mode . magit-delta-mode)
+  )
+
+
+; activate font and theme
+(add-to-list 'default-frame-alist '(font .  "SF Mono"))
+(set-face-attribute 'default t :font "SF Mono")
+(load-theme 'catppuccin :no-confirm)
+(setq catppuccin-flavor 'frappe)
+(set-frame-parameter nil 'alpha-background 80)
+(add-to-list 'default-frame-alist '(alpha-background . 80))
+
+(load custom-file)
--- a/git/dot-gitconfig
+++ b/git/dot-gitconfig
@ -1,7 +1,6 @@
 [user]
 	email = nigelbarink@hotmail.com
 	name = Nigel
-	signingkey = C54278C495538619
 [filter "lfs"]
 	clean = git-lfs clean -- %f
 	smudge = git-lfs smudge -- %f
@ -10,4 +9,4 @@
 [init]
 	defaultBranch = main
 [commit]
-	gpgsign = true
+	gpgsign = false 
--- a/i3/catpuccin
+++ b/i3/catpuccin
@ -0,0 +1,22 @@
+# target                 title     bg    text   indicator  border
+client.focused           $lavender $base $text  $rosewater $lavender
+client.focused_inactive  $overlay0 $base $text  $rosewater $overlay0
+client.unfocused         $overlay0 $base $text  $rosewater $overlay0
+client.urgent            $peach    $base $peach $overlay0  $peach
+client.placeholder       $overlay0 $base $text  $overlay0  $overlay0
+client.background        $base
+
+# bar
+# bar {
+#   colors {
+#     background         $base
+#     statusline         $text
+#     focused_statusline $text
+#     focused_separator  $base
+#     focused_workspace  $base $base $green
+#     active_workspace   $base $base $blue
+#     inactive_workspace $base $base $surface1
+#     urgent_workspace   $base $base $surface1
+#     binding_mode       $base $base $surface1
+#   }
+# }
--- a/i3/catpuccin-macchiato
+++ b/i3/catpuccin-macchiato
@ -0,0 +1,26 @@
+set $rosewater #f4dbd6
+set $flamingo #f0c6c6
+set $pink #f5bde6
+set $mauve #c6a0f6
+set $red #ed8796
+set $maroon #ee99a0
+set $peach #f5a97f
+set $yellow #eed49f
+set $green #a6da95
+set $teal #8bd5ca
+set $sky #91d7e3
+set $sapphire #7dc4e4
+set $blue #8aadf4
+set $lavender #b7bdf8
+set $text #cad3f5
+set $subtext1 #b8c0e0
+set $subtext0 #a5adcb
+set $overlay2 #939ab7
+set $overlay1 #8087a2
+set $overlay0 #6e738d
+set $surface2 #5b6078
+set $surface1 #494d64
+set $surface0 #363a4f
+set $base #24273a
+set $mantle #1e2030
+set $crust #181926
--- a/i3/config
+++ b/i3/config
@ -15,7 +15,10 @@ set $mod Mod4
 # is used in the bar {} block below.
 font pango:Hack Nerd Font 11
 exec --no-startup-id picom -b
-exec --no-startup-id feh --bg-fill $HOME/Pictures/Wallpapers/430795.jpg
+exec --no-startup-id feh --bg-fill ~/Pictures/Wallpapers/the-dreamy-colorful-landscape-5k-9y-3436x1439.jpg 
+exec_always --no-startup-id autotiling -w 1 3 5 7 9
+exec --no-startup-id "sh ~/.xprofile"
+
 focus_follows_mouse no
 # This font is widely installed, provides lots of unicode glyphs, right-to-left
 # text rendering and scalability on retina/hidpi displays (thanks to pango).
@ -30,7 +33,6 @@ focus_follows_mouse no

 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
-
 # start a terminal
 bindsym $mod+Return exec alacritty

@ -167,39 +169,48 @@ mode "resize" {

 bindsym $mod+r mode "resize"

-# Start i3bar to display a workspace bar (plus the system information i3status
-# finds out, if available)
-# COLORSCHEME USED : https://www.icolorpalette.com/imagepalette/otter_mammal_fauna-7 
-# bar {
-#         position top
-#         status_command i3status --transparency
-# 
-#         colors {
-#             background #b7d72cA1
-#             statusline #000000A1
-#             separator #281309A1
-# 
-#                                 #border     Background  Text
-#             focused_workspace   #64391dA1   #64391dA1   #FFFFFFA1
-#             active_workspace    #64391dA1   #64391dA1   #FFFFFFA1
-#             inactive_workspace  #dde368A1   #dde368A1   #000000A1
-#             urgent_workspace    #b7d72cA1   #b7d72cA1   #000000A1
-#             binding_mode        #b7d72cA1   #b7d72cA1   #000000A1
-#         }
-# }
-
 exec_always --no-startup-id $HOME/.config/polybar/launch.sh

+gaps inner 10
+for_window [all] title_window_icon on padding 5 
+title_align center
+# include ~/.dotfiles/i3/catpuccin-macchiato
+# include ~/.dotfiles/i3/catpuccin

+set $rosewater #f4dbd6
+set $flamingo #f0c6c6
+set $pink #f5bde6
+set $mauve #c6a0f6
+set $red #ed8796
+set $maroon #ee99a0
+set $peach #f5a97f
+set $yellow #eed49f
+set $green #a6da95
+set $teal #8bd5ca
+set $sky #91d7e3
+set $sapphire #7dc4e4
+set $blue #8aadf4
+set $lavender #b7bdf8
+set $text #cad3f5
+set $subtext1 #b8c0e0
+set $subtext0 #a5adcb
+set $overlay2 #939ab7
+set $overlay1 #8087a2
+set $overlay0 #6e738d
+set $surface2 #5b6078
+set $surface1 #494d64
+set $surface0 #363a4f
+set $base #24273a
+set $mantle #1e2030
+set $crust #181926

-
-#class      border      backgr.     text    indicator   child_border
-
-client.focused               #b38a5b #4f3b22 #FFFFFF #8c5831  #7c2c09 
-client.focused_inactive      #b38a5b #b38a5b #CCCCCC #8c5831  #7c2c09 
-client.unfocused             #b38a5b #b38a5b #CCCCCC #8c5831  #7c2c09 
-
-client.background #FFFFFF 
+# target                 title     bg    text   indicator  border
+client.focused           $lavender $base $text  $rosewater $lavender
+client.focused_inactive  $overlay0 $base $text  $rosewater $overlay0
+client.unfocused         $overlay0 $base $text  $rosewater $overlay0
+client.urgent            $peach    $base $peach $overlay0  $peach
+client.placeholder       $overlay0 $base $text  $overlay0  $overlay0
+client.background        $base

 # Volume and brightness controls 
 bindsym XF86AudioPlay exec playerctl play-pause
@ -211,5 +222,10 @@ bindsym XF86MonBrightnessDown exec xbacklight -dec 20 # decrease screen brightne
 bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5% # raise volume
 bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5% # lower volume
 bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle # toggle mute for default device
-# use i3lock-fancy
-bindsym $mod-z exec i3lock-fancy 
+
+for_window [window_role="pop-up"] floating enable
+for_window [title="virtual Machine Manager"] floating enable
+for_window [class="plasmashell" window_type="notification"] floating enable, border none, move right 700px, move down 450px
+no_focus [class="plasmashell" window_type="notification"] 
+for_window [title="Bitwarden" window_role="pop-up"] floating enable
+
--- a/i3/otter
+++ b/i3/otter
@ -0,0 +1,45 @@
+# target                 title     bg    text   indicator  border
+client.focused           $lavender $base $text  $rosewater $lavender
+client.focused_inactive  $overlay0 $base $text  $rosewater $overlay0
+client.unfocused         $overlay0 $base $text  $rosewater $overlay0
+client.urgent            $peach    $base $peach $overlay0  $peach
+client.placeholder       $overlay0 $base $text  $overlay0  $overlay0
+client.background        $base
+
+# bar
+bar {
+  colors {
+    background         $base
+    statusline         $text
+    focused_statusline $text
+    focused_separator  $base
+    focused_workspace  $base $base $green
+    active_workspace   $base $base $blue
+    inactive_workspace $base $base $surface1
+    urgent_workspace   $base $base $surface1
+    binding_mode       $base $base $surface1
+  }
+}
+
+# target                 title     bg    text   indicator  border
+client.focused           $lavender $base $text  $rosewater $lavender
+client.focused_inactive  $overlay0 $base $text  $rosewater $overlay0
+client.unfocused         $overlay0 $base $text  $rosewater $overlay0
+client.urgent            $peach    $base $peach $overlay0  $peach
+client.placeholder       $overlay0 $base $text  $overlay0  $overlay0
+client.background        $base
+
+# bar
+bar {
+  colors {
+    background         $base
+    statusline         $text
+    focused_statusline $text
+    focused_separator  $base
+    focused_workspace  $base $base $green
+    active_workspace   $base $base $blue
+    inactive_workspace $base $base $surface1
+    urgent_workspace   $base $base $surface1
+    binding_mode       $base $base $surface1
+  }
+}
--- a/2
+++ b/2
--- a/picom/picom.conf
+++ b/picom/picom.conf
@ -1,2 +1,2 @@
 opacity-rule = [ "80:class_g = 'Alacritty'",
-                "80:class_g = 'rofi'" ]; 
+                "80:class_g = 'rofi'", "95:class_g = 'Google-chrome'" ]; 
--- a/polybar/colors.ini
+++ b/polybar/colors.ini
@ -0,0 +1,8 @@
+[colors]
+background = #282a36
+background-alt = #44475a
+foreground = #f8f8f2
+primary = #bd93f9
+secondary = #ffb86c
+alert = #ff5555
+disabled = #6272a4
--- a/polybar/colors_custom_otter.ini
+++ b/polybar/colors_custom_otter.ini
@ -0,0 +1,9 @@
+[colors]
+background = #64391d
+background-alt = #b38a5b
+foreground = #FFFFFF
+primary = #b7d72c
+secondary = #dde368
+alert = #7c2c09
+disabled = #4f3b22
+
--- a/polybar/config.ini
+++ b/polybar/config.ini
@ -15,158 +15,8 @@
 ;   The README contains a lot of information
 ;
 ;==========================================================
-
-[colors]
-background = #64391d
-background-alt = #b38a5b
-foreground = #FFFFFF
-primary = #b7d72c
-secondary = #dde368
-alert = #7c2c09
-disabled = #4f3b22
-
-[bar/MyBar]
-width = 100%
-height = 24pt
-radius = 3
-
-; dpi = 96
-
-background = ${colors.background}
-foreground = ${colors.foreground}
-
-line-size = 4pt
-
-border-size = 4pt
-border-color = #64391d
-
-padding-left = 0
-padding-right = 1
-
-module-margin = 1
-
-separator = |
-separator-foreground = ${colors.disabled}
-
-font-0 = monospace;2
-
-modules-left = xworkspaces xwindow
-modules-right = pulseaudio memory cpu eth date
-
-cursor-click = pointer
-cursor-scroll = ns-resize
-
-enable-ipc = true
-
-; tray-position = right
-
-; wm-restack = generic
-; wm-restack = bspwm
-; wm-restack = i3
-
-; override-redirect = true
-
-[module/xworkspaces]
-type = internal/xworkspaces
-
-label-active = %name%
-label-active-background = ${colors.background-alt}
-label-active-underline= ${colors.primary}
-label-active-padding = 1
-
-label-occupied = %name%
-label-occupied-padding = 1
-
-label-urgent = %name%
-label-urgent-background = ${colors.alert}
-label-urgent-padding = 1
-
-label-empty = %name%
-label-empty-foreground = ${colors.disabled}
-label-empty-padding = 1
-
-[module/xwindow]
-type = internal/xwindow
-label = %title:0:60:...%
-
-[module/filesystem]
-type = internal/fs
-interval = 25
-
-mount-0 = /
-
-label-mounted = %{F#F0C674}%mountpoint%%{F-} %percentage_used%%
-
-label-unmounted = %mountpoint% not mounted
-label-unmounted-foreground = ${colors.disabled}
-
-[module/pulseaudio]
-type = internal/pulseaudio
-
-format-volume-prefix = "VOL "
-format-volume-prefix-foreground = ${colors.primary}
-format-volume = <label-volume>
-
-label-volume = %percentage%%
-
-label-muted = muted
-label-muted-foreground = ${colors.disabled}
-
-[module/xkeyboard]
-type = internal/xkeyboard
-blacklist-0 = num lock
-
-label-layout = %layout%
-label-layout-foreground = ${colors.primary}
-
-label-indicator-padding = 2
-label-indicator-margin = 1
-label-indicator-foreground = ${colors.background}
-label-indicator-background = ${colors.secondary}
-
-[module/memory]
-type = internal/memory
-interval = 2
-format-prefix = "RAM "
-format-prefix-foreground = ${colors.primary}
-label = %percentage_used:2%%
-
-[module/cpu]
-type = internal/cpu
-interval = 2
-format-prefix = "CPU "
-format-prefix-foreground = ${colors.primary}
-label = %percentage:2%%
-
-[network-base]
-type = internal/network
-interval = 5
-format-connected = <label-connected>
-format-disconnected = <label-disconnected>
-label-disconnected = %{F#F0C674}%ifname%%{F#707880} disconnected
-
-[module/wlan]
-inherit = network-base
-interface-type = wireless
-label-connected = %{F#F0C674}%ifname%%{F-} %essid% %local_ip%
-
-[module/eth]
-inherit = network-base
-interface-type = wired
-label-connected = %{F#F0C674}%ifname%%{F-} %local_ip%
-
-[module/date]
-type = internal/date
-interval = 1
-
-date = %d-%m-%Y %H:%M
-date-alt = %Y-%m-%d %H:%M:%S
-
-label = %date%
-label-foreground = ${colors.primary}
-
-[settings]
-screenchange-reload = true
-pseudo-transparency = true
-
+include-file = colors.ini
+include-file = settings.ini
+include-file = mybar.ini
+include-file = modules.ini 
 ; vim:ft=dosini
--- a/polybar/modules.ini
+++ b/polybar/modules.ini
@ -0,0 +1,104 @@
+[module/xworkspaces]
+type = internal/xworkspaces
+
+label-active = %name%
+label-active-background = ${colors.background-alt}
+label-active-underline= ${colors.primary}
+label-active-padding = 1
+
+label-occupied = %name%
+label-occupied-padding = 1
+
+label-urgent = %name%
+label-urgent-background = ${colors.alert}
+label-urgent-padding = 1
+
+label-empty = %name%
+label-empty-foreground = ${colors.disabled}
+label-empty-padding = 1
+
+[module/xwindow]
+type = internal/xwindow
+label = %title:0:60:...%
+
+[module/filesystem]
+type = internal/fs
+interval = 25
+
+mount-0 = /
+
+label-mounted = %{F#F0C674}%mountpoint%%{F-} %percentage_used%%
+
+label-unmounted = %mountpoint% not mounted
+label-unmounted-foreground = ${colors.disabled}
+
+[module/pulseaudio]
+type = internal/pulseaudio
+
+format-volume-prefix = "VOL "
+format-volume-prefix-foreground = ${colors.primary}
+format-volume = <label-volume>
+
+label-volume = %percentage%%
+
+label-muted = muted
+label-muted-foreground = ${colors.disabled}
+
+[module/xkeyboard]
+type = internal/xkeyboard
+blacklist-0 = num lock
+
+label-layout = %layout%
+label-layout-foreground = ${colors.primary}
+
+label-indicator-padding = 2
+label-indicator-margin = 1
+label-indicator-foreground = ${colors.background}
+label-indicator-background = ${colors.secondary}
+
+[module/memory]
+type = internal/memory
+interval = 2
+format-prefix = "RAM "
+format-prefix-foreground = ${colors.primary}
+label = %percentage_used:2%%
+
+[module/cpu]
+type = internal/cpu
+interval = 2
+format-prefix = "CPU "
+format-prefix-foreground = ${colors.primary}
+label = %percentage:2%%
+
+[network-base]
+type = internal/network
+interval = 5
+format-connected = <label-connected>
+format-disconnected = <label-disconnected>
+label-disconnected = %{F#F0C674}%ifname%%{F#707880} disconnected
+
+[module/wlan]
+inherit = network-base
+interface-type = wireless
+label-connected = %{F#F0C674}%ifname%%{F-} %essid% %local_ip%
+
+[module/eth]
+inherit = network-base
+interface-type = wired
+label-connected = %{F#F0C674}%ifname%%{F-} %local_ip%
+
+[module/date]
+type = internal/date
+interval = 1
+
+date = %d-%m-%Y 
+date-alt = %Y-%m-%d 
+
+label = %date%
+label-foreground = ${colors.primary}
+[module/time]
+type= internal/date
+interval=1
+date = %H:%M:%S
+label = %date%
+
--- a/polybar/mybar.ini
+++ b/polybar/mybar.ini
@ -0,0 +1,44 @@
+[bar/MyBar]
+width = 100%
+height = 24pt
+radius = 3
+
+offset-x = 50
+offset-y = 50
+
+; dpi = 96
+
+background = ${colors.background}
+foreground = ${colors.foreground}
+line-size = 4pt
+
+#border-size = 4pt
+#border-color = ${colors.background}
+
+padding-left = 0
+padding-right = 1
+
+module-margin = 1
+
+separator = |
+separator-foreground = ${colors.disabled}
+
+font-0 = "HeavyDataNerdFont:pixelsize=20;2" 
+font-1 = monospace;2
+
+modules-center = time 
+modules-left = xworkspaces tray xwindow
+modules-right = pulseaudio memory cpu eth date
+
+cursor-click = pointer
+cursor-scroll = ns-resize
+
+enable-ipc = true
+
+; tray-position = right
+
+; wm-restack = generic
+; wm-restack = bspwm
+; wm-restack = i3
+
+; override-redirect = true
--- a/polybar/settings.ini
+++ b/polybar/settings.ini
@ -0,0 +1,4 @@
+[settings]
+screenchange-reload = true
+pseudo-transparency = true
+
--- a/rice/DebianRice_TokyoNight_KDE_i3.png
+++ b/rice/DebianRice_TokyoNight_KDE_i3.png
--- a/rofi/config
+++ b/rofi/config
@ -3,4 +3,4 @@ rofi.color-enabled: true

 rofi.lines: 15

-rofi.theme: /usr/share/rofi/themes/Monokai.rasi
+rofi.theme: /usr/share/rofi/themes/rounded-purple-dark.rasi
--- a/rofi/config.rasi
+++ b/rofi/config.rasi
@ -1,141 +1,6 @@
 configuration {
-/*	modi: "window,run,ssh";*/
-/*	font: "mono 12";*/
-/*	location: 0;*/
-/*	yoffset: 0;*/
-/*	xoffset: 0;*/
-/*	fixed-num-lines: true;*/
-/*	show-icons: false;*/
-/*	terminal: "rofi-sensible-terminal";*/
-/*	ssh-client: "ssh";*/
-/*	ssh-command: "{terminal} -e {ssh-client} {host} [-p {port}]";*/
-/*	run-command: "{cmd}";*/
-/*	run-list-command: "";*/
-/*	run-shell-command: "{terminal} -e {cmd}";*/
-/*	window-command: "wmctrl -i -R {window}";*/
-/*	window-match-fields: "all";*/
-/*	icon-theme: ;*/
-/*	drun-match-fields: "name,generic,exec,categories,keywords";*/
-/*	drun-categories: ;*/
-/*	drun-show-actions: false;*/
-/*	drun-display-format: "{name} [<span weight='light' size='small'><i>({generic})</i></span>]";*/
-/*	drun-url-launcher: "xdg-open";*/
-/*	disable-history: false;*/
-/*	ignored-prefixes: "";*/
-/*	sort: false;*/
-/*	sorting-method: "normal";*/
-/*	case-sensitive: false;*/
-/*	cycle: true;*/
-/*	sidebar-mode: false;*/
-/*	hover-select: false;*/
-/*	eh: 1;*/
-/*	auto-select: false;*/
-/*	parse-hosts: false;*/
-/*	parse-known-hosts: true;*/
-/*	combi-modi: "window,run";*/
-/*	matching: "normal";*/
-/*	tokenize: true;*/
-/*	m: "-5";*/
-/*	filter: ;*/
-/*	dpi: -1;*/
-/*	threads: 0;*/
-/*	scroll-method: 0;*/
-/*	window-format: "{w}    {c}   {t}";*/
-/*	click-to-exit: true;*/
-/*	max-history-size: 25;*/
-/*	combi-hide-mode-prefix: false;*/
-/*	combi-display-format: "{mode} {text}";*/
-/*	matching-negate-char: '-' /* unsupported */;*/
-/*	cache-dir: ;*/
-/*	window-thumbnail: false;*/
-/*	drun-use-desktop-cache: false;*/
-/*	drun-reload-desktop-cache: false;*/
-/*	normalize-match: false;*/
-/*	steal-focus: false;*/
-/*	application-fallback-icon: ;*/
-/*	pid: "/run/user/1000/rofi.pid";*/
-/*	display-window: ;*/
-/*	display-windowcd: ;*/
-/*	display-run: ;*/
-/*	display-ssh: ;*/
-/*	display-drun: ;*/
-/*	display-combi: ;*/
-/*	display-keys: ;*/
-/*	display-filebrowser: ;*/
-/*	kb-primary-paste: "Control+V,Shift+Insert";*/
-/*	kb-secondary-paste: "Control+v,Insert";*/
-/*	kb-clear-line: "Control+w";*/
-/*	kb-move-front: "Control+a";*/
-/*	kb-move-end: "Control+e";*/
-/*	kb-move-word-back: "Alt+b,Control+Left";*/
-/*	kb-move-word-forward: "Alt+f,Control+Right";*/
-/*	kb-move-char-back: "Left,Control+b";*/
-/*	kb-move-char-forward: "Right,Control+f";*/
-/*	kb-remove-word-back: "Control+Alt+h,Control+BackSpace";*/
-/*	kb-remove-word-forward: "Control+Alt+d";*/
-/*	kb-remove-char-forward: "Delete,Control+d";*/
-/*	kb-remove-char-back: "BackSpace,Shift+BackSpace,Control+h";*/
-/*	kb-remove-to-eol: "Control+k";*/
-/*	kb-remove-to-sol: "Control+u";*/
-/*	kb-accept-entry: "Control+j,Control+m,Return,KP_Enter";*/
-/*	kb-accept-custom: "Control+Return";*/
-/*	kb-accept-custom-alt: "Control+Shift+Return";*/
-/*	kb-accept-alt: "Shift+Return";*/
-/*	kb-delete-entry: "Shift+Delete";*/
-/*	kb-mode-next: "Shift+Right,Control+Tab";*/
-/*	kb-mode-previous: "Shift+Left,Control+ISO_Left_Tab";*/
-/*	kb-mode-complete: "Control+l";*/
-/*	kb-row-left: "Control+Page_Up";*/
-/*	kb-row-right: "Control+Page_Down";*/
-/*	kb-row-up: "Up,Control+p,ISO_Left_Tab";*/
-/*	kb-row-down: "Down,Control+n";*/
-/*	kb-row-tab: "Tab";*/
-/*	kb-page-prev: "Page_Up";*/
-/*	kb-page-next: "Page_Down";*/
-/*	kb-row-first: "Home,KP_Home";*/
-/*	kb-row-last: "End,KP_End";*/
-/*	kb-row-select: "Control+space";*/
-/*	kb-screenshot: "Alt+S";*/
-/*	kb-ellipsize: "Alt+period";*/
-/*	kb-toggle-case-sensitivity: "grave,dead_grave";*/
-/*	kb-toggle-sort: "Alt+grave";*/
-/*	kb-cancel: "Escape,Control+g,Control+bracketleft";*/
-/*	kb-custom-1: "Alt+1";*/
-/*	kb-custom-2: "Alt+2";*/
-/*	kb-custom-3: "Alt+3";*/
-/*	kb-custom-4: "Alt+4";*/
-/*	kb-custom-5: "Alt+5";*/
-/*	kb-custom-6: "Alt+6";*/
-/*	kb-custom-7: "Alt+7";*/
-/*	kb-custom-8: "Alt+8";*/
-/*	kb-custom-9: "Alt+9";*/
-/*	kb-custom-10: "Alt+0";*/
-/*	kb-custom-11: "Alt+exclam";*/
-/*	kb-custom-12: "Alt+at";*/
-/*	kb-custom-13: "Alt+numbersign";*/
-/*	kb-custom-14: "Alt+dollar";*/
-/*	kb-custom-15: "Alt+percent";*/
-/*	kb-custom-16: "Alt+dead_circumflex";*/
-/*	kb-custom-17: "Alt+ampersand";*/
-/*	kb-custom-18: "Alt+asterisk";*/
-/*	kb-custom-19: "Alt+parenleft";*/
-/*	kb-select-1: "Super+1";*/
-/*	kb-select-2: "Super+2";*/
-/*	kb-select-3: "Super+3";*/
-/*	kb-select-4: "Super+4";*/
-/*	kb-select-5: "Super+5";*/
-/*	kb-select-6: "Super+6";*/
-/*	kb-select-7: "Super+7";*/
-/*	kb-select-8: "Super+8";*/
-/*	kb-select-9: "Super+9";*/
-/*	kb-select-10: "Super+0";*/
-/*	ml-row-left: "ScrollLeft";*/
-/*	ml-row-right: "ScrollRight";*/
-/*	ml-row-up: "ScrollUp";*/
-/*	ml-row-down: "ScrollDown";*/
-/*	me-select-entry: "MousePrimary";*/
-/*	me-accept-entry: "MouseDPrimary";*/
-/*	me-accept-custom: "Control+MouseDPrimary";*/
+  modi: "window,run,ssh";
+  font: "SF Mono 12";
  timeout {
      action: "kb-cancel";
      delay:  0;
@ -145,4 +10,5 @@ configuration {
      sorting-method:    "name";
  }
 }
-@theme "arthur"
+
+@theme "/home/nigel/.local/share/rofi/themes/catppuccin-frappe.rasi"
--- a/scripts/activate.sh
+++ b/scripts/activate.sh
@ -9,3 +9,5 @@ mkdir -p $HOME/.config/polybar && stow --dotfiles polybar -t $HOME/.config/polyb
 stow --dotfiles starship -t $HOME/.config
 stow --dotfiles starship -t $HOME/.config
 stow --dotfiles picom -t $HOME/.config
+stow --dotfiles emacs -t $HOME/.config
+
--- a/scripts/deactivate.sh
+++ b/scripts/deactivate.sh
--- a/scripts/install.sh
+++ b/scripts/install.sh
--- a/starship/starship.toml
+++ b/starship/starship.toml
@ -1,19 +1,19 @@
 format = """
-[░▒▓](#a3aed2)\
-[ \ue712 ](bg:#a3aed2 fg:#090c0c)\
-[](bg:#769ff0 fg:#a3aed2)\
+[░▒▓](#788F48)\
+[ \ue712 ](bg:#648519 fg:#b7b8ba)\
+[](bg:#648519 fg:#648519)\
 $directory\
-[](fg:#769ff0 bg:#394260)\
+[](bg:#7D9F3F fg:#648519)\
 $git_branch\
 $git_status\
-[](fg:#394260 bg:#212736)\
+[](bg:#8D995B fg:#7D9F3F)\
 $python\
 $rust\
 $golang\
 $c\
-[](fg:#212736 bg:#1d2230)\
+[](fg:#8D995B bg:#648519)\
 $time\
-[ ](fg:#1d2230)\
+[ ](fg:#648519)\
 \n$character
 """
 [username]
@ -23,7 +23,7 @@ disabled= false
 show_always = true

 [directory]
-style = "fg:#e3e5e5 bg:#769ff0"
+style = "fg:#e3e5e5 bg:#648519"
 format = "[ $path ]($style)"
 truncation_length = 3
 truncation_symbol = ".../"
@ -31,35 +31,35 @@ truncation_symbol = ".../"

 [git_branch]
 symbol = ""
-style = "bg:#394260"
-format = '[[ $symbol $branch ](fg:#769ff0 bg:#394260)]($style)'
+style = "bg:#7D9F3F"
+format = '[[ $symbol $branch ](fg:#b7b8ba bg:#7D9F3F)]($style)'

 [git_status]
-style = "bg:#394260"
-format = '[[($all_status$ahead_behind )](fg:#769ff0 bg:#394260)]($style)'
+style = "bg:#7D9F3F"
+format = '[[($all_status$ahead_behind )](fg:#b7b8ba bg:#7D9F3F)]($style)'

 [rust]
 symbol = ""
-style = "bg:#212736"
-format = '[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)'
+style = "bg:#8D995B"
+format = '[[ $symbol ($version) ](fg:#b7b8ba bg:#8D995B)]($style)'

 [c]
 symbol = "\ue61e"
 style = "bg:#212736"
-format = '[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)'
+format = '[[ $symbol ($version) ](fg:#b7b8ba bg:#212736)]($style)'

 [golang]
 symbol = ""
-style = "bg:#212736"
-format = '[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)'
+style = "bg:#8D995B"
+format = '[[ $symbol ($version) ](fg:#b7b8ba bg:#8D995B)]($style)'

 [python]

-format = '[[ $symbol ($version) (\($virtualenv\)) ](fg:#769ff0 bg:#212736)]($style)'
+format = '[[ $symbol ($version) (\($virtualenv\)) ](fg:#b7b8ba bg:#8D995B)]($style)'


 [time]
 disabled = false
 time_format = "%R" # Hour:Minute Format
-style = "bg:#1d2230"
-format = '[[  $time ](fg:#a0a9cb bg:#1d2230)]($style)'
+style = "bg:#648519"
+format = '[[  $time ](fg:#b7b8ba bg:#648519)]($style)'
--- a/tmux/dot-tmux.conf
+++ b/tmux/dot-tmux.conf
@ -13,20 +13,30 @@ bind-key -n 'M-h' select-pane -L
 bind-key -n 'M-j' select-pane -D
 bind-key -n 'M-k' select-pane -U
 bind-key -n 'M-l' select-pane -R
+
+# Map pane resize
+bind-key -r -T prefix 'M-h' resize-pane -L 5
+bind-key -r -T prefix 'M-j' resize-pane -D 5
+bind-key -r -T prefix 'M-k' resize-pane -U 5
+bind-key -r -T prefix 'M-l' resize-pane -R 5
+
+
+
+
 bind h split-window -h
 bind v split-window -v

 # set Status bar options 
 set-option -g status-position top
-set-window-option -g window-status-style fg=White,bg="#61f230"
-set-window-option -g window-status-current-style fg=White,bg="#9aff78"
 set-option -g allow-rename off

 set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'catppuccin/tmux'
+set -g @catppuccin_flavour 'macchiato'
+set -g @catppuccin_status_modules_right "host uptime application session"
+set -s default-terminal 'xterm-256color'

-set -g @plugin 'dracula/tmux'
-set -g @dracula-plugins 'cpu-usage git ram-usage time'
-set -g @dracula-show-left-icon \uebc8
+setw -g mode-keys vi

 # set some sanity options
 # - This makes sure to keep the window/pane count starting at 1
--- a/wezterm/.wezterm.lua
+++ b/wezterm/.wezterm.lua
@ -0,0 +1,83 @@
+-- pull in the wezterm API
+local wezterm = require('wezterm')
+local launch_menu = {}
+
+-- This will hold the configuration 
+local config = wezterm.config_builder()
+config.colors = { background = "#1e1e2e" }
+config.color_scheme = 'Catppuccin Mocha'
+config.window_background_opacity = 1.0
+config.default_prog = { 'C:/Program Files/PowerShell/7/pwsh.exe' }
+
+config.window_frame = {
+    font = wezterm.font { family = 'Roboto', weight = 'Bold' },
+    font_size = 12,
+    active_titlebar_bg = '#1e1e2e',
+    inactive_titlebar_bg = '#1e1e2e',
+}
+
+config.colors = {
+    tab_bar = {
+        active_tab = {
+
+            bg_color = '#181825',
+            fg_color = "#B4BEFE"
+        },
+        inactive_tab = {
+            bg_color = '#1e1e2e',
+            fg_color = "#CDD6F4"
+        },
+         new_tab = {
+            bg_color = '#1e1e2e',
+            fg_color = "#CDD6F4"
+        },
+        new_tab_hover ={
+            bg_color = '#1b1032',
+            fg_color = '#808080',
+        }
+    },
+}
+
+-- Keys 
+local act = wezterm.action
+config.leader = { key = "a", mods="CTRL", timeout_milliseconds = 1000}
+
+config.keys = {
+    { key = "s", mods = "LEADER", action = act.SplitVertical { domain = "CurrentPaneDomain"}},
+    { key = "v", mods = "LEADER", action = act.SplitHorizontal { domain = "CurrentPaneDomain" }},
+    { key = "h", mods = "LEADER", action = act.ActivatePaneDirection("Left") },
+    { key = "j", mods = "LEADER", action = act.ActivatePaneDirection("Down") },
+    { key = "k", mods = "LEADER", action = act.ActivatePaneDirection("Up") },
+    { key = "l", mods = "LEADER", action = act.ActivatePaneDirection("Right") },
+    { key = "q", mods = "LEADER", action = act.CloseCurrentPane { confirm = false }},
+    { key = "n", mods = "LEADER", action = act.ShowTabNavigator },
+    { key = "t", mods = "LEADER", action = act.ShowLauncher },
+}
+
+-- config.enable_tab_bar = false
+config.window_decorations = "INTEGRATED_BUTTONS | TITLE | RESIZE"
+if wezterm.target_triple == 'x86_64-pc-windows-msvc' then
+    table.insert(launch_menu, {
+        label = 'PowerShell 7',
+        args = { 'pwsh.exe', '-NoLogo' },
+    })
+   table.insert(launch_menu, {
+        label = 'PowerShell',
+        args = { 'PowerShell.exe', '-NoLogo' },
+    })
+
+    for _, vsvers in
+        ipairs ( wezterm.glob('VisualStudio20*', 'D:/')) do
+        local year = vsvers:gsub('VisualStudio', '')
+        table.insert(launch_menu, {
+            label = 'X64 Native Tools VS ' .. year,
+            args = {
+                'cmd.exe',
+                '/k',
+                'D:/' .. vsvers  .. '/VC/Auxiliary/Build/vcvars64.bat' },
+        })
+end
+end
+
+config.launch_menu = launch_menu
+return config
--- a/wezterm/dot-wezterm.lua
+++ b/wezterm/dot-wezterm.lua
@ -0,0 +1,82 @@
+-- pull in the wezterm API
+local wezterm = require('wezterm')
+local launch_menu = {}
+
+-- This will hold the configuration
+local config = wezterm.config_builder()
+config.colors = { background = "#1e1e2e" }
+config.color_scheme = 'Catppuccin Mocha'
+config.window_background_opacity = 0.8
+
+config.window_frame = {
+    font = wezterm.font { family = 'Roboto', weight = 'Bold' },
+    font_size = 12,
+    active_titlebar_bg = '#1e1e2e',
+    inactive_titlebar_bg = '#1e1e2e',
+}
+
+config.colors = {
+    tab_bar = {
+        active_tab = {
+
+            bg_color = '#181825',
+            fg_color = "#B4BEFE"
+        },
+        inactive_tab = {
+            bg_color = '#1e1e2e',
+            fg_color = "#CDD6F4"
+        },
+        new_tab = {
+            bg_color = '#1e1e2e',
+            fg_color = "#CDD6F4"
+        },
+        new_tab_hover = {
+            bg_color = '#1b1032',
+            fg_color = '#808080',
+        }
+    },
+}
+
+-- Keys
+local act = wezterm.action
+config.leader = { key = "a", mods = "CTRL", timeout_milliseconds = 1000 }
+
+config.keys = {
+    { key = "s", mods = "LEADER", action = act.SplitVertical { domain = "CurrentPaneDomain" } },
+    { key = "v", mods = "LEADER", action = act.SplitHorizontal { domain = "CurrentPaneDomain" } },
+    { key = "h", mods = "LEADER", action = act.ActivatePaneDirection("Left") },
+    { key = "j", mods = "LEADER", action = act.ActivatePaneDirection("Down") },
+    { key = "k", mods = "LEADER", action = act.ActivatePaneDirection("Up") },
+    { key = "l", mods = "LEADER", action = act.ActivatePaneDirection("Right") },
+    { key = "q", mods = "LEADER", action = act.CloseCurrentPane { confirm = false } },
+    { key = "n", mods = "LEADER", action = act.ShowTabNavigator },
+    { key = "t", mods = "LEADER", action = act.ShowLauncher },
+}
+
+config.enable_tab_bar = false
+config.window_decorations = "INTEGRATED_BUTTONS | TITLE | RESIZE"
+if wezterm.target_triple == 'x86_64-pc-windows-msvc' then
+    table.insert(launch_menu, {
+        label = 'PowerShell 7',
+        args = { 'pwsh.exe', '-NoLogo' },
+    })
+    table.insert(launch_menu, {
+        label = 'PowerShell',
+        args = { 'PowerShell.exe', '-NoLogo' },
+    })
+
+    for _, vsvers in
+    ipairs(wezterm.glob('VisualStudio20*', 'D:/')) do
+        local year = vsvers:gsub('VisualStudio', '')
+        table.insert(launch_menu, {
+            label = 'X64 Native Tools VS ' .. year,
+            args = {
+                'cmd.exe',
+                '/k',
+                'D:/' .. vsvers .. '/VC/Auxiliary/Build/vcvars64.bat' },
+        })
+    end
+end
+
+config.launch_menu = launch_menu
+return config
--- a/zsh/dot-zshrc
+++ b/zsh/dot-zshrc
@ -60,14 +60,14 @@ if [[ -n $SSH_CONNECTION ]]; then
 fi

 # Personal aliases
-alias zshconfig="nvim ~/.zshrc"
-alias ohmyzsh="nvim ~/.oh-my-zsh"
+alias zshconfig="$EDITOR ~/.zshrc"
+alias ohmyzsh="$EDITOR ~/.oh-my-zsh"
 alias dev="cd /home/nigel/Development"
 alias dotfiles="cd /home/nigel/.dotfiles"
-
-# Personal Aliases
-alias zshconfig="mate ~/.zshrc"
-alias ohmyzsh="mate ~/.oh-my-zsh"
+alias gitconfig="$EDITOR $HOME/.gitconfig"
+alias sshconfig="$EDITOR $HOME/.ssh/config"
+alias sshhome="cd $HOME/.ssh"
+alias reload="source $HOME/.zshrc"

 # Add Autocompletion tools
 _dotnet_zsh_complete()
@ -82,6 +82,12 @@ source ~/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
 # zsh paramater for dotnet cli tab completion
 compctl -K _dotnet_zsh_complete dotnet

+(cat $HOME/.cache/wal/sequences &)
+source $HOME/.cache/wal/colors.sh
+
 eval "$(fzf --zsh)"
 eval "$(starship init zsh)"

+eval "$(register-python-argcomplete pipx)" 
+# Created by `pipx` on 2024-04-10 15:28:48
+export PATH="$PATH:/home/nigel/.local/bin"
Author	SHA1	Message	Date
Nigel	16ffd644c4	git config removed gpg signkey, rofi theme updated to catpuccin emacs config update Signed-off-by: Nigel <nigelbarink@hotmail.com>	2025-01-21 21:06:59 +01:00
nigel barink	e91e544b7d	new emacs config	2025-01-21 20:53:08 +01:00
nigel barink	4e0d9c5591	Clean up root directory	2025-01-17 22:51:33 +01:00
nigel barink	60dc15ace3	Added my first emacs config	2025-01-17 22:41:24 +01:00
Nigel Barink	7c5a1ed03c	Adding a good wezterm config	2024-09-29 02:39:41 +02:00
Nigel	e7881c0ae4	New colour scheme Old otter style is saved in separate files.	2024-05-28 21:16:06 +02:00
Nigel	1945d5a56d	Point to new neovim config	2024-05-09 20:16:03 +02:00
Nigel	39a4421e84	FEAT: Improved zsh, starship and i3 config Changed colorscheme to fit otter for starship Edited zshrc aliases	2024-05-09 20:12:36 +02:00
Nigel	37f8620d93	FEAT: Changed tmux theme to catppuccin	2024-05-09 20:11:09 +02:00
Nigel	dc1eb8a69a	FEAT: Spread polybar config Polybar configuration has been spread out over multiple files. Each file contains a certain topic: - colors.ini # Defines colors used - modules.ini # Defines config for modules used - mybar.ini # Defines mybar - settings.ini # General polybar settings	2024-05-09 20:06:50 +02:00