Merge branch 'main' of db:dotfiles

26 files changed, 253 insertions, 380 deletions

diff --git a/config/common/btop/btop.conf b/config/common/btop/btop.conf
deleted file mode 100644
index 81ab72c..0000000
--- a/config/common/btop/btop.conf
+++ /dev/null
@@ -1,212 +0,0 @@
-#? Config file for btop v. 1.2.13
-
-#* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes.
-#* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes"
-color_theme = "TTY"
-
-#* If the theme set background should be shown, set to False if you want terminal background transparency.
-theme_background = False
-
-#* Sets if 24-bit truecolor should be used, will convert 24-bit colors to 256 color (6x6x6 color cube) if false.
-truecolor = True
-
-#* Set to true to force tty mode regardless if a real tty has been detected or not.
-#* Will force 16-color mode and TTY theme, set all graph symbols to "tty" and swap out other non tty friendly symbols.
-force_tty = False
-
-#* Define presets for the layout of the boxes. Preset 0 is always all boxes shown with default settings. Max 9 presets.
-#* Format: "box_name:P:G,box_name:P:G" P=(0 or 1) for alternate positions, G=graph symbol to use for box.
-#* Use whitespace " " as separator between different presets.
-#* Example: "cpu:0:default,mem:0:tty,proc:1:default cpu:0:braille,proc:0:tty"
-presets = "cpu:1:default,proc:0:default cpu:0:default,mem:0:default,net:0:default cpu:0:block,net:0:tty"
-
-#* Set to True to enable "h,j,k,l,g,G" keys for directional control in lists.
-#* Conflicting keys for h:"help" and k:"kill" is accessible while holding shift.
-vim_keys = True
-
-#* Rounded corners on boxes, is ignored if TTY mode is ON.
-rounded_corners = True
-
-#* Default symbols to use for graph creation, "braille", "block" or "tty".
-#* "braille" offers the highest resolution but might not be included in all fonts.
-#* "block" has half the resolution of braille but uses more common characters.
-#* "tty" uses only 3 different symbols but will work with most fonts and should work in a real TTY.
-#* Note that "tty" only has half the horizontal resolution of the other two, so will show a shorter historical view.
-graph_symbol = "braille"
-
-# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
-graph_symbol_cpu = "default"
-
-# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
-graph_symbol_mem = "default"
-
-# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
-graph_symbol_net = "default"
-
-# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
-graph_symbol_proc = "default"
-
-#* Manually set which boxes to show. Available values are "cpu mem net proc", separate values with whitespace.
-shown_boxes = "cpu mem net proc"
-
-#* Update time in milliseconds, recommended 2000 ms or above for better sample times for graphs.
-update_ms = 2000
-
-#* Processes sorting, "pid" "program" "arguments" "threads" "user" "memory" "cpu lazy" "cpu direct",
-#* "cpu lazy" sorts top process over time (easier to follow), "cpu direct" updates top process directly.
-proc_sorting = "memory"
-
-#* Reverse sorting order, True or False.
-proc_reversed = False
-
-#* Show processes as a tree.
-proc_tree = True
-
-#* Use the cpu graph colors in the process list.
-proc_colors = True
-
-#* Use a darkening gradient in the process list.
-proc_gradient = True
-
-#* If process cpu usage should be of the core it's running on or usage of the total available cpu power.
-proc_per_core = False
-
-#* Show process memory as bytes instead of percent.
-proc_mem_bytes = True
-
-#* Show cpu graph for each process.
-proc_cpu_graphs = True
-
-#* Use /proc/[pid]/smaps for memory information in the process info box (very slow but more accurate)
-proc_info_smaps = False
-
-#* Show proc box on left side of screen instead of right.
-proc_left = False
-
-#* (Linux) Filter processes tied to the Linux kernel(similar behavior to htop).
-proc_filter_kernel = False
-
-#* Sets the CPU stat shown in upper half of the CPU graph, "total" is always available.
-#* Select from a list of detected attributes from the options menu.
-cpu_graph_upper = "total"
-
-#* Sets the CPU stat shown in lower half of the CPU graph, "total" is always available.
-#* Select from a list of detected attributes from the options menu.
-cpu_graph_lower = "total"
-
-#* Toggles if the lower CPU graph should be inverted.
-cpu_invert_lower = True
-
-#* Set to True to completely disable the lower CPU graph.
-cpu_single_graph = False
-
-#* Show cpu box at bottom of screen instead of top.
-cpu_bottom = False
-
-#* Shows the system uptime in the CPU box.
-show_uptime = True
-
-#* Show cpu temperature.
-check_temp = True
-
-#* Which sensor to use for cpu temperature, use options menu to select from list of available sensors.
-cpu_sensor = "Auto"
-
-#* Show temperatures for cpu cores also if check_temp is True and sensors has been found.
-show_coretemp = True
-
-#* Set a custom mapping between core and coretemp, can be needed on certain cpus to get correct temperature for correct core.
-#* Use lm-sensors or similar to see which cores are reporting temperatures on your machine.
-#* Format "x:y" x=core with wrong temp, y=core with correct temp, use space as separator between multiple entries.
-#* Example: "4:0 5:1 6:3"
-cpu_core_map = ""
-
-#* Which temperature scale to use, available values: "celsius", "fahrenheit", "kelvin" and "rankine".
-temp_scale = "celsius"
-
-#* Use base 10 for bits/bytes sizes, KB = 1000 instead of KiB = 1024.
-base_10_sizes = False
-
-#* Show CPU frequency.
-show_cpu_freq = True
-
-#* Draw a clock at top of screen, formatting according to strftime, empty string to disable.
-#* Special formatting: /host = hostname | /user = username | /uptime = system uptime
-clock_format = "%X"
-
-#* Update main ui in background when menus are showing, set this to false if the menus is flickering too much for comfort.
-background_update = True
-
-#* Custom cpu model name, empty string to disable.
-custom_cpu_name = ""
-
-#* Optional filter for shown disks, should be full path of a mountpoint, separate multiple values with whitespace " ".
-#* Begin line with "exclude=" to change to exclude filter, otherwise defaults to "most include" filter. Example: disks_filter="exclude=/boot /home/user".
-disks_filter = ""
-
-#* Show graphs instead of meters for memory values.
-mem_graphs = True
-
-#* Show mem box below net box instead of above.
-mem_below_net = False
-
-#* Count ZFS ARC in cached and available memory.
-zfs_arc_cached = True
-
-#* If swap memory should be shown in memory box.
-show_swap = True
-
-#* Show swap as a disk, ignores show_swap value above, inserts itself after first disk.
-swap_disk = True
-
-#* If mem box should be split to also show disks info.
-show_disks = True
-
-#* Filter out non physical disks. Set this to False to include network disks, RAM disks and similar.
-only_physical = True
-
-#* Read disks list from /etc/fstab. This also disables only_physical.
-use_fstab = True
-
-#* Setting this to True will hide all datasets, and only show ZFS pools. (IO stats will be calculated per-pool)
-zfs_hide_datasets = False
-
-#* Set to true to show available disk space for privileged users.
-disk_free_priv = False
-
-#* Toggles if io activity % (disk busy time) should be shown in regular disk usage view.
-show_io_stat = True
-
-#* Toggles io mode for disks, showing big graphs for disk read/write speeds.
-io_mode = False
-
-#* Set to True to show combined read/write io graphs in io mode.
-io_graph_combined = False
-
-#* Set the top speed for the io graphs in MiB/s (100 by default), use format "mountpoint:speed" separate disks with whitespace " ".
-#* Example: "/mnt/media:100 /:20 /boot:1".
-io_graph_speeds = ""
-
-#* Set fixed values for network graphs in Mebibits. Is only used if net_auto is also set to False.
-net_download = 100
-
-net_upload = 100
-
-#* Use network graphs auto rescaling mode, ignores any values set above and rescales down to 10 Kibibytes at the lowest.
-net_auto = True
-
-#* Sync the auto scaling for download and upload to whichever currently has the highest scale.
-net_sync = True
-
-#* Starts with the Network Interface specified here.
-net_iface = ""
-
-#* Show battery stats in top right if battery is present.
-show_battery = True
-
-#* Which battery to use if multiple are present. "Auto" for auto detection.
-selected_battery = "Auto"
-
-#* Set loglevel for "~/.config/btop/btop.log" levels are: "ERROR" "WARNING" "INFO" "DEBUG".
-#* The level set includes all lower levels, i.e. "DEBUG" will show all logging info.
-log_level = "WARNING"
diff --git a/config/common/mpd/mpd.conf b/config/common/mpd/mpd.conf
index 4e047ba..7ea7137 100644
--- a/config/common/mpd/mpd.conf
+++ b/config/common/mpd/mpd.conf
@@ -10,3 +10,11 @@ audio_output {
 	type "pulse"
 	name "pulse audio"
 }
+
+audio_output {
+	type		"httpd"
+	name		"My HTTP Stream"
+	port		"8000"
+	always_on       "yes"			# prevent MPD from disconnecting all listeners when playback is stopped.
+	tags            "yes"			# httpd supports sending tags to listening streams.
+}
diff --git a/config/common/ncmpcpp/config b/config/common/ncmpcpp/config
index 277679c..9a87787 100644
--- a/config/common/ncmpcpp/config
+++ b/config/common/ncmpcpp/config
@@ -445,7 +445,7 @@
 ##
 ## Note: You can define startup screen by choosing screen from the list above.
 ##
-#startup_screen = playlist
+startup_screen = browser
 #
 ##
 ## Note: You can define startup slave screen by choosing screen from the list
diff --git a/config/essentials/nvim/after/plugin/colors.lua b/config/essentials/nvim/after/plugin/colors.lua
index a7dc515..048f60d 100644
--- a/config/essentials/nvim/after/plugin/colors.lua
+++ b/config/essentials/nvim/after/plugin/colors.lua
@@ -1,19 +1,21 @@
--- function ColorMyPencils(color)
--- 	color = color or "pywal"
--- 	vim.cmd.colorscheme(color)
--- 	-- vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
--- 	-- vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
--- 	-- vim.cmd.highlight("SignColumn guibg=none")
-
--- 	-- vim.g.nord_uniform_diff_background = true
--- 	-- vim.g.nord_contrast = true
--- 	-- vim.g.nord_borders = true
--- 	-- local highlights = require("nord").bufferline.highlights({
--- 	-- 	italic = true,
--- 	-- 	bold = true,
--- 	-- })
--- end
--- ColorMyPencils()
---
-local pywal16 = require('pywal16')
-pywal16.setup()
+ function ColorMyPencils(color)
+	if color == "nord" then
+		vim.cmd.colorscheme(color)
+		vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
+		vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
+		vim.cmd.highlight("SignColumn guibg=none")
+		vim.g.nord_uniform_diff_background = true
+		vim.g.nord_contrast = true
+		vim.g.nord_borders = true
+		local highlights = require("nord").bufferline.highlights({
+			italic = true,
+			bold = true,
+		})
+	elseif color == "pywal" then
+		local pywal16 = require('pywal16')
+		pywal16.setup()
+	else
+		vim.cmd("colorscheme " .. color)
+	end
+end
+ColorMyPencils("nord")
diff --git a/config/essentials/nvim/after/plugin/luasnip.lua b/config/essentials/nvim/after/plugin/luasnip.lua
index e692d37..d1da9b3 100644
--- a/config/essentials/nvim/after/plugin/luasnip.lua
+++ b/config/essentials/nvim/after/plugin/luasnip.lua
@@ -72,6 +72,11 @@ ls.add_snippets("html", {
 	</html>
 	]],
 	{i(1, "title"), i(2), i(3, "Header"), i(0)})),
+	s("sty", fmt(
+	[[
+	<link rel="stylesheet" type="text/css" href="{}">{}
+	]],
+	{ i(1), i(0) })),
 })
 
 ls.add_snippets("java", {
@@ -137,6 +142,7 @@ ls.add_snippets("java", {
 })
 
 ls.add_snippets("sh", {
+	s("TD", t "THISDIR=$(dirname $(readlink -f \"$0\"))"),
 	parse("fn", "$1 ()\n{\n\t$2\n}$0", {}),
 	parse("fdie",
 	[[
@@ -161,7 +167,32 @@ ls.add_snippets("sh", {
 
 ls.add_snippets("javascript", {
 	-- print
-	s("pt", fmt("console.log({}){}", { i(1, "\"Hello World!\"") , i(0) })),
+	s("pt", fmt("console.log({});{}", { i(1, "\"Hello World!\"") , i(0) })),
+	s("rq", fmt("const {} = require('{}');", { i(1), rep(1) })),
+	s("dbconn", fmt(
+	[[
+		let conn = null;
+		try {{
+			conn = await dbConnect();{}
+			conn.end()
+		}} catch(err) {{
+			console.error('Error:', err);
+		}}
+	]],
+	{ i(0) })),
+	s("apr", fmt(
+	[[
+	app.get('{}', (req, res) => {{
+		{}
+	}});{}
+	]],
+	{ i(1), i(2, "res.send(\"Hello world!\")"), i(0) })),
+	s("cerr", t "console.error('Error:', err);"),
+	s("gel", fmt(
+	[[
+	let {} = document.getElementById('{}');{}
+	]],
+	{ i(1), rep(1), i(0) })),
 })
 
 ls.add_snippets("telekasten", {
diff --git a/config/essentials/nvim/ftplugin/javascript.lua b/config/essentials/nvim/ftplugin/javascript.lua
index c6869e1..3a52ffb 100644
--- a/config/essentials/nvim/ftplugin/javascript.lua
+++ b/config/essentials/nvim/ftplugin/javascript.lua
@@ -1,4 +1,4 @@
 vim.keymap.set("n", "<LocalLeader>t", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1console.log(\\2);<cr><cmd>setlocal nohls<cr>")
-vim.keymap.set("n", "<LocalLeader>i", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1console.log(`\\2: ${\\2}`);<cr><cmd>setlocal nohls<cr><esc>")
+vim.keymap.set("n", "<LocalLeader>i", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1console.log('\\2:', \\2);<cr><cmd>setlocal nohls<cr><esc>")
 vim.keymap.set("i", "<LocalLeader>t", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1console.log(\\2);<cr><cmd>setlocal nohls<cr><esc>A")
-vim.keymap.set("i", "<LocalLeader>i", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1console.log(`\\2: ${\\2}`);<cr><cmd>setlocal nohls<cr><esc>A")
+vim.keymap.set("i", "<LocalLeader>i", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1console.log('\\2:', \\2);<cr><cmd>setlocal nohls<cr><esc>A")
diff --git a/config/essentials/nvim/ftplugin/telekasten.lua b/config/essentials/nvim/ftplugin/telekasten.lua
index c920492..622972f 100644
--- a/config/essentials/nvim/ftplugin/telekasten.lua
+++ b/config/essentials/nvim/ftplugin/telekasten.lua
@@ -10,9 +10,6 @@ vim.cmd("hi link CalNavi CalRuler")
 vim.cmd("hi tkTagSep ctermfg=gray guifg=gray")
 vim.cmd("hi tkTag ctermfg=175 guifg=#d3869B")
 
-vim.keymap.set("i", "(", "()<Left>")
-vim.keymap.set("i", "[", "[]<Left>")
-
 vim.keymap.set("n", "<LocalLeader>a", "<cmd>Telekasten show_tags<cr>")
 vim.keymap.set("n", "<LocalLeader>b", "<cmd>Telekasten show_backlinks<cr>")
 vim.keymap.set("n", "<LocalLeader>c", "<cmd>Telekasten show_calendar<cr>")
diff --git a/config/essentials/nvim/lua/user/aucommands.vim b/config/essentials/nvim/lua/user/aucommands.vim
index 79ffc36..873f9c9 100644
--- a/config/essentials/nvim/lua/user/aucommands.vim
+++ b/config/essentials/nvim/lua/user/aucommands.vim
@@ -21,3 +21,15 @@ autocmd BufReadPost *
 
 " Makes vim-commentary work
 autocmd FileType dosini setlocal commentstring=#\ %s
+
+funct! Filter(command)
+    redir =>output
+    silent exec a:command
+    redir END
+    let @o = output
+    execute "put o"
+	redraw!
+    return ''
+endfunct!
+
+nnoremap <Leader>F :silent call Filter('g/')<left><Left>
diff --git a/config/essentials/nvim/lua/user/cmp/sql.lua b/config/essentials/nvim/lua/user/cmp/sql.lua
new file mode 100644
index 0000000..71f6bdf
--- /dev/null
+++ b/config/essentials/nvim/lua/user/cmp/sql.lua
@@ -0,0 +1 @@
+require'lspconfig'.sqlls.setup{}
diff --git a/config/essentials/nvim/lua/user/packer.lua b/config/essentials/nvim/lua/user/packer.lua
index a38dcd9..c9e27a2 100644
--- a/config/essentials/nvim/lua/user/packer.lua
+++ b/config/essentials/nvim/lua/user/packer.lua
@@ -13,7 +13,7 @@ return require('packer').startup(function(use)
 	use('theprimeagen/harpoon')
 
 	-- colors
-	-- use('shaunsingh/nord.nvim')
+	use('shaunsingh/nord.nvim')
 	use { 'uZer/pywal16.nvim', as = 'pywal16' }
 	use('norcalli/nvim-colorizer.lua')
 
@@ -39,6 +39,8 @@ return require('packer').startup(function(use)
 	use('renerocksai/calendar-vim')
 	use('ojroques/vim-oscyank', {branch = "main"})
 	use("potamides/pantran.nvim")
+	use('alx741/vinfo')
+	use('github/copilot.vim')
 
 	-- objects
 	use('michaeljsmith/vim-indent-object')
diff --git a/config/essentials/nvim/lua/user/remap.lua b/config/essentials/nvim/lua/user/remap.lua
index 25052f7..0fe4164 100644
--- a/config/essentials/nvim/lua/user/remap.lua
+++ b/config/essentials/nvim/lua/user/remap.lua
@@ -64,6 +64,7 @@ vim.keymap.set("n", "<Leader>x", "<cmd>!chmod +x %<cr>", { noremap = true, silen
 -- replace
 vim.keymap.set("n", "<Leader>sf", [[:%s/\<<C-r><C-w>\>/<C-r><C-w><C-w>/gI<Left><Left><Left>]])
 vim.keymap.set("n", "<Leader>sl", [[:s/\<<C-r><C-w>\>/<C-r><C-w><C-w>/gI<Left><Left><Left>]])
+vim.keymap.set("n", "<LocalLeader>f", "<cmd>.!fold -w 80 -s<cr>")
 
 -- write
 vim.keymap.set("n", "<LocalLeader>w", "<cmd>write<cr>", { noremap = true })
diff --git a/config/essentials/nvim/lua/user/zk.lua b/config/essentials/nvim/lua/user/zk.lua
index 9de8b87..e1c9bcc 100644
--- a/config/essentials/nvim/lua/user/zk.lua
+++ b/config/essentials/nvim/lua/user/zk.lua
@@ -39,6 +39,18 @@ require('telekasten').setup({
 	rename_update_links = true,
 	media_previewer = "telescope-media-files",
 	follow_url_fallback = nil,
+	vaults = {
+		SoftwareDesign = {
+			home = home .. "/" .. "SoftwareDesign",
+			template_new_note = home .. "/" .. "templates/new_note.md",
+			new_note_filename = "title",
+		},
+		businessIT = {
+			home = home .. "/" .. "businessIT",
+			template_new_note = home .. "/" .. "templates/new_note.md",
+			new_note_filename = "title",
+		}
+	}
 })
 
 vim.keymap.set("n", "<leader>z", "<cmd>Telekasten panel<cr>")
@@ -53,5 +65,6 @@ vim.keymap.set("n", "<leader>zm", "<cmd>Telekasten browse_media<cr>")
 vim.keymap.set("n", "<leader>zn", "<cmd>Telekasten new_note<cr>")
 vim.keymap.set("n", "<leader>zp", "<cmd>Telekasten preview_img<cr>")
 vim.keymap.set("n", "<leader>zs", "<cmd>Telekasten switch_vault<cr>")
+vim.keymap.set("n", "<leader>zt", "<cmd>Telekasten panel<cr>")
 vim.keymap.set("n", "<leader>zw", "<cmd>Telekasten find_weekly_notes<cr>")
 vim.keymap.set("n", "<leader>#", "<cmd>Telekasten show_tags<cr>")
diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc
index 96ec100..83da0f6 100644
--- a/config/essentials/zsh/.zshrc
+++ b/config/essentials/zsh/.zshrc
@@ -65,6 +65,21 @@ bindkey "^Xe" edit-command-line
 bindkey "^[." insert-last-word
 bindkey "^['" quote-line
 
+isTextFile()
+{
+	if [ ! -f "$1" ]
+	then
+		return 1
+	fi
+
+	file_type=$(file -b --mime-type "$1")
+	if [[ "$file_type" == text/* ]]
+	then
+		return
+	fi
+	return 1
+}
+
 # rehash hook
 zshcache_time="$(date +%s%N)"
 autoload -Uz add-zsh-hook
@@ -80,14 +95,35 @@ rehash_precmd() {
 # window title hooks
 add-zsh-hook -Uz precmd rehash_precmd
 set_wt_action () {
-	print -Pn "\e]0;$1\a"
+	print -Pn '\e]0;$1\a'
 }
 add-zsh-hook -Uz preexec set_wt_action
 set_wt () {
 	print -Pn "\e]0;%n@%m on %~\a"
 }
 add-zsh-hook -Uz precmd set_wt
+function osc7 {
+    local LC_ALL=C
+    export LC_ALL
 
+    setopt localoptions extendedglob
+    input=( ${(s::)PWD} )
+    uri=${(j::)input/(#b)([^A-Za-z0-9_.\!~*\'\(\)-\/])/%${(l:2::0:)$(([##16]#match))}}
+    print -n "\e]7;file://${HOSTNAME}${uri}\e\\"
+}
+add-zsh-hook -Uz chpwd osc7
+command_not_found_handler () {
+	isTextFile "$1" || 
+		echo "zsh: command not found: $1" >&2
+}
+# open file with file name
+open_file() {
+	if [ ${1:0:2} != "./" ] && isTextFile "$1"
+	then
+		"$EDITOR" "$1"
+	fi
+}
+add-zsh-hook -Uz preexec open_file
 
 # prompt
 PS1=' %B%(#.%F{1}.%F{13})[%n%b%f@%B%F{6}%m]%b%f %3~ '
diff --git a/config/essentials/zsh/aliases.zsh b/config/essentials/zsh/aliases.zsh
index c7894e3..c9fa4dc 100644
--- a/config/essentials/zsh/aliases.zsh
+++ b/config/essentials/zsh/aliases.zsh
@@ -8,8 +8,8 @@ fi
 
 if [ "$WAYLAND_DISPLAY" ]
 then
-	alias -g clipp='wl-copy'
-	alias -g clipo='wl-paste'
+	alias -g clipp='wl-copy -n'
+	alias -g clipo='wl-paste -n'
 else
 	if which devour > /dev/null 2>&1  
 	then
@@ -21,7 +21,7 @@ else
 fi
 
 # Programs
-alias nv='nvim'
+alias vi='nvim'
 alias nb='newsboat'
 alias sr='surfraw'
 alias ccu='calcurse'
@@ -89,8 +89,8 @@ alias grub-update='doas grub-mkconfig -o /boot/grub/grub.cfg'
 alias scr='nvim +"setlocal buftype=nofile bufhidden=hide noswapfile filetype=txt" scratch'
 alias vimp="vim '+PlugInstall'"
 alias nvimp="nvim '+PackerSync'"
-alias nvg='git status > /dev/null 2>&1 && nv "+Git"'
-alias nvn='nv "+Telekasten panel"'
+alias nvg='git status > /dev/null 2>&1 && nvim "+Git"'
+alias nvn='nvim "+Telekasten panel"'
  
 alias xrandr-rpgmaker='xrandr --auto --output VGA-1 --mode 1024x768 --left-of HDMI-1 && ~/.fehbg'
 alias xrandr-default='xrandr --auto --output VGA-1 --mode 1920x1080 --left-of HDMI-1 --output HDMI-1 --mode 1920x1080 && ~/.fehbg'
@@ -106,6 +106,9 @@ alias fif='find . -type "f" | grep'
 alias fid='find . -type "d" | grep'
 alias sxt='sxiv -t'
 alias wgsh='wget --quiet --show-progress'
+alias ss4='ss -tln4p | cut -f1 -d,'
+alias mdbw='mariadb -h 0.0.0.0 -u padmin -pbulbizarre padmindb'
+alias mdbwa='mariadb -h 10.3.50.5 -u padmin -pbulbizarre padmindb'
 
 # ssh
 alias sha='ssh-add'
@@ -115,6 +118,8 @@ alias vidlen='ffprobe -show_entries format=duration -v quiet -of csv="p=0" -i'
 alias whatsmyip='curl -s "ifconfig.co"'
 alias icognito='unset HISTFILE'
 alias webcam='v4l2-ctl --set-fmt-video=width=1280,height=720; mpv --demuxer-lavf-format=video4linux2 --demuxer-lavf-o-set=input_format=mjpeg av://v4l2:/dev/video0 --profile=low-latency --untimed --no-resume-playback'
+alias capture='echo "Y" | wf-recorder -o "$(hyprctl -j monitors | jq -r '\''.[].name'\'' | fzf)" --codec=vp8_vaapi --device=/dev/dri/renderD128 -f output.webm -D'
+alias qrclipo='qrencode -s 16 "$(clipo)" -o - | imv -w "imv - $(clipo)" -'
 alias airpods='bluetoothctl connect 60:93:16:24:00:10'
 alias hotpsot='nmcli dev wifi hotspot ifname wlan0 ssid wiefie password "peepeepoopoo"'
 alias wtip='wt ip -c -brief addr'
@@ -123,6 +128,11 @@ ls $HOME/.config/mutt/configs |
 fzf |
 tee /dev/stderr |
 xargs -I {} ln -sf "$HOME/.config/mutt/configs/{}" $HOME/.config/mutt/muttrc'
+alias fusephone='sshfs myphone: /media/phone'
+alias ttyper='ttyper -l english1000 -w 100'
+
+# NPM
+alias npi="npm init --yes"
 
 # Python
 alias penv='python3 -m venv env'
@@ -138,12 +148,14 @@ alias kll='killall'
 alias pi='ping archlinux.org -c4'
 alias -g sba='source env/bin/activate || source bin/activate'
 alias -g smc='systemctl'
-alias smcu='systemctl --user'
+alias ssc='doas smc'
+alias smcu='smc --user'
 alias zsr='source ${ZDOTDIR:-$HOME}/.zshrc && rehash'
 alias rh='rehash'
 alias wf='doas wipefs -a'
 alias dmci="doas make clean install"
 alias rmd='rm -f *.{orig,rej}'
+alias cdzot='mkdir -p /tmp/zottesite && cd /tmp/zottesite'
 
 alias vbm='vboxmanage'
 alias vbls='vbm list vms'
@@ -158,7 +170,7 @@ alias eto='$EDITOR ~/sync/TODO'
 alias edw='$EDITOR ~/src/dwm/config.def.h'
 alias edm='$EDITOR ~/src/dmenu/config.def.h'
 alias ehst='$EDITOR $ZDOTDIR/histfile'
-alias ezh=' $EDITOR $HOME/.config/hypr/hyprland.conf'
+alias ezh=' $EDITOR $HISTFILE'
 alias est='$EDITOR ~/src/st/config.def.h'
 alias esl='$EDITOR ~/src/slock/config.def.h'
 alias esls='$EDITOR ~/src/slstatus/config.def.h'
@@ -167,6 +179,7 @@ alias cfd='$EDITOR config.def.h'
 # quick cd
 alias cda='cd $HOME/docs/android/projects'
 alias cds='cd $HOME/src/'
+alias cdsw='cd $HOME/src/WheelAdvisor'
 alias cdw='cd $HOME/src/dwm'
 alias cddm='cd $HOME/src/dmenu'
 alias cdslo='cd $HOME/src/slock'
@@ -184,6 +197,7 @@ alias cdd='cd $HOME/dl'
 alias cdp='cd $HOME/pics'
 alias cdrs='cd /srv/'
 alias cdng='cd /etc/nginx'
+alias czo='cd $HOME/zot/'
 
 # googoo aliases
 alias o.='o .'
@@ -203,14 +217,16 @@ alias fzps='ps aux | tail +2 | fzf --bind \
 4:execute(echo -n {} | awk '\''{print \$9}'\'' | xclip -sel c -r),\
 5:execute(echo -n {} | tr -s '\'' '\'' | cut -f 11- -d '\'' '\'' | xclip -sel c -r)"'
 alias asf='alias | fzf'
+alias fzh="tac $HISTFILE | fzf | tee /dev/stderr | clipp"
 
-alias -s conf="$EDITOR"
-alias -s txt="$EDITOR"
-alias -s c="$EDITOR"
-alias -s z80="$EDITOR"
 alias -s zip='unzip -l'
 alias -s tar='tar tf'
 
+alias dcb='docker build'
+alias dcbt='docker build -t'
+alias dce='docker exec'
+alias dcet='docker exec -it'
+
 alias cfg='git --git-dir=$HOME/src/dotfiles/.git --work-tree=$HOME/src/dotfiles'
 # oh-my-zsh git aliases
 alias g='git'
diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh
index 8b7dbef..3243750 100644
--- a/config/essentials/zsh/functions.zsh
+++ b/config/essentials/zsh/functions.zsh
@@ -86,13 +86,6 @@ clip () {
 	fi
 }
 
-fzh () {
-    choice="$(tac $HOME/.config/zsh/histfile | fzf)"
-    test -z "${choice}" && return
-    echo "${choice}" >> "${HOME}/.config/zsh/histfile"
-    eval "${choice}"
-}
-
 unzipp () {
     file=$1
     shift
@@ -110,10 +103,10 @@ esc () {
 }
 
 delfile () {
-	curl ${2:-"https://up.kallipso.be/delete/$1"}
+	curl "${2:-https://up.kallipso.be/delete/$1}"
 }
 upfile () {
-	curl -F "file=@\"$1\"" ${2:-"https://up.kallipso.be"}
+	curl -F "file=@\"$1\"" ${2:-http://0x0.st}
 }
 
 sgd () {
@@ -238,3 +231,22 @@ mime-default ()
 		xargs -I {} xdg-mime default "$1" "{}"
 	die "Done."
 }
+
+addedkeys () {
+	find ~/.ssh -iname "*.pub" | while read key
+	do 
+		local fingerprint="$(ssh-keygen -lf "$key" 2>/dev/null)" 
+		if ssh-add -l | grep -q "$fingerprint"
+		then
+		echo "$key"
+		fi
+	done | sed "s,$HOME/.ssh/,,"
+}
+
+fpass () {
+	find $HOME/.password-store -type f -not -path ".git" |
+		grep "\.gpg$" |
+		sed "s,$HOME/.password-store/,,;s,\.gpg$,," |
+		fzf |
+		xargs pass show -c
+}
diff --git a/config/extra/pikaur.conf b/config/extra/pikaur.conf
deleted file mode 100644
index 3dad848..0000000
--- a/config/extra/pikaur.conf
+++ /dev/null
@@ -1,50 +0,0 @@
-[sync]
-alwaysshowpkgorigin = no
-develpkgsexpiration = -1
-upgradesorting = versiondiff
-showdownloadsize = no
-ignoreoutofdateaurupgrades = no
-
-[build]
-keepbuilddir = no
-keepdevbuilddir = yes
-keepbuilddeps = no
-gpgdir = 
-skipfailedbuild = no
-alwaysusedynamicusers = no
-ignorearch = no
-
-[review]
-noedit = no
-donteditbydefault = no
-nodiff = no
-gitdiffargs = --ignore-space-change,--ignore-all-space
-diffpager = auto
-hidedifffiles = .SRCINFO
-
-[colors]
-version = 10
-versiondiffold = 11
-versiondiffnew = 9
-
-[ui]
-requireenterconfirm = yes
-printcommands = no
-aursearchsorting = hottest
-displaylastupdated = no
-groupbyrepository = yes
-reversesearchsorting = no
-warnaboutpackageupdates = 
-
-[misc]
-sudoloopinterval = 59
-pacmanpath = pacman
-privilegeescalationtool = sudo
-
-[network]
-aururl = https://aur.archlinux.org
-newsurl = https://www.archlinux.org/feeds/news/
-socks5proxy = 
-aurhttpproxy = 
-aurhttpsproxy = 
-
diff --git a/config/extra/tridactyl/tridactylrc b/config/extra/tridactyl/tridactylrc
index b041d1c..fa6ed1d 100644
--- a/config/extra/tridactyl/tridactylrc
+++ b/config/extra/tridactyl/tridactylrc
@@ -40,17 +40,22 @@ set searchurls.gentoo_wiki https://wiki.gentoo.org/index.php?title=Special%3ASea
 set searchurls.qwant https://www.qwant.com/?q=
 
 " Binds
+" vim macro:
+" Ibind gnp tabopen yy2pwwdtojRwinbblrwkro
 bind J tabnext
 bind K tabprev
-bind gna tabopen moz-extension://7cf2fd76-6055-4053-bb4b-f518030f6240/static/docs/classes/_src_lib_config_.default_config.html
-bind goa open moz-extension://7cf2fd76-6055-4053-bb4b-f518030f6240/static/docs/classes/_src_lib_config_.default_config.html
-bind gwa winopen moz-extension://7cf2fd76-6055-4053-bb4b-f518030f6240/static/docs/classes/_src_lib_config_.default_config.html
+" chat gpt
 bind gnc tabopen https://chat.openai.com/chat
 bind goc open https://chat.openai.com/chat
 bind gwc winopen https://chat.openai.com/chat
+" awesome pixel tutorials
 bind gnp tabopen https://github.com/Siilwyn/awesome-pixel-art#tutorials
 bind gop open https://github.com/Siilwyn/awesome-pixel-art#tutorials
 bind gwp winopen https://github.com/Siilwyn/awesome-pixel-art#tutorials
+" deluge
+bind gnd tabopen http://192.168.178.52:8112/
+bind god open http://192.168.178.52:8112/
+bind gwd winopen http://192.168.178.52:8112/
 
 " For syntax highlighting see https://github.com/tridactyl/vim-tridactyl
 " vim: set filetype=tridactyl
diff --git a/config/hyprland/foot/foot.ini b/config/hyprland/foot/foot.ini
index 24df032..8caee75 100644
--- a/config/hyprland/foot/foot.ini
+++ b/config/hyprland/foot/foot.ini
@@ -113,7 +113,7 @@ alpha=0.90
 # clipboard-copy=Control+Shift+c XF86Copy
 # clipboard-paste=Control+Shift+v XF86Paste
 # primary-paste=Shift+Insert
-# search-start=Control+Shift+r
+search-start=Control+Shift+r
 # font-increase=Control+plus Control+equal Control+KP_Add
 # font-decrease=Control+minus Control+KP_Subtract
 # font-reset=Control+0 Control+KP_0
@@ -125,7 +125,7 @@ alpha=0.90
 # pipe-scrollback=[sh -c "xurls | fuzzel | xargs -r firefox"] none
 # pipe-selected=[xargs -r firefox] none
 # show-urls-launch=Control+Shift+u
-# show-urls-copy=none
+show-urls-copy=Mod1+Shift+l
 # show-urls-persistent=none
 # prompt-prev=Control+Shift+z
 # prompt-next=Control+Shift+x
diff --git a/config/hyprland/hypr/binds.conf b/config/hyprland/hypr/binds.conf
index 315a9dd..5c2dd99 100644
--- a/config/hyprland/hypr/binds.conf
+++ b/config/hyprland/hypr/binds.conf
@@ -3,12 +3,14 @@ $mainMod = SUPER
 $term = foot
 
 $menu = $(tofi-run)
+$menu_opt = $(tofi-run --auto-accept-single=false)
 
 bind = $mainMod, Return, exec, $term
 bind = $mainMod SHIFT, Return, exec, $menu
+bind = $mainMod CTRL, Return, exec, $menu_opt
 bind = $mainMod, C, killactive, 
 bind = $mainMod SHIFT, C, exec, hyprctl kill
-bind = $mainMod, Q, exit, 
+bind = $mainMod SHIFT, Q, exit, 
 bind = $mainMod, F, togglefloating, 
 bind = $mainMod SHIFT, P, pseudo
 bind = $mainMod, S, togglesplit
@@ -75,34 +77,34 @@ bindm = $mainMod, mouse:273, resizewindow
 
 bind = $mainMod, M, submap, menuscripts
 submap = menuscripts
-bind =, A, exec, dmask
-bind =, C, exec, dmclip
-bind =, D, exec, mdsktp
-bind =, E, exec, memoji
-bind =, F, exec, dmfm
-bind =, G, exec, mpassgen
-bind =, H, exec, mhelp
-bind =, I, exec, mapimg
-bind =, L, exec, dmlang
-bind =, M, exec, mpass
-bind =, P, exec, mpdf
-bind =, O, exec, mpower
-bind =, U, exec, mcurs
-bind =, V, exec, mvid
 bind = $mainMod, A, exec, dmask
-bind = $mainMod, C, exec, dmclip
+bind =, A, exec, dmask
+bind = $mainMod, C, exec, copyhist
+bind =, C, exec, copyhist
 bind = $mainMod, D, exec, mdsktp
+bind =, D, exec, mdsktp
 bind = $mainMod, E, exec, memoji
+bind =, E, exec, memoji
 bind = $mainMod, F, exec, dmfm
+bind =, F, exec, dmfm
 bind = $mainMod, G, exec, mpassgen
+bind =, G, exec, mpassgen
 bind = $mainMod, H, exec, mhelp
+bind =, H, exec, mhelp
 bind = $mainMod, I, exec, mapimg
+bind =, I, exec, mapimg
 bind = $mainMod, L, exec, dmlang
+bind =, L, exec, dmlang
 bind = $mainMod, M, exec, mpass
+bind =, M, exec, mpass
 bind = $mainMod, P, exec, mpdf
+bind =, P, exec, mpdf
 bind = $mainMod, O, exec, mpower
+bind =, O, exec, mpower
 bind = $mainMod, U, exec, mcurs
+bind =, U, exec, mcurs
 bind = $mainMod, V, exec, mvid
+bind =, V, exec, mvid
 source = ./reset-submap.conf
 submap = reset
 
diff --git a/config/hyprland/hypr/hyprland.conf b/config/hyprland/hypr/hyprland.conf
index e7048ae..8aa437e 100644
--- a/config/hyprland/hypr/hyprland.conf
+++ b/config/hyprland/hypr/hyprland.conf
@@ -4,8 +4,7 @@ monitor=,preferred,auto,1
 
 source = ./env.conf
 
-exec-once = gammastep & waybar
-exec-once = swaybg -i ~/pics/wallpaper
+exec-once = $HOME/.config/hypr/startup.sh
 
 input {
     kb_layout = us
@@ -32,7 +31,7 @@ general {
 
     layout = dwindle
 
-	cursor_inactive_timeout = 2
+	cursor_inactive_timeout = 0
 }
 
 misc {
diff --git a/config/hyprland/hypr/startup.sh b/config/hyprland/hypr/startup.sh
new file mode 100755
index 0000000..ab0e48b
--- /dev/null
+++ b/config/hyprland/hypr/startup.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+swaybg -i ~/pics/wallpaper &
+waybar &
+gammastep &
+wl-paste --watch cliphist store &
diff --git a/config/hyprland/tofi/config b/config/hyprland/tofi/config
deleted file mode 120000
index 75daa23..0000000
--- a/config/hyprland/tofi/config
+++ /dev/null
@@ -1 +0,0 @@
-/home/aluc/.config/tofi/themes/base16
\ No newline at end of file
diff --git a/config/hyprland/tofi/themes/colors b/config/hyprland/tofi/themes/colors
deleted file mode 100644
index 3c35fc2..0000000
--- a/config/hyprland/tofi/themes/colors
+++ /dev/null
@@ -1,14 +0,0 @@
-# tofi
-text-color = #d1dae6
-prompt-color = #999CA9
-placeholder-color = #999CA9
-input-color = #d1dae6
-default-result-color = #9CB3D4
-selection-color = #9298a1
-selection-match-color = #d1dae6
-
-background-color = #0f1114f0
-
-outline-color = #999CA9
-
-border-color = #9CB3D4
diff --git a/config/hyprland/waybar/config.jsonc b/config/hyprland/waybar/config.jsonc
index 006d22b..816a851 100644
--- a/config/hyprland/waybar/config.jsonc
+++ b/config/hyprland/waybar/config.jsonc
@@ -1,8 +1,8 @@
 {
 	"layer": "top",
-	"modules-left": ["battery", "wlr/workspaces", "mpd"],
+	"modules-left": ["battery", "clock", "wlr/workspaces", "mpd"],
 	"modules-center": ["hyprland/window"],
-	"modules-right": ["network", "pulseaudio", "temperature", "cpu", "custom/memory", "clock", "tray"],
+	"modules-right": ["network", "pulseaudio", "temperature", "cpu", "custom/memory", "tray"],
 	"wlr/workspaces": {
 		"on-click": "activate",
 	},
@@ -10,13 +10,15 @@
 		"tooltip": false,
 		"format": "{artist} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S})",
 		"artist-len": 24,
-		"format-disconnected": "ﳌ",
-		"format-stopped": "",
+		"format-disconnected": "",
+		"format-stopped": "",
 		"state-icons": {
-			"playing": "",
-			"paused": "",
+			"playing": "",
+			"paused": "",
 		},
 		"on-click": "mpc toggle",
+		"on-scroll-up": "mpc volume +5",
+		"on-scroll-down": "mpc volume -5",
 	},
 	"battery": {
 		"format-charging": " {capacity}%",
@@ -29,9 +31,9 @@
 	"pulseaudio": {
 		"tooltip": false,
 		"scroll-step": 5,
-		"format": "{icon} {volume}%",
+		"format": "{icon} {volume:3}%",
 		"format-icons": {
-			"default": ["奄", "奔", "墳"]
+			"default": ["", "", ""]
 		},
 		"on-click": "pavucontrol",
 	},
@@ -43,11 +45,11 @@
 		},
 	},
 	"network": {
-		"format-wifi": "",
+		"format-wifi": " ",
 		"tooltip-format-wifi": "{ifname} {essid}",
 		"format-ethernet": "",
 		"tooltip-format-ethernet": "{ifname} {ipaddr}",
-		"format-disconnected": "裏",
+		"format-disconnected": "",
 	},
 	"cpu": {
 		"tooltip": false,
@@ -61,7 +63,7 @@
 	},
 	"clock": {
 		"format": "{:%H:%M}",
-		"format-alt": " {:%A, %B %d, %Y (%R)}",
+		"format-alt": "{:(%R) %A %d %B}",
 		"interval": 1,
 	},
 	"tray": {
diff --git a/config/hyprland/waybar/schemes/base16.css b/config/hyprland/waybar/schemes/base16.css
index 68c5219..eced638 100644
--- a/config/hyprland/waybar/schemes/base16.css
+++ b/config/hyprland/waybar/schemes/base16.css
@@ -38,6 +38,7 @@ window#waybar.PCSX2 #window {
 }
 
 #mpd, #battery,
+#window,
 #network, #pulseaudio, #temperature, #cpu, #custom-memory {
 	margin-left: 8px;
 	padding-left: 16px;
@@ -45,8 +46,10 @@ window#waybar.PCSX2 #window {
 	border-radius: 26px;
 }
 
-#workspaces, #mpd, #battery,
-#network, #pulseaudio, #temperature, #cpu, #custom-memory, #workspaces, #clock, #tray {
+#workspaces, #mpd, #battery, #clock,
+#window,
+#network, #pulseaudio, #temperature, #cpu, #custom-memory, #tray {
+	border: solid @background 2px;
 	margin-top: 4px;
 	margin-bottom: 2px;
 	transition: none;
@@ -55,28 +58,29 @@ window#waybar.PCSX2 #window {
 #battery {
 	color: @color6;
 	background: @background;
+	border-color: @color4;
 }
 
 #workspaces {
 	margin-left: 12px;
 	border-radius: 26px;
-	background: @background;
+	background: @color3;
 }
 
 #workspaces button {
 	transition: none;
-	color: @foreground;
 	background: transparent;
 	font-size: 16px;
+	color: @background;
 }
 
 #workspaces button.active {
-	color: @color12;
+	text-shadow: 1px 0px 1px @background;
 }
 
 #workspaces button:hover {
 	transition: none;
-	color: @color11;
+	color: @color8;
 }
 
 #mpd {
@@ -88,56 +92,58 @@ window#waybar.PCSX2 #window {
 #mpd.stopped {
 	color: @foreground;
 	background: @background;
+	border-color: @color4;
 }
 
-#window {
+#clock {
 	margin-top: 4px;
 	margin-bottom: 2px;
 	margin-left: 8px;
 	padding-left: 16px;
 	padding-right: 16px;
 	border-radius: 26px;
-	color: @color6;
-	color: @color4;
+	color: @color3;
 	background: @background;
+	border-color: @color4;
+}
+
+#window {
+	color: @background;
+	background: @color4;
 }
 
 #network {
 	color: @background;
-	background: @color12;
+	background: @color5;
 }
 
 #pulseaudio {
 	color: @background;
-	background: @color14;
+	background: @color4;
 }
 
 #temperature {
 	color: @background;
-	background: @color7;
+	background: @color3;
 }
 
 #cpu {
 	color: @background;
-	background: @color3;
+	background: @color4;
 }
 
 #custom-memory {
-	color: @background;
-	background: @color2;
-}
-
-#clock {
 	margin-left: 8px;
 	margin-right: 12px;
 	padding-left: 16px;
 	padding-right: 16px;
 	border-radius: 26px;
-	color: @foreground;
-	background: @background;
+	color: @background;
+	background: @color5;
 }
 
 #tray {
+	border: none;
 	margin-right: 12px;
 	color: @foreground;
 	background: transparent;
diff --git a/config/theme/gtk-3.0/bookmarks b/config/theme/gtk-3.0/bookmarks
deleted file mode 100644
index e69de29..0000000
--- a/config/theme/gtk-3.0/bookmarks
+++ /dev/null