null-ls dead; using none-ls

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='\[\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
@@ -41,7 +45,8 @@ alias r="ranger"
 alias grep='grep --colour=auto'
 
 # 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

hypr/.config/hypr/hyprland.conf

@@ -160,7 +160,7 @@ 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
@@ -191,16 +191,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 +215,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/snowy_church.jpg
 }
 
 

hypr/.config/hypr/hyprpaper.conf

@@ -1,4 +1,4 @@
-preload = /home/clint/Pictures/wallpapers/castle_view.jpg
+preload = 
 wallpaper = HDMI-A-1, /home/clint/Pictures/wallpapers/castle_view.jpg
 wallpaper = DP-2, /home/clint/Pictures/wallpapers/castle_view.jpg
 

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({