General updates

10 files changed, 119 insertions, 74 deletions

diff --git a/.config/foot/foot.ini b/.config/foot/foot.ini
index f1f7de3..bce8053 100644
--- a/.config/foot/foot.ini
+++ b/.config/foot/foot.ini
@@ -1,5 +1,5 @@
 [main]
-include=~/.config/foot/themes/everforest-hard
+include=~/.config/foot/themes/noctalia
 
 font=Maple Mono NF-11:style=Regular
 
diff --git a/.config/foot/themes/everforest-hard b/.config/foot/themes/everforest-hard
index caf503b..ce0b07b 100644
--- a/.config/foot/themes/everforest-hard
+++ b/.config/foot/themes/everforest-hard
@@ -23,7 +23,7 @@ bright7=dfddc8 # white
 
 [colors-dark]
 alpha=1.0
-background=2b3339
+background=1e2326
 foreground=d3c6aa
 
 regular0=4b565c # black
diff --git a/.config/niri/cfg/input.kdl b/.config/niri/cfg/input.kdl
index b897a22..721161c 100644
--- a/.config/niri/cfg/input.kdl
+++ b/.config/niri/cfg/input.kdl
@@ -8,7 +8,7 @@ input {
             // uncomment the line below and change the layout accordingly.
             layout "us,us"
 						variant "colemak_dh_iso,"
-						options "grp:win_space_toggle"
+						options "grp:win_space_toggle,lv3:ralt_alt,caps:swapescape"
         }
         numlock // Enable numlock on startup
     }
diff --git a/.config/niri/cfg/misc.kdl b/.config/niri/cfg/misc.kdl
index d29d093..0bd247e 100644
--- a/.config/niri/cfg/misc.kdl
+++ b/.config/niri/cfg/misc.kdl
@@ -1,25 +1,25 @@
-    prefer-no-csd
-    screenshot-path null
+prefer-no-csd
+screenshot-path null
 
-    environment {
-        ELECTRON_OZONE_PLATFORM_HINT "auto"
-        QT_QPA_PLATFORM "wayland"
-        QT_QPA_PLATFORMTHEME "gtk3"
-        QT_WAYLAND_DISABLE_WINDOWDECORATION "1"
-        XDG_CURRENT_DESKTOP "niri"
-        XDG_SESSION_TYPE "wayland"
-    }
+environment {
+		ELECTRON_OZONE_PLATFORM_HINT "auto"
+		QT_QPA_PLATFORM "wayland"
+		QT_QPA_PLATFORMTHEME "gtk3"
+		QT_WAYLAND_DISABLE_WINDOWDECORATION "1"
+		XDG_CURRENT_DESKTOP "niri"
+		XDG_SESSION_TYPE "wayland"
+}
 
-    cursor {
-        xcursor-theme "BreezeX-RosePine-Linux"
-        xcursor-size 24
-    }
+cursor {
+		xcursor-theme "BreezeX-RosePine-Linux"
+		xcursor-size 24
+}
 
-    debug {
-        // Allows notification actions and window activation from Noctalia.
-        honor-xdg-activation-with-invalid-serial
-    }
+debug {
+		// Allows notification actions and window activation from Noctalia.
+		honor-xdg-activation-with-invalid-serial
+}
 
-    hotkey-overlay {
-       skip-at-startup
-    }
+hotkey-overlay {
+	 skip-at-startup
+}
diff --git a/.config/niri/cfg/rules.kdl b/.config/niri/cfg/rules.kdl
index 61f9280..825bac4 100644
--- a/.config/niri/cfg/rules.kdl
+++ b/.config/niri/cfg/rules.kdl
@@ -1,42 +1,47 @@
-    window-rule {
-	      open-maximized true
-        geometry-corner-radius 12
-        clip-to-geometry true
-    }
+workspace "web"
+workspace "term"
 
-     // if you use steam you will probably like these
-    window-rule {
-        match app-id="steam"
-        exclude title=r#"^[Ss]team$"#
-        open-floating true
-    }
+window-rule {
+		open-maximized true
+		geometry-corner-radius 12
+		clip-to-geometry true
+}
 
-    window-rule {
-       match app-id="steam" title=r#"^notificationtoasts_\d+_desktop$"#
-       default-floating-position x=10 y=10 relative-to="bottom-right"
-       open-focused false
-    }
+ // if you use steam you will probably like these
+window-rule {
+		match app-id="steam"
+		exclude title=r#"^[Ss]team$"#
+		open-floating true
+}
 
-		workspace "web"
+window-rule {
+	 match app-id="steam" title=r#"^notificationtoasts_\d+_desktop$"#
+	 default-floating-position x=10 y=10 relative-to="bottom-right"
+	 open-focused false
+}
 
-		window-rule {
-			match app-id="helium-browser"
-			open-on-workspace "web"
-		}
+window-rule {
+	match app-id="helium-browser"
+	open-on-workspace "web"
+}
 
-		workspace "term"
+window-rule {
+	match app-id="kitty"
+	open-on-workspace "term"
+}
 
-		window-rule {
-			match app-id="kitty"
-			open-on-workspace "term"
-		}
+window-rule {
+	match	app-id="foot"
+	open-on-workspace "term"
+}
 
-		window-rule {
-		  match	app-id="foot"
-			open-on-workspace "term"
-		}
+window-rule {
+    match app-id=r#"^org\.wezfurlong\.wezterm$"#
+    // default-column-width {}
+		open-on-workspace "term"
+}
 
-    layer-rule {
-        match namespace="^noctalia-wallpaper*"
-        place-within-backdrop true
-    }
+layer-rule {
+		match namespace="^noctalia-wallpaper*"
+		place-within-backdrop true
+}
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 9388c7f..8ac044a 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -30,9 +30,12 @@ vim.pack.add({
 	-- 'https://github.com/rose-pine/neovim',
 	"https://github.com/RRethy/base16-nvim",
 	"https://github.com/stevearc/conform.nvim",
+	"https://github.com/neanias/everforest-nvim",
 })
 
-require("matugen").setup()
+require("everforest").setup({
+	background = "hard",
+})
 
 local telescope = require("telescope")
 telescope.setup({
diff --git a/.config/systemd/user/default.target.wants/kanata.service b/.config/systemd/user/default.target.wants/kanata.service
deleted file mode 120000
index f1cba55..0000000
--- a/.config/systemd/user/default.target.wants/kanata.service
+++ /dev/null
@@ -1 +0,0 @@
-/home/natecox/.config/systemd/user/kanata.service
\ No newline at end of file
diff --git a/.config/systemd/user/kanata.service b/.config/systemd/user/kanata.service
deleted file mode 100644
index 8d18e8f..0000000
--- a/.config/systemd/user/kanata.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Kanata keyboard remapper
-Documentation=https://github.com/jtroo/kanata
-
-[Service]
-Type=simple
-ExecStart=kanata
-Restart=no
-
-[Install]
-WantedBy=default.target
-
diff --git a/.config/wezterm/wezterm.lua b/.config/wezterm/wezterm.lua
new file mode 100644
index 0000000..0597845
--- /dev/null
+++ b/.config/wezterm/wezterm.lua
@@ -0,0 +1,13 @@
+local wezterm = require("wezterm")
+
+local config = wezterm.config_builder()
+
+config.default_prog = { "zellij", "-l", "welcome" }
+
+config.enable_tab_bar = false
+
+config.color_scheme = "Everforest Dark Hard (Gogh)"
+config.font = wezterm.font("Maple Mono NF")
+config.font_size = 11
+
+return config
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index dc23369..c8e588d 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -11,6 +11,12 @@
   :ensure t
   :config (which-key-mode))
 
+(use-package evil
+	:ensure t)
+
+(use-package vterm
+	:ensure t)
+
 (use-package emacs
   :config
   (setq major-mode-remap-alist
@@ -32,6 +38,10 @@
   ((prog-mode . electric-pair-mode)
    (compilation-filter . ansi-color-compilation-filter)))
 
+(use-package tramp
+	:custom
+	(tramp-default-method "sshx"))
+
 (use-package project
   :custom
   (when (>= emacs-major-version 30)
@@ -87,6 +97,34 @@
 				 (prog-mode . flyspell-prog-mode)))
 
 (use-package emacs
+	:config
+	(add-to-list 'custom-theme-load-path "~/.emacs.d/everforest-theme")
+	(load-theme 'everforest-hard-dark t))
+
+;; (use-package doom-themes
+;;   :ensure t
+
+;; 	:custom
+;;   ;; Global settings (defaults)
+;;   (doom-themes-enable-bold t)   ; if nil, bold is universally disabled
+;;   (doom-themes-enable-italic t) ; if nil, italics is universally disabled
+;;   ;; for treemacs users
+;;   (doom-themes-treemacs-theme "doom-atom") ; use "doom-colors" for less minimal icon theme
+;; 	(doom-theme 'doom-everforest)
+
+;; 	:config
+;; 	(load-theme 'doom-everforest t)
+
+;;   ;; Enable flashing mode-line on errors
+;;   (doom-themes-visual-bell-config)
+;;   ;; Enable custom neotree theme (nerd-icons must be installed!)
+;;   (doom-themes-neotree-config)
+;;   ;; or for treemacs users
+;;   (doom-themes-treemacs-config)
+;;   ;; Corrects (and improves) org-mode's native fontification.
+;;   (doom-themes-org-config))
+
+(use-package emacs
   :hook ((before-save . delete-trailing-whitespace))
 
   :bind (("s-SPC" . cycle-spacing))
@@ -97,7 +135,7 @@
   (tab-width 2)
   (custom-file (concat user-emacs-directory "custom.el"))
   (display-line-numbers 'relative)
-	(backup-directory-alist '(("." . "~/.ema:Cs.d/backups")))
+	(backup-directory-alist '(("." . "~/.emacs.d/backups")))
 	(auto-save-default nil)
 
   :config
@@ -105,7 +143,6 @@
     (load custom-file))
   (set-scroll-bar-mode nil)
   (setq-default indent-tabs-mode t)
-	(load-theme 'noctalia t)
   (electric-indent-mode +1)
   (setq ido-enable-flex-matching t)
   (setq ido-everywhere t)