Organized emacs config

emacs config update

Signed-off-by: Nigel <nigelbarink@hotmail.com>

Powershell/powershell_profile.ps1

@@ -5,7 +5,7 @@ Import-Module Catppuccin
 $Flavor = $Catppuccin['Mocha']
 Import-Module -Name Microsoft.WinGet.CommandNotFound
 Set-PsFzfOption -PSReadlineChordProvider 'Ctrl+t' -PSReadlineChordReverseHistory 'Ctrl+r'
-Invoke-Expression (& { (zoxide init powershell | Out-String ) })
+Invoke-Expression (& { (zoxide init --cmd cd powershell | Out-String ) })
 
 # The following colors are used by PowerShell's formatting
 # Again PS 7.2+ only
@@ -31,29 +31,65 @@ $ENV:EDITOR="nvim"
 set-alias -Name emacs -Value 'runemacs.exe -nw'
 Set-PSReadlineOption -Colors $Colors 
 $ENV:YAZI_FILE_ONE = 'C:\Program Files\Git\usr\bin\file.exe'
-function y (){
+function y ()
+{
     $tmp = [System.IO.Path]::GetTempFileName()
     yazi $args --cwd-file="$tmp"
     $cwd = Get-Content -Path $tmp -Encoding UTF8
-    if ( -not [String]::IsNullOrEmpty($cwd) -and $cwd -ne $PWD.Path) {
+    if ( -not [String]::IsNullOrEmpty($cwd) -and $cwd -ne $PWD.Path)
+    {
         Set-Location -LiteralPath ([System.IO.Path]::GetFullPath($cwd))
     }
 
     Remove-Item -Path $tmp
 }
 
-function Watch {
+function Watch
+{
     param (
         [ScriptBlock]$Function,
         [int]$Time = 2
     )
 
-    while ($true) {
+    while ($true)
+    {
         Clear-Host
         & $Function
         Start-Sleep -Seconds $Time
     }
 }
 
+function prompt
+{ 
+    # Get IP info
+    $ipv4=Get-CimInstance -Class Win32_NetworkAdapterConfiguration -Filter IPEnabled=$true | Select-Object -ExpandProperty IPAddress | Select-String 192.*
+    $ipv4 = ($ipv4 | ForEach-Object { $_.ToString().Trim() }) -join ','
+    $ipv4Label = ''
+    if (-not $ipv4)
+    {
+        $ipv4Label= "IP N/A"
+    } else
+    {
+        $ipv4Label= "IP $ipv4"
+
+    }
+
+    # Get Git branch if available 
+    $gitBranch = ''
+    if (git rev-parse --is-inside-work-tree 2>$null)
+    {
+        $currentBranch = git rev-parse --abbrev-ref HEAD
+        $gitBranch = "GIT: $currentBranch"
+    }
+
+    $currentLocation=$executionContext.SessionState.Path.CurrentLocation
+
+    # default prompt
+    "[$ipv4Label $gitBranch ]`n$currentLocation@$Env:COMPUTERNAME $('(PS [>_])$' * ($nestedPromptLevel + 1)) ";
+}
+
+set-alias -Name lg -Value lazygit
+
+
 
 podman completion powershell | Out-string  | Invoke-Expression

bash/dot-bash_logout

@@ -1,7 +0,0 @@
-# ~/.bash_logout: executed by bash(1) when login shell exits.
-
-# when leaving the console clear the screen to increase privacy
-
-if [ "$SHLVL" = 1 ]; then
-    [ -x /usr/bin/clear_console ] && /usr/bin/clear_console -q
-fi

bash/dot-bash_profile

@@ -0,0 +1,4 @@
+if  command -v zoxide 
+then
+    eval "$(zoxide init bash --cmd cd)"
+fi

emacs/dot-emacs

@@ -1,42 +1,45 @@
-; set variables 
+; Inhibit nasty emacs behaviour  
-(setq ido-enable-flex-matching t)
-(setq ido-everywhere t)
 (setq inhibit-splash-screen t)
-(setq tab-width 4)
+(setq make-backup-files nil)
-(setq custom-file "~/emacs-custom.el")
-(setq ring-bell-function 'ignore)
-(setq display-line-numbers-type 'relative)
-
-; Toggle modes
-(require 'ido-vertical-mode )
-(ido-mode 1)
-(ido-vertical-mode 1)
-(ido-everywhere 1)
 (tool-bar-mode -1)
 (toggle-scroll-bar -1)
 (menu-bar-mode -1)
+(setq custom-file "~/emacs-custom.el") ; Don't mess with my config
+(setq ring-bell-function 'ignore)
+(put 'dired-find-alternate-file 'disabled nil)
+
+
+; Set basic editor defaults
+(setq tab-width 4)
+(setq display-line-numbers-type 'relative)
 (global-display-line-numbers-mode 1)
 
-; Install and load packages
+
+(use-package catppuccin-theme)
+
+; Enable and configure ido
+(setq ido-enable-flex-matching t)
+(setq ido-everywhere t)
+(ido-mode 1)
+(require 'ido-vertical-mode )
+(ido-vertical-mode 1)
+
+
+; Init Load-package plugin manager
 (require 'package)					
 (require 'use-package-ensure)
+(setq use-package-always-ensure t)
 (setq package-archives '(("melpa" . "https://melpa.org/packages/")
 			  ("elpa" . "https://elpa.gnu.org/packages/")
 			  ("non-gnu" . "https://elpa.nongnu.org/nongnu/")))
 (when (not package-archive-contents)
   (package-refresh-contents))
-
 (package-initialize)
 
-(setq use-package-always-ensure t)
+(use-package vertico
-
+  :init (vertico-mode))
-(use-package catppuccin-theme)
-(use-package magit )
-(use-package paredit )
-
-; keyboard
-(global-set-key (kbd "<escape>") 'keyboard-escape-quit) ;; Prevent me from confusion with VIM
 
+; Keys 
 (use-package evil
   :init
   (setq evil-want-integration t)
@@ -52,16 +55,10 @@
   :after evil
   :config
   (evil-collection-init))
+(evil-set-initial-state 'dired-mode 'emacs)
+(global-set-key (kbd "<escape>") 'keyboard-escape-quit) ;; Prevent me from confusion with VIM
 
-(use-package all-the-icons)
+; Fuzzy finder
-(use-package nerd-icons)
-
-
-(use-package doom-modeline
-  :init (doom-modeline-mode 1)
-  )
-
-
 (use-package fzf
   :bind
   :config
@@ -73,52 +70,107 @@
 	fzf/window-height 15) 'nowarnings )
 
 
-(use-package projectile)
+
-(projectile-mode +1)
+(use-package all-the-icons)
-(define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map)
+(use-package nerd-icons)
 
 
-(use-package consult
+(use-package doom-modeline
-  :hook (completion-list-mode . consult-preview-at-point-mode)
+  :init (doom-modeline-mode 1)
-
   )
-(use-package consult-company)
-(use-package consult-flycheck)
-(use-package consult-lsp)
-(use-package consult-projectile)
 
-(use-package dap-mode)
+
+;; IDE Mode
+(use-package project)
+(use-package eglot)
+(use-package eldoc)
+(use-package flymake)
 (use-package flycheck)
-
+(use-package magit )
+(use-package paredit )
+(use-package tree-sitter)
+(use-package dap-mode)
+(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))
+; set up code completion
 (use-package company)
-(use-package ivy)
+(global-company-mode)
+; Git
+(use-package magit)
+(use-package magit-delta
+  :hook (magit-mode . magit-delta-mode))
 
-(require 'eglot)
+; Language Server Configuration
+
+; Set up Java
+(add-to-list 'eglot-server-programs
+	     '(java-mode "jdtls" "--configuration" "~/.cache/jdtls"
+			 "--data" "~/.cache/jdtls-data"))
+(add-hook 'java-mode-hook 'eglot-ensure)
+
+; gradle build system
 (add-to-list 'eglot-server-programs
              '("gradle"
                ("gradle" "--no-daemon" "tasks" "--quiet" "--info")
-               (mode . gradle-mode)
+               (mode . gradle-mode)))
-               (file-mode . "java")
-               (file-types . ("java" "groovy"))))
 
+; Set up CSharp
+(add-to-list 'eglot-server-programs
+	     '(csharp-mode . ("csharp-ls")))
+(add-hook 'csharp-mode-hook 'eglot-ensure)
+
+					; Set up Rust
+(add-to-list 'eglot-server-programs
+	     '(rust-mode . ("rust-analyzer")))
+(add-hook rust-mode-hook 'eglot-ensure)
+
+; Set up Python
 (use-package lsp-pyright
   :custom (lsp-pyright-langserver-command "pyright")
   :hook (python-mode . (lambda ()
 			 (lsp))))
-(use-package lsp-java
-  :config (add-hook 'java-mode-hook 'lsp))
 
-;; Set font
+; Customize look and feel
 (add-to-list 'default-frame-alist '(font .  "SF Mono"))
+(add-to-list 'default-frame-alist '(font .  "Iosevka Nerd Font"))
 (set-face-attribute 'default t :font "SF Mono")
 
-;; Load catppuccin theme
+(use-package material-theme)
-(load-theme 'catppuccin :no-confirm)
+(use-package catppuccin-theme)
+(use-package all-the-icons)
+(use-package nerd-icons
+  :custom (nerd-icons-font-family "Symbols Nerd Font Mono")
+  )
+
+(use-package doom-modeline
+  :init (doom-modeline-mode 1)
+  :custom ((doom-modeline-height 15)
+	   (doom-modeline-icon-family 'nerd-icons)
+	   )
+  )
+;; Set the Catppuccin flavor
 (setq catppuccin-flavor 'frappe)
+(set-frame-parameter nil 'alpha-background 80)
+(add-to-list 'default-frame-alist '(alpha-background . 80))
+(load-theme 'catppuccin :no-confirm)
+
+;; Disable Catppuccin when running in a low-color Windows terminal
+(when (and (and (not (display-graphic-p))
+           (eq system-type 'windows-nt) 
+           (<= (display-color-cells) 16)))
+  (disable-theme 'catppuccin)
+  (message "Catppuccin disabled: low-color Windows terminal detected"))
+
+(add-to-list 'default-frame-alist '(alpha-background . 80))
+(load custom-file)
 
 ;; Create semi-transparent background
 (set-frame-parameter nil 'alpha-background 80)
 (add-to-list 'default-frame-alist '(alpha-background . 80))
 
 (load custom-file 'noerror 'nomessage)
-(put 'dired-find-alternate-file 'disabled nil)

tmux/dot-tmux.conf

@@ -4,11 +4,19 @@
 ##                                                      ##
 ##########################################################
 
-# Rebind the prefix key 
+# set Status bar options 
-unbind C-b
+set -g status-position top
-set-option -g prefix C-Space
+set -g base-index 1
+set -g pane-base-index 1
+
+
+set -g mouse on
+set -s escape-time 50
+set -s default-terminal 'xterm-256color'
 
 # Map pane selection to more easy vim like bindings
+setw -g mode-keys vi
+
 bind-key -n 'M-h' select-pane -L
 bind-key -n 'M-j' select-pane -D
 bind-key -n 'M-k' select-pane -U
@@ -21,32 +29,21 @@ bind-key -r -T prefix 'M-k' resize-pane -U 5
 bind-key -r -T prefix 'M-l' resize-pane -R 5
 
 
+set -g @plugin 'catppuccin/tmux#v2.1.1'
+set -g @catppuccin_flavour 'frappe'
+set -g @catppuccin_window_status_style 'rounded' 
 
-
+set -g @catppuccin_window_text " #W" 
-bind h split-window -h
+set -g @catppuccin_window_current_text " #W" 
-bind v split-window -v
-
-# set Status bar options 
-set-option -g status-position top
-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 status-right-length 100
+set -g status-left-length 100
+set -g status-left "" 
+set -gF status-right "#{@catppuccin_status_directory}" 
+set -gF status-right "#{@catppuccin_status_user}" 
+set -gF status-right "#{@catppuccin_status_host}" 
 
-setw -g mode-keys vi
-
-# set some sanity options
-# - This makes sure to keep the window/pane count starting at 1
-setw -g base-index 1
-setw -g pane-base-index 1
-# - This prevents me from having to press escape twice 
-set -s escape-time 50
-
-# allow mouse interaction 
-set-option -g mouse on
 
 # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
+set -g @plugin 'tmux-plugins/tpm'
 run '~/.tmux/plugins/tpm/tpm'

vim/dot-vimrc

@@ -0,0 +1,12 @@
+colorscheme retrobox
+set relativenumber number
+set packpath^=~/.vim/pack/
+if has("gui_gnome") || has("gui_win32")
+	set guioptions -=m
+	set guioptions -=T
+endif
+set guicursor = ""
+syntax on
+filetype on 
+filetype plugin on 
+filetype indent on 

wezterm/dot-wezterm.lua

@@ -1,10 +1,10 @@
 -- pull in the wezterm API
 local wezterm = require('wezterm')
+config = wezterm.config_builder()
+
 require "theme"
 require "keys"
 
--- This will hold the configuration
-local config = wezterm.config_builder()
 
 config.enable_tab_bar = false
 -- The most common triples are:

wezterm/theme.lua

@@ -1,10 +1,16 @@
 local wezterm = require 'wezterm'
-config.window_decorations = "INTEGRATED_BUTTONS | TITLE | RESIZE"
 
 config.colors = { background = "#1e1e2e" }
 config.color_scheme = 'Catppuccin Mocha'
 config.window_background_opacity = 0.9
-config.window_decorations = "INTEGRATED_BUTTONS | TITLE | RESIZE"
+
+
+if wezterm.target_triple == 'x86_64-pc-windows-msvc' then
+    config.window_decorations = "TITLE | RESIZE"
+else 
+    config.window_decorations = "INTEGRATED_BUTTONS | TITLE | RESIZE"
+end
+
 config.window_frame = {
     font = wezterm.font { family = 'Roboto', weight = 'Bold' },
     font_size = 12,