???

17 files changed, 273 insertions, 232 deletions

diff --git a/artix/Makefile b/artix/Makefile
index dc450c5..7948179 100644
--- a/artix/Makefile
+++ b/artix/Makefile
@@ -1,7 +1,7 @@
 .PHONY = all config stow unstow artix lsp pac
 
-COLORSCHEME = slate
-FONT = MartianMono NerdFont
+COLORSCHEME = google
+FONT = monospace
 
 all: config
 
@@ -24,10 +24,11 @@ unstow:
 	stow -v -t $$HOME -D home
 
 artix:
-	pacman -S --needed ttf-martian-mono-nerd hyprland hyprpicker alacritty waybar dunst grim wl-clipboard slurp xdg-desktop-portal-hyprland xdg-user-dirs zsh zsh-autosuggestions zsh-syntax-highlighting brightnessctl firefox zathura-pdf-poppler thunderbird keepassxc mpv yt-dlp nsxiv pavucontrol time tree openssh man-db man-pages pacman-contrib stow fzf syncthing ufw-dinit chrony-dinit rofi hyprpolkitagent
+	pacman -S --needed hyprland hyprpicker alacritty waybar dunst grim wl-clipboard slurp xdg-desktop-portal-hyprland xdg-user-dirs zsh zsh-autosuggestions zsh-syntax-highlighting brightnessctl firefox zathura-pdf-poppler thunderbird keepassxc mpv yt-dlp nsxiv pavucontrol time tree openssh man-db man-pages pacman-contrib stow fzf syncthing ufw-dinit chrony-dinit hyprpolkitagent
 	@echo "  Change your shell to zsh (chsh -s /bin/zsh)"
 	@echo "  Enable ufw"
 	@echo "  Enable chrony"
+	@echo "  install tofi"
 
 pac:
 	paccache -r
diff --git a/artix/colorscheme/google.env b/artix/colorscheme/google.env
new file mode 100644
index 0000000..a21219f
--- /dev/null
+++ b/artix/colorscheme/google.env
@@ -0,0 +1,23 @@
+#HEX_BACKGROUND=#1d1f21
+#HEX_FOREGROUND=#c5c8c6
+
+HEX_BACKGROUND=#000000
+HEX_FOREGROUND=#ffffff
+
+HEX_NORMAL_BLACK=#1d1f21
+HEX_NORMAL_RED=#cc342b
+HEX_NORMAL_GREEN=#198844
+HEX_NORMAL_YELLOW=#fba922
+HEX_NORMAL_BLUE=#3971ed
+HEX_NORMAL_MAGENTA=#a36ac7
+HEX_NORMAL_CYAN=#3971ed
+HEX_NORMAL_WHITE=#c5c8c6
+
+HEX_BRIGHT_BLACK=#969896
+HEX_BRIGHT_RED=#cc342b
+HEX_BRIGHT_GREEN=#198844
+HEX_BRIGHT_YELLOW=#fba922
+HEX_BRIGHT_BLUE=#3971ed
+HEX_BRIGHT_MAGENTA=#a36ac7
+HEX_BRIGHT_CYAN=#3971ed
+HEX_BRIGHT_WHITE=#ffffff
diff --git a/artix/colorscheme/gruvbox.env b/artix/colorscheme/gruvbox.env
new file mode 100644
index 0000000..0214bde
--- /dev/null
+++ b/artix/colorscheme/gruvbox.env
@@ -0,0 +1,21 @@
+HEX_BACKGROUND=#282828
+#HEX_FOREGROUND=#ebdbb2
+HEX_FOREGROUND=#fcecc3
+
+HEX_NORMAL_BLACK=#282828
+HEX_NORMAL_RED=#cc241d
+HEX_NORMAL_GREEN=#98971a
+HEX_NORMAL_YELLOW=#d79921
+HEX_NORMAL_BLUE=#458588
+HEX_NORMAL_MAGENTA=#b16286
+HEX_NORMAL_CYAN=#689d6a
+HEX_NORMAL_WHITE=#a89984
+
+HEX_BRIGHT_BLACK=#928374
+HEX_BRIGHT_RED=#fb4934
+HEX_BRIGHT_GREEN=#b8bb26
+HEX_BRIGHT_YELLOW=#fabd2f
+HEX_BRIGHT_BLUE=#83a598
+HEX_BRIGHT_MAGENTA=#d3869b
+HEX_BRIGHT_CYAN=#8ec07c
+HEX_BRIGHT_WHITE=#ebdbb2
diff --git a/artix/home/.config/git/config b/artix/home/.config/git/config
index 8efedc4..a3596b3 100644
--- a/artix/home/.config/git/config
+++ b/artix/home/.config/git/config
@@ -1,7 +1,6 @@
 [user]
 	email = nantha@mielota.com
 	name = Nantha Sorubakanthan
-	#signingkey = E6E0870909E743B5E4101068E614BDE9E305D5D7
 [init]
 	defaultBranch = main
 [core]
diff --git a/artix/home/.config/helix/config.toml b/artix/home/.config/helix/config.toml
index a13e774..aece973 100644
--- a/artix/home/.config/helix/config.toml
+++ b/artix/home/.config/helix/config.toml
@@ -1,10 +1,12 @@
 theme = "tokyonight"
 
 [editor]
-	line-number = "relative"
+	line-number = "absolute"
 	cursorline = true
-	shell = ["zsh", "-c"]
 	end-of-line-diagnostics = "hint"
+	auto-completion = true
+	auto-format = false
+	path-completion = true
 [editor.indent-guides]
 	render = true
 	skip-levels = 1
diff --git a/artix/home/.config/hypr/.luarc.json b/artix/home/.config/hypr/.luarc.json
new file mode 100644
index 0000000..b4ecec0
--- /dev/null
+++ b/artix/home/.config/hypr/.luarc.json
@@ -0,0 +1,7 @@
+{
+  "workspace": {
+    "library": [
+      "/usr/share/hypr/stubs"
+    ]
+  }
+}
diff --git a/artix/home/.config/hypr/hyprland.conf b/artix/home/.config/hypr/hyprland.conf
deleted file mode 100644
index 4da2848..0000000
--- a/artix/home/.config/hypr/hyprland.conf
+++ /dev/null
@@ -1,180 +0,0 @@
-env = GDK_BACKEND,wayland,x11,*
-env = XDG_CURRENT_DESKTOP,Hyprland
-env = XDG_SESSION_TYPE,wayland
-env = XDG_SESSION_DESKTOP,Hyprland
-
-exec-once = dunst
-exec-once = waybar
-exec-once = ~/.config/hypr/xdg-portal-hyprland
-exec-once = /usr/lib/hyprpolkitagent/hyprpolkitagent
-
-exec-once = gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark"
-exec-once = gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
-env = QT_QPA_PLATFORMTHEME,gtk3
-
-$mainMod = SUPER
-
-monitor=HDMI-A-1, 2560x1440@100,0x0,1
-#monitor=eDP-1, 1920x1080@60, 0x0, 1
-#monitor=HDMI-A-1, preferred, auto, 1, mirror, eDP-1
-
-bind = $mainMod, A, fullscreen,
-bind = $mainMod, C, killactive,
-bind = $mainMod, D, exec, hyprpicker -naq
-bind = $mainMod, F, exec, firefox
-bind = $mainMod, M, exit,
-bind = $mainMod, P, pseudo, # dwindle
-bind = $mainMod, Q, exec, alacritty
-bind = $mainMod, RETURN, exec, ~/.local/bin/spawn-alacritty-cwd
-bind = $mainMod, R, exec, rofi -show drun
-bind = $mainMod, U, exec, pkill waybar ; waybar
-bind = $mainMod, V, togglefloating,
-
-bind = , Print, exec, grim -g "$(slurp)" - | wl-copy
-bind = $mainMod, Print, exec, grim - | wl-copy
-
-bind = $mainMod, h, movefocus, l
-bind = $mainMod, l, movefocus, r
-bind = $mainMod, k, movefocus, u
-bind = $mainMod, j ,movefocus, d
-
-bind = $mainMod SHIFT, H, movewindow, l
-bind = $mainMod SHIFT, L, movewindow, r
-bind = $mainMod SHIFT, K, movewindow, u
-bind = $mainMod SHIFT, J, movewindow, d
-
-bind = $mainMod, code:10, workspace, 1
-bind = $mainMod, code:11, workspace, 2
-bind = $mainMod, code:12, workspace, 3
-bind = $mainMod, code:13, workspace, 4
-bind = $mainMod, code:14, workspace, 5
-bind = $mainMod, code:15, workspace, 6
-bind = $mainMod, code:16, workspace, 7
-bind = $mainMod, code:17, workspace, 8
-bind = $mainMod, code:18, workspace, 9
-bind = $mainMod, code:19, workspace, 10
-
-bind = $mainMod SHIFT, code:10, movetoworkspace, 1
-bind = $mainMod SHIFT, code:11, movetoworkspace, 2
-bind = $mainMod SHIFT, code:12, movetoworkspace, 3
-bind = $mainMod SHIFT, code:13, movetoworkspace, 4
-bind = $mainMod SHIFT, code:14, movetoworkspace, 5
-bind = $mainMod SHIFT, code:15, movetoworkspace, 6
-bind = $mainMod SHIFT, code:16, movetoworkspace, 7
-bind = $mainMod SHIFT, code:17, movetoworkspace, 8
-bind = $mainMod SHIFT, code:18, movetoworkspace, 9
-bind = $mainMod SHIFT, code:19, movetoworkspace, 10
-
-bind = $mainMod, S, togglespecialworkspace, magic
-bind = $mainMod SHIFT, S, movetoworkspace, special:magic
-
-bindm = $mainMod, mouse:272, movewindow
-bindm = $mainMod, mouse:273, resizewindow
-
-bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+
-bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
-bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
-bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
-bindel = ,XF86MonBrightnessUp, exec, brightnessctl -e4 -n2 set 5%+
-bindel = ,XF86MonBrightnessDown, exec, brightnessctl -e4 -n2 set 5%-
-
-bindl = , XF86AudioNext, exec, playerctl next
-bindl = , XF86AudioPause, exec, playerctl play-pause
-bindl = , XF86AudioPlay, exec, playerctl play-pause
-bindl = , XF86AudioPrev, exec, playerctl previous
-
-misc {
-	force_default_wallpaper = 0
-	disable_hyprland_logo = true
-	disable_splash_rendering = true
-	background_color = rgb(000000)
-}
-
-general {
-	gaps_in = 10
-	gaps_out = 15
-
-	border_size = 0
-
-	col.active_border = rgba(b800e6ee) rgba(e699ffee) 45deg
-	col.inactive_border = rgba(595959aa)
-
-	resize_on_border = false
-	allow_tearing = false
-
-	layout = dwindle
-}
-
-decoration {
-	rounding = 0
-	rounding_power = 10
-
-	active_opacity = 1.0
-	inactive_opacity = 1.0
-
-	shadow {
-		enabled = true
-		range = 4
-		render_power = 3
-		color = rgba(1a1a1aee)
-	}
-
-	blur {
-		enabled = false
-		size = 10
-		passes = 3
-
-		vibrancy = 0.1696
-	}
-}
-
-animations {
-	#enabled = yes, please :)
-	enabled = no
-
-	bezier = easeOutQuint,0.23,1,0.32,1
-	bezier = easeInOutCubic,0.65,0.05,0.36,1
-	bezier = linear,0,0,1,1
-	bezier = almostLinear,0.5,0.5,0.75,1.0
-	bezier = quick,0.15,0,0.1,1
-
-	animation = global, 1, 10, default
-	animation = border, 1, 5.39, easeOutQuint
-	animation = windows, 1, 4.79, easeOutQuint
-	animation = windowsIn, 1, 4.1, easeOutQuint, popin 87%
-	animation = windowsOut, 1, 1.49, linear, popin 87%
-	animation = fadeIn, 1, 1.73, almostLinear
-	animation = fadeOut, 1, 1.46, almostLinear
-	animation = fade, 1, 3.03, quick
-	animation = layers, 1, 3.81, easeOutQuint
-	animation = layersIn, 1, 4, easeOutQuint, fade
-	animation = layersOut, 1, 1.5, linear, fade
-	animation = fadeLayersIn, 1, 1.79, almostLinear
-	animation = fadeLayersOut, 1, 1.39, almostLinear
-	animation = workspaces, 1, 1.94, almostLinear, fade
-	animation = workspacesIn, 1, 1.21, almostLinear, fade
-	animation = workspacesOut, 1, 1.94, almostLinear, fade
-}
-
-dwindle {
-	preserve_split = true
-}
-
-master {
-	new_status = master
-}
-
-misc {
-	force_default_wallpaper = -1
-	disable_hyprland_logo = true
-}
-env = XCURSOR_SIZE,24
-env = XCURSOR_THEME,whiteglass
-
-input {
-	kb_layout = fr
-	kb_model = pc105
-	kb_options = terminate:ctrl_amt_bksp
-
-	follow_mouse = 1
-}
diff --git a/artix/home/.config/hypr/hyprland.lua b/artix/home/.config/hypr/hyprland.lua
new file mode 100644
index 0000000..b270bde
--- /dev/null
+++ b/artix/home/.config/hypr/hyprland.lua
@@ -0,0 +1,175 @@
+if 1 then
+	hl.monitor({ output = "HDMI-A-1", mode = "2560x1440@100", position = "0x0", scale = "1", })
+else
+	hl.monitor({ output = "eDP-1", mode = "1920x1080@60", position = "0x0", scale = "1", })
+	hl.monitor({ output = "HDMI-A-1", mode = "preferred", position = "auto", scale = "1", mirror = "eDP-1" })
+end
+
+
+local terminal = os.getenv("TERMINAL")
+local browser  = os.getenv("BROWSER")
+local menu     = "exec $(tofi-drun -c ~/.config/tofi.ini)"
+
+hl.on("hyprland.start", function()
+	hl.exec_cmd("dunst")
+	hl.exec_cmd("waybar")
+	hl.exec_cmd("~/.config/hypr/xdg-portal-hyprland")
+	hl.exec_cmd("/usr/lib/hyprpolkitagent/hyprpolkitagent")
+	hl.exec_cmd("gsettings set org.gnome.desktop.interface gtk-theme \"Adwaita-dark\"")
+	hl.exec_cmd("gsettings set org.gnome.desktop.interface color-scheme \"prefer-dark\"")
+end)
+
+hl.env("GDK_BACKEND", "wayland,x11,*")
+hl.env("XDG_CURRENT_DESKTOP", "Hyprland")
+hl.env("XDG_SESSION_TYPE", "wayland")
+hl.env("XDG_SESSION_DESKTOP", "Hyprland")
+
+hl.config({
+	general = {
+		gaps_in          = 0,
+		gaps_out         = 0,
+		border_size      = 0,
+		col              = {
+			active_border   = { colors = { "rgba(33ccffee)", "rgba(00ff99ee)" }, angle = 45 },
+			inactive_border = "rgba(595959aa)",
+		},
+		resize_on_border = false,
+		allow_tearing    = false,
+		layout           = "dwindle",
+	},
+
+	decoration = {
+		rounding         = 0,
+		rounding_power   = 0,
+		active_opacity   = 1.0,
+		inactive_opacity = 1.0,
+		shadow           = { enabled = false, },
+		blur             = { enabled = false, },
+	},
+
+	animations = { enabled = false, },
+})
+
+hl.config({ dwindle = { preserve_split = true, }, })
+hl.config({ master = { new_status = "master", }, })
+hl.config({ scrolling = { fullscreen_on_one_column = true, }, })
+
+hl.config({
+	misc = {
+		force_default_wallpaper = 0,
+		disable_hyprland_logo = true,
+		disable_splash_rendering = true,
+		background_color = "#000000"
+	},
+})
+
+
+hl.config({
+	input = {
+		kb_layout    = "fr",
+		kb_variant   = "",
+		kb_model     = "pc105",
+		kb_options   = "",
+		kb_rules     = "",
+
+		follow_mouse = 1,
+
+		sensitivity  = 0, -- -1.0 - 1.0, 0 means no modification.
+
+		touchpad     = {
+			natural_scroll = true,
+		},
+	},
+})
+
+hl.gesture({
+	fingers = 3,
+	direction = "horizontal",
+	action = "workspace"
+})
+
+hl.device({
+	name        = "epic-mouse-v1",
+	sensitivity = -0.5,
+})
+
+
+local mainMod = "SUPER"
+
+hl.bind(mainMod .. " + A", hl.dsp.window.fullscreen())
+hl.bind(mainMod .. " + C", hl.dsp.window.close())
+hl.bind(mainMod .. " + D", hl.dsp.exec_cmd("hyprpicker -naq"))
+hl.bind(mainMod .. " + F", hl.dsp.exec_cmd(browser))
+hl.bind(mainMod .. " + J", hl.dsp.layout("togglesplit"))
+hl.bind(mainMod .. " + M",
+	hl.dsp.exec_cmd("command -v hyprshutdown >/dev/null 2>&1 && hyprshutdown || hyprctl dispatch 'hl.dsp.exit()'"))
+hl.bind(mainMod .. " + P", hl.dsp.window.pseudo())
+hl.bind(mainMod .. " + Q", hl.dsp.exec_cmd(terminal))
+hl.bind(mainMod .. " + return", hl.dsp.exec_cmd("~/.local/bin/spawn-alacritty-cwd"))
+hl.bind(mainMod .. " + R", hl.dsp.exec_cmd(menu))
+hl.bind(mainMod .. " + U", hl.dsp.exec_cmd("pkill waybar ; waybar"))
+hl.bind(mainMod .. " + V", hl.dsp.window.float({ action = "toggle" }))
+
+hl.bind(mainMod .. " + h", hl.dsp.focus({ direction = "left" }))
+hl.bind(mainMod .. " + j", hl.dsp.focus({ direction = "right" }))
+hl.bind(mainMod .. " + k", hl.dsp.focus({ direction = "up" }))
+hl.bind(mainMod .. " + l", hl.dsp.focus({ direction = "down" }))
+
+for i = 1, 10 do
+	local key = i % 11
+	hl.bind(mainMod .. " + code:" .. key + 9, hl.dsp.focus({ workspace = i }))
+	hl.bind(mainMod .. " + SHIFT + code:" .. key + 9, hl.dsp.window.move({ workspace = i }))
+end
+
+hl.bind(mainMod .. " + S", hl.dsp.workspace.toggle_special("magic"))
+hl.bind(mainMod .. " + SHIFT + S", hl.dsp.window.move({ workspace = "special:magic" }))
+
+hl.bind(mainMod .. " + mouse:272", hl.dsp.window.drag(), { mouse = true })
+hl.bind(mainMod .. " + mouse:273", hl.dsp.window.resize(), { mouse = true })
+
+hl.bind("XF86AudioRaiseVolume", hl.dsp.exec_cmd("wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"),
+	{ locked = true, repeating = true })
+hl.bind("XF86AudioLowerVolume", hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"),
+	{ locked = true, repeating = true })
+hl.bind("XF86AudioMute", hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"),
+	{ locked = true, repeating = true })
+hl.bind("XF86AudioMicMute", hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"),
+	{ locked = true, repeating = true })
+hl.bind("XF86MonBrightnessUp", hl.dsp.exec_cmd("brightnessctl -e4 -n2 set 5%+"), { locked = true, repeating = true })
+hl.bind("XF86MonBrightnessDown", hl.dsp.exec_cmd("brightnessctl -e4 -n2 set 5%-"), { locked = true, repeating = true })
+hl.bind("XF86AudioNext", hl.dsp.exec_cmd("playerctl next"), { locked = true })
+hl.bind("XF86AudioPause", hl.dsp.exec_cmd("playerctl play-pause"), { locked = true })
+hl.bind("XF86AudioPlay", hl.dsp.exec_cmd("playerctl play-pause"), { locked = true })
+hl.bind("XF86AudioPrev", hl.dsp.exec_cmd("playerctl previous"), { locked = true })
+
+
+local suppressMaximizeRule = hl.window_rule({
+	-- Ignore maximize requests from all apps. You'll probably like this.
+	name           = "suppress-maximize-events",
+	match          = { class = ".*" },
+	suppress_event = "maximize",
+})
+
+-- suppressMaximizeRule:set_enabled(false)
+
+hl.window_rule({
+	name     = "fix-xwayland-drags",
+	match    = {
+		class      = "^$",
+		title      = "^$",
+		xwayland   = true,
+		float      = true,
+		fullscreen = false,
+		pin        = false,
+	},
+
+	no_focus = true,
+})
+
+hl.window_rule({
+	name  = "move-hyprland-run",
+	match = { class = "hyprland-run" },
+
+	move  = "20 monitor_h-120",
+	float = true,
+})
diff --git a/artix/home/.config/nvim/init.lua b/artix/home/.config/nvim/init.lua
index 8e07b39..396cb88 100644
--- a/artix/home/.config/nvim/init.lua
+++ b/artix/home/.config/nvim/init.lua
@@ -1,7 +1,16 @@
+-- COLORSCHEME
+-- use terminal colors
+
+vim.o.termguicolors = false
+vim.cmd[[hi Normal guibg=NONE ctermbg=NONE]]
+vim.cmd[[hi EndOfBuffer guibg=NONE ctermbg=NONE]]
+
+-- GLOBALS
+
 vim.g.mapleader = " "
 
 vim.o.number = true
-vim.o.relativenumber = true
+vim.o.relativenumber = false
 
 vim.o.undofile = true
 vim.o.ignorecase = true
@@ -13,7 +22,6 @@ vim.o.softtabstop = 8
 vim.o.smartindent = true
 vim.o.autoindent = true
 
-vim.o.termguicolors = true
 vim.o.signcolumn = "yes"
 vim.o.winborder = 'single'
 vim.o.showmode = true
@@ -40,10 +48,6 @@ vim.o.completeopt = 'menu,menuone,noselect'
 vim.diagnostic.status()
 vim.lsp.status()
 
--- COLORSCHEME
-
-vim.cmd [[colorscheme slate]]
-
 -- FRENCH SPELLS
 
 local spell_path = vim.fn.stdpath("data") .. "/site/spell"
@@ -140,7 +144,7 @@ map("n", "<leader>/", fzf.live_grep)
 -- Configure lua_ls to use neovim runtime or all of lua_ls lib.
 -- We put way much load on the cpu if we open both.
 local lua_ls_lib = {}
-local neovim_config_path = vim.fn.expand("~/code/dox/artixlinux/home/.config/nvim/init.lua")
+local neovim_config_path = vim.fn.expand("~/code/dox/artix/home/.config/nvim/init.lua")
 
 if vim.api.nvim_buf_get_name(0) == neovim_config_path then
 	lua_ls_lib = vim.api.nvim_get_runtime_file("", true)
@@ -172,10 +176,6 @@ vim.api.nvim_create_autocmd("TextYankPost", {
 	callback = function() vim.hl.on_yank() end
 })
 
-vim.api.nvim_create_autocmd("BufWritePre", {
-	callback = function() vim.lsp.buf.format() end
-})
-
 vim.api.nvim_create_autocmd("BufWritePost", {
 	pattern = "*.tex",
 	callback = function() vim.cmd [[! pdflatex % ]] end
@@ -205,17 +205,3 @@ vim.api.nvim_create_autocmd("FileType", {
 		require('jdtls').start_or_attach(config)
 	end
 })
-
---[[
-function get_hl_groups()
-	for hl_name, hl in pairs(vim.api.nvim_get_hl(0, {})) do
-		print(hl_name)
-	end
-end
-
-local function update_hl(group, tbl)
-	local old_hl = vim.api.nvim_get_hl_by_name(group, true)
-	local new_hl = vim.tbl_extend('force', old_hl, tbl)
-	vim.api.nvim_set_hl(0, group, new_hl)
-end
-]]
diff --git a/artix/home/.config/rofi/config.rasi b/artix/home/.config/rofi/config.rasi
index c55c0d6..785823b 100644
--- a/artix/home/.config/rofi/config.rasi
+++ b/artix/home/.config/rofi/config.rasi
@@ -1,4 +1,4 @@
-@theme "slate.rasi"
+@theme "google.rasi"
 
 configuration {
 	modes: "window,drun,run,ssh";
diff --git a/artix/home/.config/tofi.ini b/artix/home/.config/tofi.ini
new file mode 100644
index 0000000..becfc6b
--- /dev/null
+++ b/artix/home/.config/tofi.ini
@@ -0,0 +1,10 @@
+width = 100%
+height = 100%
+border-width = 0
+outline-width = 0
+padding-left = 1%
+padding-top = 1%
+result-spacing = 25
+num-results = 5
+font = monospace
+background-color = #000000
diff --git a/artix/home/.config/waybar/config.jsonc b/artix/home/.config/waybar/config.jsonc
index c13824a..a60a949 100644
--- a/artix/home/.config/waybar/config.jsonc
+++ b/artix/home/.config/waybar/config.jsonc
@@ -1,7 +1,10 @@
 {
-	"margin-top": 15,
-	"margin-left": 15,
-	"margin-right": 15,
+	//"margin-top": 15,
+	//"margin-right": 15,
+	//"margin-left": 15,
+	"margin-top": 0,
+	"margin-right": 0,
+	"margin-left": 0,
 	"layer": "top",
 	"position": "top",
 	"spacing": 3,
diff --git a/artix/home/.config/zsh/.zshrc b/artix/home/.config/zsh/.zshrc
index bc53096..56852cc 100644
--- a/artix/home/.config/zsh/.zshrc
+++ b/artix/home/.config/zsh/.zshrc
@@ -10,6 +10,7 @@ alias rmdir="rmdir -v"
 alias chmod="chmod -v"
 alias mv="mv -v"
 alias cp="cp -v"
+alias reload_config="make -C ~/code/dox/artix/"
 
 zstyle :compinstall filename "~/.zshrc"
 autoload -Uz compinit
diff --git a/artix/home/.editorconfig b/artix/home/.editorconfig
deleted file mode 100644
index c203964..0000000
--- a/artix/home/.editorconfig
+++ /dev/null
@@ -1,8 +0,0 @@
-root = true
-
-[*]
-indent_style = tab
-indent_size = 8
-end_of_line = lf
-trim_trailing_whitespace = true
-insert_final_newline = true
diff --git a/artix/home/.local/share/dox/quickconfig b/artix/home/.local/share/dox/quickconfig
index ca7db0d..93ac9da 100644
--- a/artix/home/.local/share/dox/quickconfig
+++ b/artix/home/.local/share/dox/quickconfig
@@ -3,7 +3,7 @@ $XDG_CONFIG_HOME/zsh/.zshrc#zshrc$
 $XDG_CONFIG_HOME/zsh/.zprofile#zprofile$
 $XDG_CONFIG_HOME/git/config#git$
 $XDG_CONFIG_HOME/nvim/init.lua#nvim$
-$XDG_CONFIG_HOME/hypr/hyprland.conf#hypr$
+$XDG_CONFIG_HOME/hypr/hyprland.lua#hypr$
 $XDG_CONFIG_HOME/alacritty/alacritty.toml#alacritty$
 $XDG_CONFIG_HOME/kitty/kitty.conf#kitty$
 $XDG_CONFIG_HOME/cava/config#cava$
@@ -14,4 +14,5 @@ $XDG_CONFIG_HOME/waybar/config.jsonc#waybar$
 $XDG_CONFIG_HOME/waybar/style.css#wstyle$
 $XDG_CONFIG_HOME/zathura/zathurarc#zathura$
 $XDG_CONFIG_HOME/rofi/config.rasi#rofi$
+$XDG_CONFIG_HOME/tofi.ini#tofi$
 $XDG_DATA_HOME/dox/quickconfig#edit$
diff --git a/artix/template/alacritty/alacritty.toml b/artix/template/alacritty/alacritty.toml
index 0b0f612..1ef4213 100644
--- a/artix/template/alacritty/alacritty.toml
+++ b/artix/template/alacritty/alacritty.toml
@@ -4,7 +4,7 @@ opacity = 0.73
 
 [font]
 normal = { family = "$FONT", style = "Regular" }
-size = 17
+size = 14
 
 [colors.primary]
 background = '$HEX_BACKGROUND'
diff --git a/artix/template/waybar/style.css b/artix/template/waybar/style.css
index c093460..a851cfe 100644
--- a/artix/template/waybar/style.css
+++ b/artix/template/waybar/style.css
@@ -14,7 +14,7 @@
 }
 
 #workspaces button.active {
-	background: $HEX_BRIGHT_MAGENTA;
+	background: $HEX_NORMAL_MAGENTA;
 }
 
 #workspaces button.special {
@@ -55,27 +55,27 @@
 }
 
 #pulseaudio.bluetooth {
-	background: #7aa2f7;
+	background: $HEX_NORMAL_BLUE;
 }
 
 #battery,
 #cpu,
 #memory,
 #temperature {
-	background: #9ece6a;
+	background: $HEX_NORMAL_GREEN;
 }
 
 #battery.warning,
 #cpu.warning,
 #memory.warning {
-	background: #e0af68;
+	background: $HEX_NORMAL_YELLOW;
 }
 
 #battery.urgent,
 #cpu.urgent,
 #memory.urgent,
 #network.disabled {
-	background: #ff9e64;
+	background: $HEX_BRIGHT_RED;
 }
 
 #battery.critical,
@@ -84,11 +84,11 @@
 #memory.critical,
 #network.disconnected,
 #temperature.critical {
-	background: #f7768e
+	background: $HEX_NORMAL_RED
 }
 
 #window {
 	margin-left: 10px;
-	background: #32344a;
+	background: $HEX_BACKGROUND;
 	padding: 7;
 }