clippy

Reviewed-on: #4

bashrc/.bashrc

@@ -14,11 +14,15 @@ bind -m vi-insert 'Control-l: clear-screen'
 PS1='\[\e[32m\]\u@\h\[\e[0m\]:\[\e[34m\]\w\[\e[0m\] \$ '
 
 # Source this file from git that expands PS1 stuff
-GIT_PS1_SHOWUPSTREAM=git
+GIT_PS1_SHOWUPSTREAM='verbose name'
 GIT_PS1_SHOWDIRTYSTATE=true
 GIT_PS1_SHOWUNTRACKEDFILES=true
+#GIT_PS1_SHOWCOLORHINTS=true
+GIT_PS1_DESCRIBE_STYLE=branch
 source /etc/bash_completion.d/git-prompt.sh
 PS1='\[\e[01;32m\]\u@\h\[\e[0m\]:\[\e[01;34m\]\w\[\e[0m\]$(__git_ps1 "(%s)")\[\e[0m\]\$ '
+[[ $PS1 && -f /usr/share/bash-completion/bash_completion ]] && \
+    . /usr/share/bash-completion/bash_completion
 
 # History settings: no duplicates, decent size
 HISTSIZE=10000
@@ -32,16 +36,20 @@ alias np='nano -w PKGBUILD'
 alias more="less"
 alias rofi='rofi -m 1'
 alias weather="curl wttr.in"
-alias ls="exa -lhg --group-directories-first"
-alias ll="exa -lhga --group-directories-first"
+alias ls="eza -lhg --group-directories-first"
+alias ll="eza -lhga --group-directories-first"
 alias vim="nvim"
 alias docs="python ~/scripts/stock_price.py -s docs"
 alias stock="python ~/scripts/stock_price.py -s "
 alias r="ranger"
 alias grep='grep --colour=auto'
+alias cdd='. ~/scripts/project_picker.sh'
+alias configedit='. ~/scripts/config_edit.sh'
+alias clip='cliphist list | fzf --no-sort | cliphist decode | wl-copy'
 
 # expand path
-PATH=$PATH:/usr/local/bin
+PATH=/usr/local/bin:/usr/bin/:/usr/sbin
+PATH=$PATH:~/.local/share
 
 # exports
 export EDITOR=/usr/bin/nvim
@@ -60,3 +68,6 @@ bind '"\C-t": "fzf --preview \"cat {}\" < <(find . -type f) | xargs $EDITOR\n"'
 
 # kinda annoying tbh
 # pfetch || neofetch || fastfetch
+
+# Created by `pipx` on 2025-05-04 00:05:20
+export PATH="$PATH:/home/clint/.local/bin"

hypr/.config/hypr/hyprland.conf

@@ -13,7 +13,8 @@ monitor = DP-2,1920x1080, 1920x0, 1
 # See https://wiki.hyprland.org/Configuring/Keywords/
 $terminal = alacritty
 $fileManager = dolphin
-$menu = wofi --show drun
+# $menu = wofi --show drun
+$menu = rofi -theme /home/clint/.config/wofi/test3.rasi -show drun
 
 #################
 ### AUTOSTART ###
@@ -22,6 +23,7 @@ $menu = wofi --show drun
 # Autostart necessary processes (like notifications daemons, status bars, etc.)
 # Or execute your favorite apps at launch like this:
 exec-once = waybar & hyprpaper
+exec-once = wl-paste --watch cliphist store
 
 #############################
 ### ENVIRONMENT VARIABLES ###
@@ -160,11 +162,12 @@ bind = $mainMod SHIFT, Space, togglefloating,
 bind = $mainMod, D, exec, $menu
 bind = $mainMod SHIFT, P, pseudo, # dwindle
 bind = $mainMod, J, togglesplit, # dwindle
-bind = $mainMod SHIFT, W, exec, firefox
+bind = $mainMod SHIFT, W, exec, flatpak run one.ablaze.floorp
 bind = $mainMod, P, exec, ~/scripts/hypr_change_wallpaper.sh
 bind = $mainMod, L, exec, hyprlock
 bind = $mainMod, F, fullscreen
 bind = $mainMod, X, exec, ~/scripts/hypr_shutdown.sh
+bind = $mainMod, H, exec, cliphist list | rofi -theme /home/clint/.config/wofi/test3.rasi -dmenu | cliphist decode | wl-copy
 
 # Move focus with mainMod + arrow keys
 bind = $mainMod, left, movefocus, l
@@ -191,16 +194,16 @@ bind = $mainMod, 9, workspace, 9
 bind = $mainMod, 0, workspace, 10
 
 # Move active window to a workspace with mainMod + SHIFT + [0-9]
-bind = $mainMod SHIFT, 1, movetoworkspace, 1
-bind = $mainMod SHIFT, 2, movetoworkspace, 2
-bind = $mainMod SHIFT, 3, movetoworkspace, 3
-bind = $mainMod SHIFT, 4, movetoworkspace, 4
-bind = $mainMod SHIFT, 5, movetoworkspace, 5
-bind = $mainMod SHIFT, 6, movetoworkspace, 6
-bind = $mainMod SHIFT, 7, movetoworkspace, 7
-bind = $mainMod SHIFT, 8, movetoworkspace, 8
-bind = $mainMod SHIFT, 9, movetoworkspace, 9
-bind = $mainMod SHIFT, 0, movetoworkspace, 10
+bind = $mainMod SHIFT, 1, movetoworkspacesilent, 1
+bind = $mainMod SHIFT, 2, movetoworkspacesilent, 2
+bind = $mainMod SHIFT, 3, movetoworkspacesilent, 3
+bind = $mainMod SHIFT, 4, movetoworkspacesilent, 4
+bind = $mainMod SHIFT, 5, movetoworkspacesilent, 5
+bind = $mainMod SHIFT, 6, movetoworkspacesilent, 6
+bind = $mainMod SHIFT, 7, movetoworkspacesilent, 7
+bind = $mainMod SHIFT, 8, movetoworkspacesilent, 8
+bind = $mainMod SHIFT, 9, movetoworkspacesilent, 9
+bind = $mainMod SHIFT, 0, movetoworkspacesilent, 10
 
 # idk fixing workspace locations
 workspace = 1,monitor:HDMI-A-1
@@ -215,7 +218,7 @@ workspace = 8,monitor:DP-2
 
 # Example special workspace (scratchpad)
 bind = $mainMod, S, togglespecialworkspace, magic
-bind = $mainMod SHIFT, S, movetoworkspace, special:magic
+bind = $mainMod SHIFT, S, movetoworkspacesilent, special:magic
 
 # Scroll through existing workspaces with mainMod + scroll
 bind = $mainMod, mouse_down, workspace, e+1

hypr/.config/hypr/hyprlock.conf

@@ -1,7 +1,7 @@
 # BACKGROUND
 background {
 	monitor = 
-	path = /home/clint/Pictures/wallpapers/castle2.jpg
+	path = /home/clint/Pictures/wallpapers/redtrees.jpg
 }
 
 

hypr/.config/hypr/hyprpaper.conf

@@ -1,6 +1,6 @@
-preload = /home/clint/Pictures/wallpapers/castle_view.jpg
-wallpaper = HDMI-A-1, /home/clint/Pictures/wallpapers/castle_view.jpg
-wallpaper = DP-2, /home/clint/Pictures/wallpapers/castle_view.jpg
+preload = 
+wallpaper = HDMI-A-1, /home/clint/Pictures/wallpapers/forest.jpg
+wallpaper = DP-2, /home/clint/Pictures/wallpapers/forest.jpg
 
 #enable splash text rendering over the wallpaper
 splash = false

nvim/.config/nvim/lua/clint/which-key.lua

@@ -3,56 +3,40 @@
 
 local wk = require("which-key")
 
-wk.register({
-	["<leader>"] = {
-		-- File related stuff
-		f = {
-			name = "+file",
-			f = "Find File",
-			s = "Live Search",
-			b = "File Browser (delete this?)",
-			r = "Recent Files",
-		},
-		-- Git related stuff
-		g = {
-			name = "+git",
-			g = "LazyGit",
-			f = "Git Files",
-			b = "Git Blame (show)",
-			n = "Next hunk",
-			N = "Prev hunk",
-
-		},
-		r = {
-			name = "+repl",
-			p = "Run Python"
-		},
-		t = {
-			name = "+timestamps",
-			t = "Print time",
-			d = "Print date+time"
-		},
-		-- Misc
-		c = "Change Color Scheme",
-		y = "Yank to system clipboard",
-		Y = "Yank to system clipboard",
-		d = "Diagnostics",
-		e = "File Explorer",
-		s = "Find and Replace",
-		b = "Buffers",
-		h = "Registers",
-		o = "Object Explorer",
-		fo = "Format Current File",
-		-- LSP related stuff
-		R = "Rename Object",
-		K = "Hover",
-		gd = "Go to definition",
-		-- Debugging
-		D = "Debug UI",
-		B = "Set Breakpoint",
-		["<F1>"] = "Open IPython",
-		x = "Execute selected code",
-		["<F2>"] = "Execute py file",
-		["<F5>"] = "Debug: Continue",
-	},
+wk.add({
+    { "<leader><F1>", desc = "Open IPython" },
+    { "<leader><F2>", desc = "Execute py file" },
+    { "<leader><F5>", desc = "Debug: Continue" },
+    { "<leader>B", desc = "Set Breakpoint" },
+    { "<leader>D", desc = "Debug UI" },
+    { "<leader>K", desc = "Hover" },
+    { "<leader>R", desc = "Rename Object" },
+    { "<leader>Y", desc = "Yank to system clipboard" },
+    { "<leader>b", desc = "Buffers" },
+    { "<leader>c", desc = "Change Color Scheme" },
+    { "<leader>d", desc = "Diagnostics" },
+    { "<leader>e", desc = "File Explorer" },
+    { "<leader>f", group = "file" },
+    { "<leader>fb", desc = "File Browser (delete this?)" },
+    { "<leader>ff", desc = "Find File" },
+    { "<leader>fo", desc = "Format Current File" },
+    { "<leader>fr", desc = "Recent Files" },
+    { "<leader>fs", desc = "Live Search" },
+    { "<leader>g", group = "git" },
+    { "<leader>gN", desc = "Prev hunk" },
+    { "<leader>gb", desc = "Git Blame (show)" },
+    { "<leader>gd", desc = "Go to definition" },
+    { "<leader>gf", desc = "Git Files" },
+    { "<leader>gg", desc = "LazyGit" },
+    { "<leader>gn", desc = "Next hunk" },
+    { "<leader>h", desc = "Registers" },
+    { "<leader>o", desc = "Object Explorer" },
+    { "<leader>r", group = "repl" },
+    { "<leader>rp", desc = "Run Python" },
+    { "<leader>s", desc = "Find and Replace" },
+    { "<leader>t", group = "timestamps" },
+    { "<leader>td", desc = "Print date+time" },
+    { "<leader>tt", desc = "Print time" },
+    { "<leader>x", desc = "Execute selected code" },
+    { "<leader>y", desc = "Yank to system clipboard" },
 })

nvim/.config/nvim/lua/plugins/util.lua

@@ -1,8 +1,21 @@
 return {
 
+	-- -- Linter
+	-- {
+	-- 	'jose-elias-alvarez/null-ls.nvim',
+	-- 	config = function()
+	-- 		local nls = require("null-ls")
+	-- 		nls.setup({
+	-- 			sources = {
+	-- 				nls.builtins.formatting.black,
+	-- 			},
+	-- 		})
+	-- 	end,
+	-- },
+
 	-- Linter
 	{
-		'jose-elias-alvarez/null-ls.nvim',
+		'nvimtools/none-ls.nvim',
 		config = function()
 			local nls = require("null-ls")
 			nls.setup({

tmux/.config/tmux/statusline.conf

@@ -8,7 +8,7 @@ set-window-option -g status-left-length 30
 
 # right status
 set-window-option -g status-right-length 300
-set-window-option -g status-right "#[bg=white fg=black bold][`F]#[bg=black fg=white] Search #[bg=white fg=black bold][`C-r]#[bg=black fg=white] Restore #[bg=white fg=black bold][`C-s]#[bg=black fg=white] Save#[fg=brightred bg=black] #[fg=white bg=black] #{weather} #[fg=brightred bg=black] #[fg=colour179 bg=black]🖥 CPU:#{cpu_percentage} MEM:#{ram_percentage} #[fg=brightred bg=black] #[fg=white bg=black]📅%Y-%m-%d 🕗%I:%m%p"
+set-window-option -g status-right "#[bg=white fg=black bold][`F]#[bg=black fg=white] Search #[bg=white fg=black bold][`C-r]#[bg=black fg=white] Restore #[bg=white fg=black bold][`C-s]#[bg=black fg=white] Save#[fg=brightred bg=black] #[fg=white bg=black] #{weather} #[fg=brightred bg=black] #[fg=colour179 bg=black]🖥 CPU:#{cpu_percentage} MEM:#{ram_percentage} #[fg=brightred bg=black] #[fg=white bg=black]📅%Y-%m-%d 🕗%I:%M%p"
 set-window-option -g status-right-style "fg=white bg=black"
 # set-option -g status-right 
 

zsh/.zshrc

@@ -1,15 +1,5 @@
-# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
-# Initialization code that may require console input (password prompts, [y/n]
-# confirmations, etc.) must go above this block; everything else may go below.
-if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
-  source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
-fi
-
-# import keys
-if [ -f ~/.keys ]; then
-	. ~/.keys
-	echo "keys loaded"
-fi
+# prompt
+export PS1="%{%F{226}%}%n%{%F{220}%}@%{%F{214}%}%m %{%F{33}%}%1~ %{%f%}$ "
 
 # aliases
 # alias python="/Library/Frameworks/Python.framework/Versions/3.10/bin/python3"
@@ -52,12 +42,6 @@ compinit
 _comp_options+=(globdots)
 zstyle ':completion:*' menu select
 
-# start power theme
-source ~/powerlevel10k/powerlevel10k.zsh-theme
-
-# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
-[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
-
 # auto cd
 setopt auto_cd
 
@@ -71,4 +55,16 @@ eval "$(pyenv init --path)"
 eval "$(pyenv init -)"
 # eval "$(pyenv virtualenv-init -)"
 
-source ~/powerlevel10k/powerlevel10k.zsh-theme
+
+# fzf 
+export FZF_DEFAULT_OPTS='--layout=reverse --height=50% --preview-window=right:50%:border-sharp --border-label=" command preview " --border=double'
+
+# Set up fzf key bindings and fuzzy completion
+# Ctrl+R override for bash history
+# Alt-C overried to cd into selected directory
+eval "$(fzf --zsh)"
+
+# Quick file finder with preview and open with vim (Ctrl+T override)
+# bind '"\C-t": "fzf --preview \"cat {}\" < <(find . -type f) | xargs $EDITOR\n"'
+
+