36 files changed, 371 insertions, 170 deletions
diff --git a/.gitignore b/.gitignore
index a3589f5..3dcf353 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ calibre/
 calibre/conversion
 carla/
 cava/
+CCL Cross-platform Framework/
 cef_user_data
 .charles.config
 chromium/
@@ -178,6 +179,7 @@ okularpartrc
 okularrc
 openrazer/
 package-lock.json
+parallel/
 pavucontrol.ini
 pcmanfm/
 pcmanfm-qt/
@@ -269,6 +271,7 @@ transmission-daemon/
 tremc/
 Trolltech.conf
 .tsrc
+tuxclocker.conf
 ubports-installer/
 ultravnc-viewer/
 UNDERTALE*/
@@ -286,6 +289,7 @@ waybar/config-Hyprland-*
 waybar/config-river-*
 weechat/
 whoozle.github.io/
+wireshark/
 xmonad/.stack-work
 xmonad/stack.yaml.lock
 xmonad/xmonad.hi
@@ -305,4 +309,5 @@ zsh/hist
 zsh/.zcompdump
 zsh/zcompdump
 zsh/zfunc
+zsh/.zkbd/
 zsh/.zsh_theme
diff --git a/Makefile b/Makefile
index d850e2a..28bc66e 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ DCONFS := doas.conf
 
 all:
 
-install: install-zshconfigs install-shconfigs vimplug-vim vimplug-nvim
+install: install-zshconfigs install-shconfigs vimplug-vim
 
 install-zshconfigs: $(ZCONFS)
 	@echo "Installing zsh conf files..."
diff --git a/X11/xresources b/X11/xresources
index d5c4550..7115b96 100644
--- a/X11/xresources
+++ b/X11/xresources
@@ -30,7 +30,7 @@ st.termname:     st-256color
 st.shell: /usr/bin/tmux
 
 ! The following options options can be reloaded via USR1 signal.
-!st.font:              mononoki Nerd Font Mono:pixelsize=12:antialias=true:autohint=true;
+!st.font:              Fira Code Nerd Font Mono:pixelsize=12:antialias=true:autohint=true;
 !st.font2:             Symbola:pixelsize=12:antialias=true:autohint=true;
 st.borderpx:          3
 ! st alpha
diff --git a/darkman/config.yaml b/darkman/config.yaml
deleted file mode 100644
index 5cf7ee4..0000000
--- a/darkman/config.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-usegeoclue: false
-dbusserver: true
-portal: true
diff --git a/doas.conf b/doas.conf
index 90ab328..d598fa1 100644
--- a/doas.conf
+++ b/doas.conf
@@ -12,6 +12,7 @@ permit nopass :wheel cmd pacman
 permit nopass :wheel cmd cryptsetup
 permit nopass :wheel cmd systemctl
 permit setenv { EDITOR } :wheel cmd visudo args
+permit setenv { EDITOR } :wheel cmd vidoas args
 permit setenv { EDITOR } :wheel cmd vimv
 
 permit nopass keepenv zachir as zachir
diff --git a/firejail/mpv.profile b/firejail/mpv.profile
new file mode 100644
index 0000000..8ac7ccc
--- /dev/null
+++ b/firejail/mpv.profile
@@ -0,0 +1,2 @@
+whitelist ~/.cache
+include /etc/firejail/mpv.profile
diff --git a/firejail/neomutt.profile b/firejail/neomutt.profile
new file mode 100644
index 0000000..b8fa362
--- /dev/null
+++ b/firejail/neomutt.profile
@@ -0,0 +1,2 @@
+whitelist /usr/share/mutt-wizard
+include /etc/firejail/mpv.profile
diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc
index d0152f7..628ed00 100644
--- a/gtk-2.0/gtkrc
+++ b/gtk-2.0/gtkrc
@@ -1,9 +1,10 @@
 # DO NOT EDIT! This file will be overwritten by nwg-look.
 # Any customization should be done in ~/.gtkrc-2.0.mine instead.
 
-gtk-theme-name="Flat-Remix-GTK-Red-Darkest"
+include "/home/zachir/.gtkrc-2.0.mine"
+gtk-theme-name="Flat-Remix-GTK-Green-Darkest-Solid"
 gtk-icon-theme-name="Cosmic"
-gtk-font-name="Noto Sans,  10"
+gtk-font-name="Cantarell 11"
 gtk-cursor-theme-name="BreezeX-Black"
 gtk-cursor-theme-size=32
 gtk-toolbar-style=3
diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini
index c597fa3..28ef3a0 100644
--- a/gtk-3.0/settings.ini
+++ b/gtk-3.0/settings.ini
@@ -1,7 +1,7 @@
 [Settings]
-gtk-theme-name=Flat-Remix-GTK-Red-Darkest
+gtk-theme-name=Flat-Remix-GTK-Green-Darkest-Solid
 gtk-icon-theme-name=Cosmic
-gtk-font-name=Noto Sans,  10
+gtk-font-name=Cantarell 11
 gtk-cursor-theme-name=BreezeX-Black
 gtk-cursor-theme-size=32
 gtk-toolbar-style=3
diff --git a/hypr/hypridle.conf b/hypr/hypridle.conf
index f25f081..ea40f1f 100644
--- a/hypr/hypridle.conf
+++ b/hypr/hypridle.conf
@@ -6,15 +6,15 @@ general {
 
 listener {
     timeout = 150                                # 2.5min.
-    on-timeout = brightnessctl -s set 10         # set monitor backlight to minimum, avoid 0 on OLED monitor.
+    on-timeout = brightnessctl set 1             # set monitor backlight to minimum, avoid 0 on OLED monitor.
     on-resume = brightnessctl -r                 # monitor backlight restore.
 }
 
 # turn off keyboard backlight, comment out this section if you dont have a keyboard backlight.
 listener {
     timeout = 150                                # 2.5min.
-    on-timeout = brightnessctl -sd led::kbd_backlight set 0 # turn off keyboard backlight.
-    on-resume = brightnessctl -rd led::kbd_backlight        # turn on keyboard backlight.
+    on-timeout = brightnessctl -d system76::kbd_backlight set 0 # turn off keyboard backlight.
+    on-resume = brightnessctl -rd system76::kbd_backlight        # turn on keyboard backlight.
 }
 
 listener {
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 86f1f77..060a784 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -1,9 +1,6 @@
 # See https://wiki.hyprland.org/Configuring/Monitors/
 #{{{ Monitor config
-monitor = eDP-1, 1920x1080@60, 0x0, 1
 monitor = , preferred, auto, 1
-monitor = HDMI-A-1, 1920x1080@60, 0x0, 1
-monitor = DP-1, 1920x1080@60, 1920x0, 1
 #}}}
 
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
@@ -19,13 +16,14 @@ exec-once = waybar
 exec-once = pypr
 exec-once = lxqt-policykit-agent
 exec-once = import-gsettings gtk-theme 'Flat-Remix-GTK-Green-Darkest-Solid'
-exec-once = import-gsettings icon-theme 'Mint-X-Grey'
+exec-once = import-gsettings icon-theme 'COSMIC'
 exec-once = import-gsettings cursor-theme 'BreezeX-Black'
+exec-once = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
 exec-once = xrdb -load "$XDG_CONFIG_HOME"/X11/xresources
 exec-once = com.github.wwmm.easyeffects
 exec-once = systemctl --user start dunst
 exec-once = systemctl --user start hypridle
-#exec-once = mpd
+exec-once = mpd
 #}}}
 
 #{{{ env
@@ -43,6 +41,7 @@ env = XCURSOR_SIZE,32
 debug {
   enable_stdout_logs = false
   disable_logs = true
+  full_cm_proto = true
 }
 # }}}
 
@@ -88,7 +87,7 @@ general {
     border_size = 2
     #col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
     #col.inactive_border = rgba(595959aa)
-    col.active_border = rgba(ec0101ee)
+    col.active_border = rgba(198844ee)
     col.inactive_border = rgba(1b1d1cee)
     layout = master
 }
@@ -108,7 +107,7 @@ misc {
     swallow_regex = ^(kitty)$
     swallow_exception_regex = ^(wev|.*ueberzug|n?vi?m? .*)$
     vfr = true
-    vrr = 1
+    vrr = 3
 }
 #}}}
 
@@ -186,6 +185,7 @@ gestures {
 plugin {
   hyprsplit {
     num_workspaces = 9
+    persistent_workspaces = true
   }
 }
 #}}}
@@ -196,6 +196,24 @@ plugin {
 # Example windowrule v2
 # windowrule = float, class:^(kitty)$, title:^(kitty)$
 # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
+windowrule = fullscreen, class:^(Xephyr)$
+windowrule = float, title:^(LibreWolf - Choose User Profile)$
+windowrule = float, class:^(xdg-desktop-portal-gtk)
+windowrule = float, title:^(UNDERTALE)$
+windowrule = float, class:^(Tk)$
+windowrule = float, class:^(lxqt-policykit-agent)$
+windowrule = float, class:^(Kdenlive)$
+windowrule = stayfocused, title:^()$, class:^(steam)$
+windowrule = minsize 1 1, title:^()$, class:^(steam)$
+windowrule = stayfocused, title:^(menu)$,class:^(yabridge-host.exe.so)$
+windowrule = minsize 1 1, title:^(menu)$,class:^(yabridge-host.exe.so)$
+windowrule = float, class:^(yabridge-host.exe.so)$, title:^(menu)$
+windowrule = float, floating:0, title:^(menu*)
+windowrule = workspace 2, title:^(REAPER .*initializing.*)$
+windowrule = tile, class:^(REAPER)$, title:^(.*REAPER v[0-9.]* - Licensed for personal/small business use)$
+windowrule = tile, class:^(WebApp-Qobuz[0-9]*)$
+windowrule = float, title:^(menu)$
+windowrule = move cursor -50% -50%, class:^(yabridge-host.exe.so)$, title:^(menu)$
 #}}}
 
 #{{{ Mods
@@ -307,8 +325,8 @@ submap = reset
 #}}}
 
 #{{{ Menu bindings
-bind = $mainMod, R, exec, sh -c "$(tofi-drun -c ~/.config/tofi/themes/dmenu_vertical --prompt-text Run:)"
-bind = $mainMod, D, exec, sh -c "$(tofi-run -c ~/.config/tofi/themes/dmenu_vertical --prompt-text Run:)"
+bind = $mainMod, R, exec, sh -c "rofi -show drun"
+bind = $mainMod, D, exec, sh -c "rofi -show run"
 bind = $mainMod $secdMod, Q, exec, qbc
 bind = $mainMod $secdMod, W, exec, lwc
 bind = $mainMod $secdMod, E, exec, mbc
diff --git a/hypr/hyprpaper.conf b/hypr/hyprpaper.conf
index 19b84f2..728c00c 100644
--- a/hypr/hyprpaper.conf
+++ b/hypr/hyprpaper.conf
@@ -13,4 +13,3 @@ wallpaper = DP-2,~/Pictures/background.png
 #wallpaper = monitor2,~/background.png
 # .. more monitors
 splash = false
-preload = ~/Pictures/background.png
diff --git a/hypr/pyprland.toml b/hypr/pyprland.toml
index af439ab..a0aa176 100644
--- a/hypr/pyprland.toml
+++ b/hypr/pyprland.toml
@@ -87,8 +87,8 @@ position = "25% 25%"
 
 [scratchpads.qpwgraph]
 animation = ""
-command = "qpwgraph"
-class = "org.rncbc.qpwgraph"
+command = "helvum"
+class = "org.pipewire.Helvum"
 lazy = true
 size = "50% 50%"
 position = "25% 25%"
diff --git a/kitty/kitty.conf b/kitty/kitty.conf
index 59a7f5e..f9772f5 100644
--- a/kitty/kitty.conf
+++ b/kitty/kitty.conf
@@ -24,7 +24,7 @@ bold_italic_font auto
 #:     italic_font      Operator Mono Book Italic
 #:     bold_italic_font Operator Mono Medium Italic
 
-font_size 11.0
+font_size 12.0
 
 #: Font size (in pts)
 
@@ -1151,7 +1151,7 @@ color8 #969896
 #: black
 
 color1 #89231d
-color9 #ec0101
+color9 #cc342b
 
 #: red
 
@@ -1170,8 +1170,8 @@ color12 #3971ed
 
 #: blue
 
-color5  #6e3c85
-color13 #8400c1
+color5  #784e93
+color13 #a36ac7
 
 #: magenta
 
diff --git a/lf/image b/lf/image
index 77ddb5b..622aaf2 100755
--- a/lf/image
+++ b/lf/image
@@ -7,9 +7,10 @@ main() {
 				> "$FIFO_UEBERZUG"
 			;;
 		"draw")
-			declare -p -A cmd=([action]=add [identifier]="$ID_PREVIEW" \
-				[x]="$3" [y]="$4" [max_width]="$5" [max_height]="$6" \
-				[path]="$2") > "$FIFO_UEBERZUG"
+      kitten icat --stdin no --transfer-mode memory --place"${5}x${6}@${3}x${4}" "$1" /dev/tty
+			#declare -p -A cmd=([action]=add [identifier]="$ID_PREVIEW" \
+				#[x]="$3" [y]="$4" [max_width]="$5" [max_height]="$6" \
+				#[path]="$2") > "$FIFO_UEBERZUG"
 			;;
 		"*") echo "Unknown command: '$1', '$2'" ;;
 	esac
diff --git a/nvim/init.lua b/nvim/init.lua
index cf11420..4b295d5 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -1,5 +1,6 @@
 require('options')
 require('keymaps')
+require('lsp')
 require('plugins')
 require('colorscheme')
 require('term')
diff --git a/nvim/lua/keymaps.lua b/nvim/lua/keymaps.lua
index 26037c6..4f4a489 100644
--- a/nvim/lua/keymaps.lua
+++ b/nvim/lua/keymaps.lua
@@ -11,7 +11,7 @@ vim.g.mapleader = "'"
 -- Normal mode --
 -----------------
 
--- Hint: set `:h vim.map.set()`
+-- Hint: see `:h vim.map.set()`
 -- Better window navigation
 vim.keymap.set('n', '<C-h>', '<C-w>h', opts)
 vim.keymap.set('n', '<C-j>', '<C-w>j', opts)
diff --git a/nvim/lua/lsp.lua b/nvim/lua/lsp.lua
new file mode 100644
index 0000000..343c76b
--- /dev/null
+++ b/nvim/lua/lsp.lua
@@ -0,0 +1,22 @@
+-- Remove Global Default Key mapping
+vim.keymap.del("n", "grn")
+vim.keymap.del("n", "gra")
+vim.keymap.del("n", "grr")
+vim.keymap.del("n", "gri")
+vim.keymap.del("n", "gO")
+
+-- Create keymapping
+-- LspAttach: After an LSP Client performs "initialize" and attaches to a buffer.
+vim.api.nvim_create_autocmd("LspAttach", {
+  callback = function(args)
+    local keymap = vim.keymap
+    local lsp = vim.lsp
+    local bufopts = { noremap = true, silent = true }
+
+    keymap.set("n", "gr", lsp.buf.references, bufopts)
+    keymap.set("n", "gd", lsp.buf.definition, bufopts)
+    keymap.set("n", "<space>rn", lsp.buf.rename, bufopts)
+    keymap.set("n", "K", lsp.buf.hover, bufopts)
+    keymap.set("n", "<space>f", lsp.buf.format, bufopts)
+  end
+})
diff --git a/nvim/lua/options.lua b/nvim/lua/options.lua
index 1d4826e..ae802be 100644
--- a/nvim/lua/options.lua
+++ b/nvim/lua/options.lua
@@ -8,6 +8,8 @@ vim.opt.tabstop = 2                 -- number of visual spaces per TAB
 vim.opt.softtabstop = 2             -- number of spaces in tab when editing
 vim.opt.shiftwidth = 2              -- insert 2 spaces on a tab
 vim.opt.expandtab = true            -- tabs are spaces
+vim.opt.smartindent = true
+vim.opt.smarttab = true
 
 -- UI config
 vim.opt.number = true               -- show absolute number
@@ -30,3 +32,55 @@ vim.opt.undolevels = 1000           -- Number of undo levels
 vim.opt.backspace = { "indent", "eol", "start" } -- Backspace behavior
 vim.opt.foldmethod = "marker"
 vim.opt.conceallevel = 2
+
+-- Plugins
+-- emmet
+vim.g.user_emmet_leader_key = '<C-a>'
+
+-- zig
+vim.g.zig_fmt_autosave = 1
+
+-- markdown
+vim.g.vim_markdown_folding_disabled = 1
+vim.g.vim_markdown_folding_level = 3
+vim.g.vim_markdown_toc_autofit = 1
+vim.g.vim_markdown_emphasis_multiline = 0
+vim.g.tex_conceal = ""
+vim.g.vim_markdown_math = 1
+vim.g.vim_markdown_conceal_code_blocks = 1
+vim.g.vim_markdown_fenced_languages = { 'c++=cpp', 'viml=vim', 'bash=sh', 'ini=dosini' }
+vim.g.vim_markdown_follow_anchor = 1
+vim.g.vim_markdown_math = 1
+vim.g.vim_markdown_frontmatter = 1
+vim.g.vim_markdown_toml_frontmatter = 1
+vim.g.vim_markdown_strikethrough = 1
+vim.g.vim_markdown_no_extensions_in_markdown = 1
+vim.g.vim_markdown_autowrite = 1
+vim.g.vim_markdown_auto_insert_bullets = 0
+vim.g.vim_markdown_new_list_item_indent = 0
+vim.g.vim_markdown_edit_url_in = 'tab'
+
+-- NERDTree
+vim.g.NERDTreeGitStatusUseNerdFonts = 1
+vim.g.NERDTreeGitStatusShowClean = 1
+vim.g.NERDTreeDirArrowExpandable = '>'
+vim.g.NERDTreeDirArrowCollapsible = '<'
+vim.g.NERDTreeMapToggleHidden = 'z'
+
+-- goyo
+vim.g.goyo_width = '90%'
+vim.g.goyo_height = '100%'
+
+-- limelight
+vim.g.limelight_conceal_ctermfg = 'gray'
+vim.g.limelight_conceal_guifg = 'gray'
+
+-- devicon
+vim.g.airline_powerline_fonts = 1
+vim.g.webdevicons_enable_nerdtree = 1
+
+-- vim-indent-guides
+vim.g.indent_guides_enable_on_vim_startup = 0
+
+-- vim-signify
+vim.opt.updatetime = 100
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index 0801939..f90b09c 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -5,21 +5,37 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then
     "clone",
     "--filter=blob:none",
     "https://github.com/folke/lazy.nvim.git",
-    "--branch=stable", -- latest stable rtelease
+    "--branch=stable", -- latest stable release
     lazypath,
   })
 end
 vim.opt.rtp:prepend(lazypath)
 
 require("lazy").setup({
+  -- LSP manager
+	{ "mason-org/mason.nvim", opts = {} },
+  {
+    "mason-org/mason-lspconfig.nvim",
+    dependencies = {
+      "mason-org/mason.nvim",
+      "neovim/nvim-lspconfig",
+    },
+    opts = {
+      ensure_installed = { "pylsp", "clangd", "rust_analyzer", "zls" },
+    },
+  },
+  {
+		"neovim/nvim-lspconfig",
+		config = function()
+			local lspconfig = require("lspconfig")
+
+			lspconfig.pylsp.setup({})
+		end,
+  },
   "tanvirtin/monokai.nvim",
-  'preservim/nerdtree',
-  'ziglang/zig.vim',
   "lervag/vimtex",
   'tomasiser/vim-code-dark',
   'flazz/vim-colorschemes',
-  'tomasiser/vim-code-dark',
-  'flazz/vim-colorschemes',
   'ZachIndigo/vim-preglow',
   'axvr/org.vim',
   'ziglang/zig.vim',
@@ -44,63 +60,3 @@ require("lazy").setup({
   'ryanoasis/vim-devicons',
   {'akinsho/toggleterm.nvim', version = "*", config = true},
 })
-
---------------------
--- Plugin Options --
---------------------
-
--- emmet
-vim.g.user_emmet_leader_key='<C-a>'
-
--- zig config
-vim.g.zig_fmt_autosave = 1
-
--- latex live preview
-vim.g.livepreview_previewer = 'zathura'
-vim.g.livepreview_use_biber = 1
-vim.g.livepreview_cursorhold_recompile = 0
-
--- vim-markdown
-vim.g.vim_markdown_folding_disabled = 1
-vim.g.vim_markdown_folding_level = 3
-vim.g.vim_markdown_toc_autofit = 1
-vim.g.vim_markdown_emphasis_multiline = 0
-vim.g.tex_conceal = ""
-vim.g.vim_markdown_math = 1
-vim.g.vim_markdown_conceal_code_blocks = 1
-vim.g.vim_markdown_fenced_languages = { 'c++=cpp', 'viml=vim', 'bash=sh', 'ini=dosini' }
-vim.g.vim_markdown_follow_anchor = 1
-vim.g.vim_markdown_math = 1
-vim.g.vim_markdown_frontmatter = 1
-vim.g.vim_markdown_toml_frontmatter = 1
-vim.g.vim_markdown_strikethrough = 1
-vim.g.vim_markdown_no_extensions_in_markdown = 1
-vim.g.vim_markdown_autowrite = 1
-vim.g.vim_markdown_auto_insert_bullets = 0
-vim.g.vim_markdown_new_list_item_indent = 0
-vim.g.vim_markdown_edit_url_in = 'tab'
-
--- NERDTree config
-vim.g.NERDTreeGitStatusUseNerdFonts = 1 -- use nerd fonts
-vim.g.NERDTreeGitStatusShowClean = 1 -- default: 0
-vim.g.NERDTreeDirArrowExpandable = '>'
-vim.g.NERDTreeDirArrowCollapsible = '<'
-vim.g.NERDTreeMapToggleHidden = 'z'
-
--- Goyo config
-vim.g.goyo_width = '90%'
-vim.g.goyo_height = '100%'
-
--- limelight config
-vim.g.limelight_conceal_ctermfg = 'gray'
-vim.g.limelight_conceal_guifg = 'gray'
-
--- devicon config
-vim.g.airline_powerline_fonts = 1
-vim.g.webdevicons_enable_nerdtree = 1
-
--- vim-indent-guides config
-vim.g.indent_guides_enable_on_vim_startup = 0
-
--- vim-signify config
-vim.opt.updatetime=100
diff --git a/nvim/lua/term.lua b/nvim/lua/term.lua
index 9f3062d..e7aac4e 100644
--- a/nvim/lua/term.lua
+++ b/nvim/lua/term.lua
@@ -7,7 +7,7 @@ require("toggleterm").setup{
       return vim.o.columns * 0.4
     end
   end,
-  open_mapping = [[<c-\>]], -- or { [[<c-\>]], [[<c-¥>]] } if you also use a Japanese keyboard.
+  open_mapping = [[<leader>`]], -- or { [[<c-\>]], [[<c-¥>]] } if you also use a Japanese keyboard.
   hide_numbers = true, -- hide the number column in toggleterm buffers
   shade_filetypes = {},
   autochdir = false, -- when neovim changes it current directory the terminal will change it's own when next it's opened
diff --git a/nwg-bar/bar.json b/nwg-bar/bar.json
new file mode 100644
index 0000000..01a92c3
--- /dev/null
+++ b/nwg-bar/bar.json
@@ -0,0 +1,22 @@
+[
+ {
+   "label": "Lock",
+   "exec": "loginctl lock-session",
+   "icon": "/usr/share/nwg-bar/images/system-lock-screen.svg"
+ },
+ {
+   "label": "Logout",
+   "exec": "hyprctl dispatch exit",
+   "icon": "/usr/share/nwg-bar/images/system-log-out.svg"
+ },
+ {
+   "label": "Reboot",
+   "exec": "systemctl reboot",
+   "icon": "/usr/share/nwg-bar/images/system-reboot.svg"
+ },
+ {
+   "label": "Shutdown",
+   "exec": "systemctl -i poweroff",
+   "icon": "/usr/share/nwg-bar/images/system-shutdown.svg"
+ }
+]
diff --git a/nwg-bar/style.css b/nwg-bar/style.css
new file mode 100644
index 0000000..023d282
--- /dev/null
+++ b/nwg-bar/style.css
@@ -0,0 +1,35 @@
+window {
+        background-color: rgba (0, 0, 0, 1.0)
+}
+
+/* Outer bar container, takes all the window width/height */
+#outer-box {
+	margin: 0px
+}
+
+/* Inner bar container, surrounds buttons */
+#inner-box {
+	background-color: rgba (27, 29, 28, 0.85);
+	border-radius: 10px;
+	border-style: none;
+	border-width: 1px;
+	border-color: rgba (156, 142, 122, 0.7);
+	padding: 5px;
+	margin: 5px
+}
+
+button, image {
+	background: none;
+	border: none;
+	box-shadow: none
+}
+
+button {
+	padding-left: 10px;
+	padding-right: 10px;
+	margin: 5px
+}
+
+button:hover {
+	background-color: rgba (25, 138, 68, 1.0)
+}
diff --git a/python/pythonrc b/python/pythonrc
index cd954b6..c7cf7d5 100644
--- a/python/pythonrc
+++ b/python/pythonrc
@@ -1,24 +1,40 @@
-def is_vanilla() -> bool:
+try:
+    import atexit
+    import os
     import sys
-    return not hasattr(__builtins__, '__IPYTHON__') and 'bpython' not in sys.argv[0]
+    from pathlib import Path
+    import readline
+except ImportError as e:
+    print(f"Couldn't load module. {e}")
+    sys.exit(1)
 
 
-def setup_history():
-    import os
-    import atexit
-    import readline
-    from pathlib import Path
+################
+# TAB COMPLETION #
+##################
+
+try:
+    readline.parse_and_bind("tab: complete")
+except ImportError:
+    pass
+
 
-    if state_home := os.environ.get('XDG_STATE_HOME'):
-        state_home = Path(state_home)
-    else:
-        state_home = Path.home() / '.local' / 'state'
+### XDG Compliant History File
+# See https://gist.github.com/viliampucik/8713b09ff7e4d984b29bfcd7804dc1f4?permalink_comment_id=4582040#gistcomment-4582040
 
-    history: Path = state_home / 'python_history'
+# Destroy default history file writing hook (and also tab completion, which is why we manually added it above)
+if hasattr(sys, '__interactivehook__'):
+    del sys.__interactivehook__
 
-    readline.read_history_file(str(history))
-    atexit.register(readline.write_history_file, str(history))
 
+histfile = Path(os.getenv("XDG_CACHE_HOME", Path.home() / ".cache")) / "python_history"
+try:
+    histfile.touch(exist_ok=True)
+except FileNotFoundError: # Probably the parent directory doesn't exist
+    histfile.parent.mkdir(parents=True, exist_ok=True)
 
-if is_vanilla():
-    setup_history()
+readline.read_history_file(histfile)
+# Don't store an obscene amount of history
+readline.set_history_length(5000)
+# Write to history file on exit
+atexit.register(readline.write_history_file, histfile)
diff --git a/rofi/config.rasi b/rofi/config.rasi
new file mode 100644
index 0000000..1de6cb4
--- /dev/null
+++ b/rofi/config.rasi
@@ -0,0 +1 @@
+@theme "dmenu.rasi"
diff --git a/rofi/dmenu.rasi b/rofi/dmenu.rasi
new file mode 100644
index 0000000..6fd198a
--- /dev/null
+++ b/rofi/dmenu.rasi
@@ -0,0 +1,43 @@
+/**
+ * ROFI Color theme
+ * User: Qball
+ * Copyright: Dave Davenport
+ */
+
+* {
+    background-color:      Black;
+    border-color:          White;
+    text-color:           White;
+    font:            "FiraCode Nerd Font Mono 12";
+}
+window {
+    anchor:     north;
+    location:   north;
+    width:      100%;
+    padding:    4px;
+    children:   [ horibox ];
+}
+horibox {
+    orientation: vertical;
+    children:   [ prompt, entry, listview ];
+}
+listview {
+    layout:     vertical;
+    spacing:    5px;
+    lines:      15;
+}
+entry {
+    expand:     false;
+    width:      10em;
+}
+element {
+    padding: 0px 2px;
+}
+element selected {
+    background-color: #198844;
+}
+
+element-text, element-icon {
+  background-color: inherit;
+  text-color: inherit;
+}
diff --git a/sh/aliases b/sh/aliases
index ca8106e..93784e7 100644
--- a/sh/aliases
+++ b/sh/aliases
@@ -18,12 +18,18 @@ case `uname -s` in
     alias ls="ls -h"
     ;;
   "Linux")
-    alias ls="ls -h $COLOR_FLAGS_GNU"
+    #alias ls="ls -h $COLOR_FLAGS_GNU"
+    alias ls="eza"
+    ;;
+  "Darwin")
+    alias ls="eza --color"
     ;;
 esac
 alias ll='ls -l'
-alias la='ls -A'
-alias lla='ls -lA'
+alias lt='ls -l --total-size'
+alias lts='ls -l --total-size --sort size --reverse'
+alias la='ls -a'
+alias lla='ls -la'
 alias lb='lsblk'
 alias md='mkdir -p'
 alias ch='cd $HOME'
@@ -33,8 +39,14 @@ alias nv='nvim'
 alias v='nvim'
 
 ## Change utils
-#alias rm='rm -i'
-alias rm='trash-put'
+case `uname -s` in
+  "OpenBSD" | "Darwin")
+    alias rm='rm -i'
+    ;;
+  "Linux")
+    alias rm='trash-put'
+    ;;
+esac
 alias cp='cp -i'
 alias srsync='rsync -KPUcrtvyz'
 
@@ -80,7 +92,7 @@ alias s='sudo systemctl'
 #alias ursm='env SVDIR="$HOME/.local/sv/" rsm'
 
 # XDG dirs fix
-alias svn="svn --config-dir \"$XDG_CONFIG_HOME\"/subversion"
+alias svn="svn --config-dir $XDG_CONFIG_HOME/subversion"
 alias adb="HOME="$XDG_DATA_HOME"/android adb"
 alias wget="wget --hsts-file=\"$XDG_DATA_HOME/wget-hsts\""
 alias yarn="yarn --use-yarnrc $XDG_CONFIG_HOME/yarn/config"
diff --git a/sh/profile b/sh/profile
index a97e9e8..b04eb4f 100644
--- a/sh/profile
+++ b/sh/profile
@@ -22,6 +22,10 @@ export ADB_VENDOR_KEY="$XDG_CONFIG_HOME"/android
 export LESSHISTFILE=-
 
 # Fixing Paths
+export RENPY_PATH_TO_SAVES="$XDG_DATA_HOME"
+export PARALLEL_HOME="$XDG_CONFIG_HOME"/parallel
+export ZPLUG_HOME="$XDG_DATA_HOME/zplug"
+export DOTNET_CLI_HOME="$XDG_DATA_HOME"/dotnet
 export MBSYNCRC="$XDG_CONFIG_HOME"/isync/mbsyncrc
 export ATOM_HOME="$XDG_DATA_HOME"/atom
 export XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc
@@ -49,7 +53,7 @@ export MPD_HOST="$XDG_CONFIG_HOME/mpd/socket"
 export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
 export RENPY_PATH_TO_SAVES="$XDG_DATA_HOME"
 export XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc
-export XAUTHORITY="$XDG_RUNTIME_DIR"/X11/Xauthority
+#export XAUTHORITY="$XDG_RUNTIME_DIR"/X11/Xauthority
 #export VIMINIT="set nocp | source ${XDG_CONFIG_HOME:-$HOME.config}/vim/vimrc"
 export ANDROID_USER_HOME="$XDG_DATA_HOME"/android
 export XCURSOR_PATH="/usr/share/icons:$XDG_DATA_HOME/icons"
@@ -122,6 +126,7 @@ addtopath "$CARGO_HOME/bin"
 addtopath "$GOPATH/bin"
 addtopath "$ZVMPATH"
 addtopath "$ZVM_INSTALL"
+addtopath "/opt/$USER/Grayjay.Desktop-linux-x64-v4"
 addtopath "/var/lib/flatpak/exports/bin"
 
 # MERGE PATHS
diff --git a/tofi/colors b/tofi/colors
index 5dcbb04..047c875 100644
--- a/tofi/colors
+++ b/tofi/colors
@@ -1,10 +1,10 @@
 background-color = #000000
-outline-color = #ec0101
-border-color = #ec0101
+outline-color = #198844
+border-color = #198844
 text-color = #ffffff
-prompt-color = #ec0101
+prompt-color = #198844
 prompt-background = #000000
-placeholder-color = #ec0101
+placeholder-color = #198844
 placeholder-background = #000000
 input-color = #ffffff
 input-background = #000000
@@ -12,6 +12,6 @@ default-result-background = #000000
 alternate-result-color = #ffffff
 alternate-result-background = #000000
 selection-color = #000000
-selection-match-color = #6e3c85
-selection-background = #ec0101
+selection-match-color = #39c1ed
+selection-background = #198844
 
diff --git a/tofi/themes/colors b/tofi/themes/colors
index 5dcbb04..047c875 100644
--- a/tofi/themes/colors
+++ b/tofi/themes/colors
@@ -1,10 +1,10 @@
 background-color = #000000
-outline-color = #ec0101
-border-color = #ec0101
+outline-color = #198844
+border-color = #198844
 text-color = #ffffff
-prompt-color = #ec0101
+prompt-color = #198844
 prompt-background = #000000
-placeholder-color = #ec0101
+placeholder-color = #198844
 placeholder-background = #000000
 input-color = #ffffff
 input-background = #000000
@@ -12,6 +12,6 @@ default-result-background = #000000
 alternate-result-color = #ffffff
 alternate-result-background = #000000
 selection-color = #000000
-selection-match-color = #6e3c85
-selection-background = #ec0101
+selection-match-color = #39c1ed
+selection-background = #198844
 
diff --git a/vim/vimrc b/vim/vimrc
index bc048ab..01156b5 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -13,10 +13,8 @@ set directory=$XDG_STATE_HOME/vim/swap   | call mkdir(&directory, 'p')
 set undodir=$XDG_STATE_HOME/vim/undo     | call mkdir(&undodir,   'p')
 set viewdir=$XDG_STATE_HOME/vim/view     | call mkdir(&viewdir,   'p')
 
-if !has('nvim') | set viminfofile=$XDG_STATE_HOME/vim/viminfo | endif
-
 " vimplugs {{{
-call plug#begin('~/.config/nvim/plugged')
+call plug#begin('~/.config/vim/plugged')
 " colorschemes {{{
 Plug 'tomasiser/vim-code-dark'                          " codedark color scheme
 Plug 'flazz/vim-colorschemes'                           " meta-color scheme package
@@ -52,9 +50,9 @@ Plug 'ryanoasis/vim-devicons'                           " dev icons for nerdtree
 call plug#end()
 
 " }}}
-" nvim options {{{
+" vim options {{{
 
-"" nvimrc:
+"" vimrc:
 "" General
 
 set showmatch " Highlight matching brace
@@ -80,9 +78,6 @@ set undolevels=1000             " Number of undo levels
 set backspace=indent,eol,start  " Backspace behaviour
 filetype plugin indent on
  
-"" GUI Config
-set guifont=mononoki\ Nerd\ Font\ Mono:h12
-
 "hi Normal guibg=NONE ctermbg=NONE
 "hi NonText guibg=NONE ctermbg=NONE
 "set background=dark
diff --git a/waybar/config b/waybar/config
index 2717db9..5d9c35f 100644
--- a/waybar/config
+++ b/waybar/config
@@ -2,7 +2,7 @@
     "layer": "top",
     "position": "top",
     "height": 36,
-    //"output": "%%DISPLAY%%",
+    "output": "eDP-1",
     "spacing": 4,
     //"margin-top": 5,
     //"margin-bottom":5,
@@ -11,7 +11,7 @@
 
     "modules-left":[ "hyprland/workspaces", "custom/launcher", "hyprland/window"],
     "modules-center":[],
-    "modules-right":[ "tray", "mpd", "idle_inhibitor", "wireplumber", "cpu", "memory", "temperature#cpu", "temperature#gpu", "backlight", "network", "clock", "custom/power"],
+    "modules-right":[ "tray", "mpd", "idle_inhibitor", "wireplumber", "cpu", "memory", "temperature#cpu", "temperature#gpu", "backlight", "battery", "network", "clock", "custom/power"],
 
     // Modules configuration
 
@@ -105,16 +105,16 @@
     },
     "temperature#cpu": {
         "thermal-zone": 0,
-        // "hwmon-path": "cat /sys/class/hwmon/hwmon5/temp1_input",
-        "critical-threshold": 110,
+        // "hwmon-path": "cat /sys/class/hwmon/hwmon4/temp1_input",
+        "critical-threshold": 90,
         "format-critical": "{temperatureC}°C",
         "format": "",
         "format-icons": ["", "", ""]
     },
     "temperature#gpu": {
         "thermal-zone": 1,
-        // "hwmon-path": "/sys/class/hwmon/hwmon4/temp1_input",
-        "critical-threshold": 126,
+        // "hwmon-path": "/sys/class/hwmon/hwmon3/temp1_input",
+        "critical-threshold": 90,
         "format-critical": "{temperatureC}°C",
         "format": "",
         "format-icons": ["", "", ""]
@@ -145,13 +145,13 @@
     },
     "custom/launcher":{
         "format": "",
-        "on-click": "exec $(tofi-drun)",
-        "on-click-right": "killall tofi"
+        "on-click": "rofi -show drun",
+        //"on-click-right": "killall rofi"
     },
     "custom/power":{
         "format": "  ",
-        "on-click": "nwg-bar",
-        "on-click-right": "killall nwg-bar"
+        "on-click": "rofi -show p -modi p:rofi-power-menu",
+        //"on-click-right": "killall rofi"
     },
     "custom/snip":{
         "format": " ",
diff --git a/waybar/style.css b/waybar/style.css
index 6a9d8cc..a32d7ed 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -45,7 +45,7 @@ window#waybar.hidden {
 
 /*
 #workspaces button:hover {
-    background: #6e3c85;
+    background: #39c1ed;
     color: black;
     border-bottom: 3px solid #ffffff;
 
@@ -53,12 +53,12 @@ window#waybar.hidden {
 */
 
 #workspaces button.active {
-    background: #EC0101;
+    background: #198844;
 }
 
 /*
 #workspaces button.active:hover {
-    background: #6e3c85;
+    background: #39c1ed;
     color: black;
     border-bottom: 3px solid #ffffff;
 }
@@ -126,7 +126,7 @@ window#waybar.hidden {
 }
 
 #battery.charging, #battery.plugged {
-    color: #EC0101;
+    color: #198844;
     background-color: #1b1d1c;
 }
 
@@ -157,7 +157,7 @@ label:focus {
 }
 
 #memory {
-    background-color: #EC0101;
+    background-color: #198844;
     color: #ffffff;
 }
 
@@ -167,12 +167,12 @@ label:focus {
 }
 
 #backlight {
-    background-color: #EC0101;
+    background-color: #198844;
     color: #ffffff;
 }
 
 #network {
-    background-color: #EC0101;
+    background-color: #198844;
     color: #ffffff;
 }
 
@@ -182,13 +182,13 @@ label:focus {
 }
 
 #wireplumber {
-    background-color: #EC0101;
+    background-color: #198844;
     color: #ffffff;
 }
 
 #wireplumber.muted {
     background-color: #1b1d1c;
-    color: #EC0101;
+    color: #198844;
 }
 
 #custom-media {
@@ -278,19 +278,20 @@ label:focus {
 }
 
 #tray {
-    background-color: transparent;
+    border-radius: 20px;
+    background-color: black;
     color: #ffffff;
 }
 
 #tray > .passive {
     -gtk-icon-effect: dim;
-    background-color: #EC0101;
+    background-color: #198844;
     color: #ffffff;
 }
 
 #tray > .needs-attention {
     -gtk-icon-effect: highlight;
-    background-color: #EC0101;
+    background-color: #198844;
     color: #ffffff;
 }
 
@@ -301,7 +302,7 @@ label:focus {
 }
 
 #idle_inhibitor.activated {
-    background-color: #EC0101;
+    background-color: #198844;
     color: #ffffff;
     border-radius: 20px 0px 0px 20px;
 
diff --git a/xsettingsd/xsettingsd.conf b/xsettingsd/xsettingsd.conf
index 622b06f..c4ab3db 100644
--- a/xsettingsd/xsettingsd.conf
+++ b/xsettingsd/xsettingsd.conf
@@ -1,4 +1,4 @@
-Net/ThemeName "Flat-Remix-GTK-Red-Darkest"
+Net/ThemeName "Flat-Remix-GTK-Green-Darkest-Solid"
 Net/IconThemeName "Cosmic"
 Gtk/CursorThemeName "BreezeX-Black"
 Net/EnableEventSounds 1
diff --git a/zsh/zshenv b/zsh/zshenv
index df0371e..3719ef4 100644
--- a/zsh/zshenv
+++ b/zsh/zshenv
@@ -2,5 +2,6 @@
 unset HISTFILE
 export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
 export skip_global_compinit=1
+fpath=($XDG_CONFIG_HOME/functions $fpath)
 [ -f /etc/profile ] && . /etc/profile
 [ -f "$XDG_CONFIG_HOME/sh/profile" ] && . "$XDG_CONFIG_HOME/sh/profile"
diff --git a/zsh/zshrc b/zsh/zshrc
index dffdc65..09a5e32 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -1,8 +1,17 @@
 #zmodload zsh/zprof
-if [ -d "$HOME/.zplug" ]; then
+if [ -n "$ZPLUG_HOME" ]; then
+  if [ -d "$ZPLUG_HOME" ]; then
+    export ZPLUG_INSTALLED="y"
+    source "$ZPLUG_HOME/init.zsh"
+  fi
+elif [ -d "$XDG_DATA_HOME/zplug" ]; then
+  export ZPLUG_INSTALLED="y"
+  source "$XDG_DATA_HOME/zplug/init.zsh"
+elif [ -d "$HOME/.zplug" ]; then
   export ZPLUG_INSTALLED="y"
   source "$HOME/.zplug/init.zsh"
 fi
+[ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config"
 HISTFILE="$XDG_CONFIG_HOME/zsh/hist"
 SAVEHIST=1000
 HISTSIZE=1000
@@ -33,7 +42,7 @@ elif [ -f "$HOME"/.zshrc ]; then
   alias e='source ~/.zshrc'
 fi
 
-source ~/.zkbd/$TERM-${${DISPLAY:t}:-$VENDOR-$OSTYPE}
+source ~/.config/zsh/.zkbd/$TERM-${${DISPLAY:t}:-$VENDOR-$OSTYPE}
 
 #autoload zkbd; zkbd
 bindkey -v
@@ -47,10 +56,10 @@ bindkey "${key[PageDown]}" history-substring-search-down
 if (env | grep -Fq 'DISTROBOX'); then
   MYPROMPT=$'%F{000}%K{004}[%n@%m]%F{013}\UE0B2%K{013}%F{000}%~%F{013}%K{004}\UE0B0%F{000}%#%F{004}%k\UE0B0%f '
 else
-  MYPROMPT=$'%F{000}%K{009}[%n@%m]%F{013}\UE0B2%K{013}%F{000}%~%F{013}%K{009}\UE0B0%F{000}%#%F{009}%k\UE0B0%f '
+  MYPROMPT=$'%F{000}%K{002}[%n@%m]%F{006}\UE0B2%K{006}%F{000}%~%F{006}%K{002}\UE0B0%F{000}%#%F{002}%k\UE0B0%f '
 fi
 function zle-line-init zle-keymap-select {
-  VIM_PROMPT=$'%F{000}%K{012}[%n@%m]%F{013}\UE0B2%K{013}%F{000}%~%F{013}%K{012}\UE0B0%F{000}%#%F{012}%k\UE0B0%f '
+  VIM_PROMPT=$'%F{000}%K{012}[%n@%m]%F{006}\UE0B2%K{006}%F{000}%~%F{006}%K{012}\UE0B0%F{000}%#%F{012}%k\UE0B0%f '
   PS1="${${KEYMAP/vicmd/$VIM_PROMPT}/main/$MYPROMPT}"
   zle reset-prompt
 }
@@ -80,6 +89,8 @@ if [ -n "$ZPLUG_INSTALLED" ]; then
 fi
 
 autoload -Uz compinit
-compinit
+compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
+
+zstyle ':completion:*' hosts off
 
 #zprof