summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/common/mpd/mpd.conf1
-rwxr-xr-xconfig/common/tmux/tmux.conf2
-rw-r--r--config/essentials/nvim/after/plugin/luasnip.lua3
-rw-r--r--config/essentials/nvim/ftplugin/telekasten.lua1
-rw-r--r--config/essentials/nvim/lua/user/remap.lua3
-rw-r--r--config/essentials/nvim/lua/user/zk.lua20
-rw-r--r--config/essentials/zsh/.zshrc6
-rw-r--r--config/extra/zathura/zathurarc11
-rwxr-xr-xconfig/wayland/dwl/startup.sh23
l---------config/wayland/waybar/config.jsonc2
10 files changed, 46 insertions, 26 deletions
diff --git a/config/common/mpd/mpd.conf b/config/common/mpd/mpd.conf
index 606c8d4..889b458 100644
--- a/config/common/mpd/mpd.conf
+++ b/config/common/mpd/mpd.conf
@@ -2,6 +2,7 @@ music_directory "~/music"
playlist_directory "~/.config/mpd/playlists"
db_file "~/.config/mpd/database"
pid_file "~/.config/mpd/pid"
+state_file "~/.local/state/mpd/state"
auto_update "yes"
restore_paused "yes"
bind_to_address "127.0.0.1"
diff --git a/config/common/tmux/tmux.conf b/config/common/tmux/tmux.conf
index 5867a92..1be3f71 100755
--- a/config/common/tmux/tmux.conf
+++ b/config/common/tmux/tmux.conf
@@ -118,7 +118,7 @@ set -g status on
#+ Status +
#+--------+
#+--- Layout ---+
-set -g set-titles-string "[#S:#I] #T"
+set -g set-titles-string "[#S: #W] #T"
set -g set-titles on
set -g status-position top
set -g window-status-current-style "underscore"
diff --git a/config/essentials/nvim/after/plugin/luasnip.lua b/config/essentials/nvim/after/plugin/luasnip.lua
index 70d7570..319a68c 100644
--- a/config/essentials/nvim/after/plugin/luasnip.lua
+++ b/config/essentials/nvim/after/plugin/luasnip.lua
@@ -213,7 +213,8 @@ ls.add_snippets("cs", {
ls.add_snippets("telekasten", {
--link
- s("ln", fmt(
+ parse("ln", "[[$0]]", {}),
+ s("cln", fmt(
[[
[{}]({}){}
]],
diff --git a/config/essentials/nvim/ftplugin/telekasten.lua b/config/essentials/nvim/ftplugin/telekasten.lua
index 2781b12..c180777 100644
--- a/config/essentials/nvim/ftplugin/telekasten.lua
+++ b/config/essentials/nvim/ftplugin/telekasten.lua
@@ -24,3 +24,4 @@ vim.keymap.set("n", "<LocalLeader>y", require("telekasten").yank_notelink)
vim.keymap.set("n", "<Return>", require("telekasten").follow_link)
vim.keymap.set("i", "<LocalLeader>l", "<esc>I[<esc>A]()<left><C-r>+<esc>A")
+vim.keymap.set("n", "<LocalLeader>l", "I[[<esc>A]]<esc>")
diff --git a/config/essentials/nvim/lua/user/remap.lua b/config/essentials/nvim/lua/user/remap.lua
index e194ffa..fadca21 100644
--- a/config/essentials/nvim/lua/user/remap.lua
+++ b/config/essentials/nvim/lua/user/remap.lua
@@ -77,7 +77,8 @@ end, { noremap = true })
vim.keymap.set("n", "<Leader>P", "<cmd>PackerSync<cr>", { noremap = true })
-- spelling
-vim.keymap.set("n", "<Leader><C-s>", "<cmd>setlocal spell!<cr>", { noremap = true })
+vim.keymap.set("n", "<C-s>s", "<cmd>setlocal spell!<cr>", { noremap = true })
+vim.keymap.set("n", "<C-s>g", "z=1<cr><cr>", { noremap = true })
-- -- open terminal in file's parent director
-- -- this needs to be asynchrous
diff --git a/config/essentials/nvim/lua/user/zk.lua b/config/essentials/nvim/lua/user/zk.lua
index 7e15fa3..98476ca 100644
--- a/config/essentials/nvim/lua/user/zk.lua
+++ b/config/essentials/nvim/lua/user/zk.lua
@@ -48,52 +48,52 @@ require("telekasten").setup({
},
BusinessEnglish = {
home = home .. "/" .. "BusinessEnglish",
- template_new_note = home .. "/" .. "templates/new_note.md",
+ template_new_note = home .. "/" .. "templates/school.md",
new_note_filename = "title",
},
DataEssentials = {
home = home .. "/" .. "DataEssentials",
- template_new_note = home .. "/" .. "templates/new_note.md",
+ template_new_note = home .. "/" .. "templates/school.md",
new_note_filename = "title",
},
SoftwareDesign = {
home = home .. "/" .. "SoftwareDesign",
- template_new_note = home .. "/" .. "templates/new_note.md",
+ template_new_note = home .. "/" .. "templates/school.md",
new_note_filename = "title",
},
BusinessCommunication = {
home = home .. "/" .. "BusinessCommunication",
- template_new_note = home .. "/" .. "templates/new_note.md",
+ template_new_note = home .. "/" .. "templates/school.md",
new_note_filename = "title",
},
AIEssentials = {
home = home .. "/" .. "AIEssentials",
- template_new_note = home .. "/" .. "templates/new_note.md",
+ template_new_note = home .. "/" .. "templates/school.md",
new_note_filename = "title",
},
NETEssentials = {
home = home .. "/" .. "NETEssentials",
- template_new_note = home .. "/" .. "templates/new_note.md",
+ template_new_note = home .. "/" .. "templates/school.md",
new_note_filename = "title",
},
iTalent = {
home = home .. "/" .. "iTalent",
- template_new_note = home .. "/" .. "templates/new_note.md",
+ template_new_note = home .. "/" .. "templates/school.md",
new_note_filename = "title",
},
ScalingNetworks = {
home = home .. "/" .. "ScalingNetworks",
- template_new_note = home .. "/" .. "templates/new_note.md",
+ template_new_note = home .. "/" .. "templates/school.md",
new_note_filename = "title",
},
RoutingSwitchingEssentials = {
home = home .. "/" .. "RoutingSwitchingEssentials",
- template_new_note = home .. "/" .. "templates/new_note.md",
+ template_new_note = home .. "/" .. "templates/school.md",
new_note_filename = "title",
},
SoftwareDesignAndQualityAssurance = {
home = home .. "/" .. "SoftwareDesignAndQualityAssurance",
- template_new_note = home .. "/" .. "templates/new_note.md",
+ template_new_note = home .. "/" .. "templates/school.md",
new_note_filename = "title",
},
C = {
diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc
index 3f2d7f4..76ff87f 100644
--- a/config/essentials/zsh/.zshrc
+++ b/config/essentials/zsh/.zshrc
@@ -115,9 +115,9 @@ RPROMPT='%F{blue}$(parse_git_remote)%f%F{red}$(parse_git_status)%f%F{green}$(par
setopt prompt_subst
parse_git_remote() {
- git branch -v 2>/dev/null |
- grep '^\*' | cut -f2 -d'[' | cut -f1 -d' ' |
- sed 's/ahead/↑ /;s/behind/↓ /;s/\*//'
+ git branch -v 2> /dev/null |
+ awk -F '[][]' '/^\*/ {print $2}' |
+ sed 's/ahead/↑ /;s/behind/↓ /;s/[^↓↑]*/ /g'
}
parse_git_branch() {
git symbolic-ref --short HEAD 2> /dev/null || git rev-parse --short HEAD 2> /dev/null
diff --git a/config/extra/zathura/zathurarc b/config/extra/zathura/zathurarc
index 478cd17..a78ef16 100644
--- a/config/extra/zathura/zathurarc
+++ b/config/extra/zathura/zathurarc
@@ -5,10 +5,13 @@ map [fullscreen] i zoom in
map [fullscreen] o zoom out
# normal mappings
-map r reload
-map R rotate
-map i zoom in
-map o zoom out
+map r reload
+map R rotate
+map i zoom in
+map o zoom out
+map f toggle_fullscreen
+map x toggle_statusbar
+map X toggle_index
set font "monospace bold 11"
set adjust-open "best-fit"
diff --git a/config/wayland/dwl/startup.sh b/config/wayland/dwl/startup.sh
index f38f1ab..d743f19 100755
--- a/config/wayland/dwl/startup.sh
+++ b/config/wayland/dwl/startup.sh
@@ -1,10 +1,23 @@
#!/bin/sh
+
+for prog in dwl-bar dwlblocks gammastep mako
+do
+ pkill "$prog"
+ $prog &
+done
+
swaybg -i ~/pics/wallpaper &
-dwl-bar &
-dwlblocks &
-gammastep &
wl-paste --watch cliphist store &
-keyadd id_rsa &
swayidle 300 locker &
-mako &
+keyadd id_rsa &
+
+pkill -f "tail -f $HOME/.config/wob/pipe"
+WOBCONFIG="$HOME"/.config/wob
+if [ ! -p "$WOBCONFIG"/pipe ]
+then
+ mkdir -p "$WOBCONFIG"
+ mkfifo "$WOBCONFIG"/pipe
+fi
+(tail -f "$WOBCONFIG"/pipe | wob) &
+
$TERMINAL -e tmux a || $TERMINAL tmux &
diff --git a/config/wayland/waybar/config.jsonc b/config/wayland/waybar/config.jsonc
index 95d200a..24065d3 120000
--- a/config/wayland/waybar/config.jsonc
+++ b/config/wayland/waybar/config.jsonc
@@ -1 +1 @@
-configs/dwm.jsonc \ No newline at end of file
+hyprland.jsonc \ No newline at end of file