Merge branch 'main' of db:dotfiles

14 files changed, 47 insertions, 74 deletions

diff --git a/.gitignore b/.gitignore
index e076328..27c119b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ config/essentials/zsh/histfile
 config/essentials/zsh/.zcompdump
 config/extra/jftui/settings
 config/extra/mutt/muttrc
+config/extra/pikaur.conf
 config/hyprland/foot/colors
 config/hyprland/tofi/themes/colors
 config/hyprland/waybar/colors.css
diff --git a/bin/guiscripts/locker b/bin/guiscripts/locker
index f464617..c35f6d4 100755
--- a/bin/guiscripts/locker
+++ b/bin/guiscripts/locker
@@ -2,8 +2,21 @@
 which swaylock grim pixelate > /dev/null ||
 	exit 1
 umask 077
-file=/tmp/bg.png
-grim -l 0 - > $file
-pixelate $file $file
-swaylock -u -i $file
-shred -uz $file
+
+monitors="$(hyprctl monitors -j |
+	jq -r '.[].name' |
+	tr '\n' ' ' |
+	sed 's,.$,,')"
+
+for monitor in $monitors
+do
+	file="/tmp/locker-$monitor.png"
+	grim -l 0 -o "$monitor" "$file"
+	pixelate "$file" "$file"
+	# Create image command for swaylock
+	icmd="$icmd --image $monitor:$file"
+	files="$files $file"
+done
+
+swaylock -f -u $icmd
+shred -uz -- $files
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/luasnip.lua b/config/essentials/nvim/after/plugin/luasnip.lua
index 13f4432..7fcedc7 100644
--- a/config/essentials/nvim/after/plugin/luasnip.lua
+++ b/config/essentials/nvim/after/plugin/luasnip.lua
@@ -170,7 +170,7 @@ ls.add_snippets("javascript", {
 		{}
 	}});{}
 	]],
-	{ i(1), i(2, "app.get(\"Hello world!\")"), i(0) })),
+	{ i(1), i(2, "res.send(\"Hello world!\")"), i(0) })),
 })
 
 ls.add_snippets("telekasten", {
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/packer.lua b/config/essentials/nvim/lua/user/packer.lua
index 5193f05..3933838 100644
--- a/config/essentials/nvim/lua/user/packer.lua
+++ b/config/essentials/nvim/lua/user/packer.lua
@@ -39,6 +39,7 @@ return require('packer').startup(function(use)
 	use('renerocksai/calendar-vim')
 	use('ojroques/vim-oscyank', {branch = "main"})
 	use("potamides/pantran.nvim")
+	use('alx741/vinfo')
 
 	-- objects
 	use('michaeljsmith/vim-indent-object')
diff --git a/config/essentials/nvim/lua/user/zk.lua b/config/essentials/nvim/lua/user/zk.lua
index 9de8b87..8e1d142 100644
--- a/config/essentials/nvim/lua/user/zk.lua
+++ b/config/essentials/nvim/lua/user/zk.lua
@@ -39,6 +39,13 @@ require('telekasten').setup({
 	rename_update_links = true,
 	media_previewer = "telescope-media-files",
 	follow_url_fallback = nil,
+	vaults = {
+		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 +60,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/aliases.zsh b/config/essentials/zsh/aliases.zsh
index a72700c..8b2da5c 100644
--- a/config/essentials/zsh/aliases.zsh
+++ b/config/essentials/zsh/aliases.zsh
@@ -127,6 +127,7 @@ 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'
 
 # Python
 alias penv='python3 -m venv env'
@@ -149,6 +150,7 @@ alias rh='rehash'
 alias wf='doas wipefs -a'
 alias dmci="doas make clean install"
 alias rmd='rm -f *.{orig,rej}'
+alias mdbw='mariadb -h 0.0.0.0 -P 4033 -u padmin -pbulbizarre padmindb'
 
 alias vbm='vboxmanage'
 alias vbls='vbm list vms'
@@ -209,6 +211,7 @@ 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"
diff --git a/config/essentials/zsh/functions.zsh b/config/essentials/zsh/functions.zsh
index dcf0f7c..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
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/hyprland/foot/foot.ini b/config/hyprland/foot/foot.ini
index 11bc728..8caee75 100644
--- a/config/hyprland/foot/foot.ini
+++ b/config/hyprland/foot/foot.ini
@@ -125,7 +125,7 @@ search-start=Control+Shift+r
 # 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=Mod1+l
+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 32ff88c..5c2dd99 100644
--- a/config/hyprland/hypr/binds.conf
+++ b/config/hyprland/hypr/binds.conf
@@ -10,7 +10,7 @@ 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
diff --git a/config/hyprland/waybar/config.jsonc b/config/hyprland/waybar/config.jsonc
index 72a6872..816a851 100644
--- a/config/hyprland/waybar/config.jsonc
+++ b/config/hyprland/waybar/config.jsonc
@@ -1,7 +1,7 @@
 {
 	"layer": "top",
-	"modules-left": ["battery", "wlr/workspaces", "mpd"],
-	"modules-center": ["clock"],
+	"modules-left": ["battery", "clock", "wlr/workspaces", "mpd"],
+	"modules-center": ["hyprland/window"],
 	"modules-right": ["network", "pulseaudio", "temperature", "cpu", "custom/memory", "tray"],
 	"wlr/workspaces": {
 		"on-click": "activate",
@@ -63,7 +63,7 @@
 	},
 	"clock": {
 		"format": "{:%H:%M}",
-		"format-alt": "{:%R %A %d %B}",
+		"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 170a72c..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,9 @@ window#waybar.PCSX2 #window {
 	border-radius: 26px;
 }
 
-#workspaces, #mpd, #battery,
-#network, #pulseaudio, #temperature, #cpu, #custom-memory, #clock, #tray {
+#workspaces, #mpd, #battery, #clock,
+#window,
+#network, #pulseaudio, #temperature, #cpu, #custom-memory, #tray {
 	border: solid @background 2px;
 	margin-top: 4px;
 	margin-bottom: 2px;
@@ -105,6 +107,11 @@ window#waybar.PCSX2 #window {
 	border-color: @color4;
 }
 
+#window {
+	color: @background;
+	background: @color4;
+}
+
 #network {
 	color: @background;
 	background: @color5;