move all the files

106 files changed, 82 insertions, 307 deletions

diff --git a/.emacs b/.emacs
deleted file mode 100644
index 30830b9..0000000
--- a/.emacs
+++ /dev/null
@@ -1,146 +0,0 @@
-;; do autoload stuff here
-(package-initialize)
-(require 'package)
-(add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/") t)
-
-(defvar rc/package-contents-refreshed nil)
-
-(defun rc/package-refresh-contents-once ()
-  (when (not rc/package-contents-refreshed)
-    (setq rc/package-contents-refreshed t)
-    (package-refresh-contents)))
-
-(defun rc/require-one-package (package)
-  (when (not (package-installed-p package))
-    (rc/package-refresh-contents-once)
-    (package-install package)))
-
-(defun rc/require (&rest packages)
-  (dolist (package packages)
-    (rc/require-one-package package)))
-
-(defun rc/require-theme (theme)
-  (let ((theme-package (->> theme
-                            (symbol-name)
-                            (funcall (-flip #'concat) "-theme")
-                            (intern))))
-    (rc/require theme-package)
-    (load-theme theme t)))
-
-
-(rc/require 'dash)
-(require 'dash)
-(rc/require 'dash-functional)
-(require 'dash-functional)
-
-(defun rc/get-default-font ()
-  (cond
-   ((eq system-type 'windows-nt) "Consolas-13")))
-(add-to-list 'default-frame-alist `(font . ,(rc/get-default-font)))
-(rc/require 'ansi-color)
-
-(rc/require 'ido)
-(rc/require 'ido-completing-read+)
-(rc/require 'smex)
-(ido-mode t)
-(ido-everywhere t)
-(ido-ubiquitous-mode t)
-
-(global-set-key (kbd "M-x") 'smex)
-(global-set-key (kbd "M-X") 'smex-major-mode-commands)
-;; This is your old M-x. p
-(global-set-key (kbd "C-c C-c M-x") 'execute-extended-command)
-
-(tool-bar-mode 0)
-(menu-bar-mode 0)
-(scroll-bar-mode 0)
-(column-number-mode 1)
-(show-paren-mode 1)
-
-(setq-default inhibit-splash-screen t
-              make-backup-files nil
-              tab-width 4
-              indent-tabs-mode nil
-              compilation-scroll-output t
-              visible-bell (equal system-type 'windows-nt))
-
-(setq-default c-basic-offset 4
-              c-default-style '((java-mode . "java")
-                                (awk-mode . "awk")
-                                (other . "bsd")))
-(setq split-width-threshold 9999)
-
-(defun rc/duplicate-line ()
-  "Duplicate current line"
-  (interactive)
-  (let ((column (- (point) (point-at-bol)))
-        (line (let ((s (thing-at-point 'line t)))
-                (if s (string-remove-suffix "\n" s) ""))))
-    (move-end-of-line 1)
-    (newline)
-    (insert line)
-    (move-beginning-of-line 1)
-    (forward-char column)))
-
-(global-set-key (kbd "M-J") 'text-scale-decrease)
-(global-set-key (kbd "M-K") 'text-scale-increase)
-
-(global-set-key (kbd "M-c") 'rc/duplicate-line)
-(global-set-key (kbd "C-c p") 'find-file-at-point)
-(global-display-line-numbers-mode)
-(setq next-line-add-newlines t)
-(setq display-line-numbers-type 'relative)
-
-(rc/require 'direnv 'editorconfig 'multiple-cursors)
-(editorconfig-mode 1)
-(electric-pair-mode)
-(global-set-key (kbd "C-S-c C-S-c") 'mc/edit-lines)
-(global-set-key (kbd "C->") 'mc/mark-next-like-this)
-(global-set-key (kbd "C-<") 'mc/mark-previous-like-this)
-(global-set-key (kbd "C-c C-<") 'mc/mark-all-like-this)
-(global-set-key (kbd "C-.") 'mc/mark-all-in-region)
-
-(rc/require 'cl-lib 'magit)
-(setq magit-auto-revert-mode nil)
-(global-set-key (kbd "C-c m s") 'magit-status)
-(global-set-key (kbd "C-c m l") 'magit-log)
-
-(require 'dired-x)
-(setq dired-omit-files
-      (concat dired-omit-files "\\|^\\..+$"))
-(setq-default dired-dwim-target t)
-(setq dired-listing-switches "-alh")
-
-;; stolen from: https://emacs.stackexchange.com/questions/24698/ansi-escape-sequences-in-compilation-mode
-(rc/require 'ansi-color)
-(defun endless/colorize-compilation ()
-  "Colorize from `compilation-filter-start' to `point'."
-  (let ((inhibit-read-only t))
-    (ansi-color-apply-on-region
-     compilation-filter-start (point))))
-(add-hook 'compilation-filter-hook
-          #'endless/colorize-compilation)
-
-(rc/require
- 'nix-mode
- 'yaml-pro
- )
-
-(rc/require-theme 'gruber-darker)
-
-(custom-set-variables
- ;; custom-set-variables was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(custom-enabled-themes '(gruber-darker))
- '(custom-safe-themes
-   '("e13beeb34b932f309fb2c360a04a460821ca99fe58f69e65557d6c1b10ba18c7" default))
- '(package-selected-packages
-   '(paredit nix-mode direnv gruber-darker-theme magit multiple-cursors ido-completing-read+ editorconfig smex)))
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- )
diff --git a/.gitmodules b/.gitmodules
index ca9ca5b..83fdce4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
-[submodule "home/dwm"]
-	path = home/dwm
+[submodule "mut/dwm"]
+	path = mut/dwm
 	url = https://github.com/mvinkio/dwm
-[submodule "home/st"]
-	path = home/st
+[submodule "mut/st"]
+	path = mut/st
 	url = https://github.com/mvinkio/st
-[submodule "home/dwmblocks"]
+[submodule "mut/dwmblocks"]
 	path = home/dwmblocks
 	url = https://github.com/mvinkio/dwmblocks
diff --git a/installer b/drduh/installer
index 5743a7f..5743a7f 120000
--- a/installer
+++ b/drduh/installer
diff --git a/signed.txt b/drduh/signed.txt
index e5ee920..e5ee920 100644
--- a/signed.txt
+++ b/drduh/signed.txt
diff --git a/yubikey-installer.nix b/drduh/yubikey-installer.nix
index 7c8a428..7c8a428 100644
--- a/yubikey-installer.nix
+++ b/drduh/yubikey-installer.nix
diff --git a/flake.lock b/flake.lock
index 0b63960..6346544 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,22 +20,6 @@
         "type": "github"
       }
     },
-    "mvinkio": {
-      "locked": {
-        "lastModified": 1669579238,
-        "narHash": "sha256-Kk48N1r48jAj6iiCiXgwcv9cXasTDY8hgrsRaPrXicw=",
-        "owner": "mvinkio",
-        "repo": "nixpkgs",
-        "rev": "007f4f91390d742aff1e605d057283e486f12a3b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mvinkio",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1695644571,
@@ -54,22 +38,6 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1685573264,
-        "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "380be19fbd2d9079f677978361792cb25e8a3635",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-22.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-stable_2": {
-      "locked": {
         "lastModified": 1694908564,
         "narHash": "sha256-ducA98AuWWJu5oUElIzN24Q22WlO8bOfixGzBgzYdVc=",
         "owner": "NixOS",
@@ -103,16 +71,14 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
-        "mvinkio": "mvinkio",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-stable": "nixpkgs-stable",
         "sops-nix": "sops-nix"
       }
     },
     "sops-nix": {
       "inputs": {
         "nixpkgs": "nixpkgs_2",
-        "nixpkgs-stable": "nixpkgs-stable_2"
+        "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
         "lastModified": 1695284550,
diff --git a/flake.nix b/flake.nix
index a304694..d80f804 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,8 +3,6 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    mvinkio.url = "github:mvinkio/nixpkgs/nixpkgs-unstable";
-    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-22.05";
     sops-nix.url = "github:Mic92/sops-nix";
     home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; };
   };
@@ -12,51 +10,36 @@
   outputs = inputs@{
     self,
     nixpkgs,
-    mvinkio,
-    nixpkgs-stable,
     home-manager,
     sops-nix,
     ...
   }: let
-    home = builtins.getEnv "HOME";
-    username = builtins.getEnv "USER";
-    email = builtins.getEnv "EMAIL";
     system = "x86_64-linux";
-    mvinkioPkgs = mvinkio.legacyPackages.${system};
-
     overlay = nixpkgs.lib.composeManyExtensions [
       (import ./overlays/vimPlugins.nix {inherit pkgs;})
-      (import ./overlays/suckless.nix {inherit pkgs home;})
+      (import ./overlays/suckless.nix {inherit pkgs;})
     ];
-
     pkgs = import nixpkgs {
       overlays = [
         overlay
       ];
       inherit system;
     };
-
     lib = (nixpkgs.lib.extend (_: _: home-manager.lib)).extend (import ./lib);
-
   in with lib; {
     inherit lib;
 
     nixosConfigurations.lemptop = nixpkgs.lib.nixosSystem {
       inherit system;
-      modules = [./configuration.nix ./lemptop.nix sops-nix.nixosModules.sops];
-    };
-
-    homeConfigurations.mike = home-manager.lib.homeManagerConfiguration {
-      inherit pkgs;
-      modules =
-        (attrValues
-          (attrsets.mergeAttrsList [
-            (modulesIn ./home)
-            (modulesIn ./email)
-          ])) ++ [./home.nix];
-      extraSpecialArgs = {
-        inherit inputs username email;
-      };
+      modules = [
+        ./nixos/configuration.nix
+        ./nixos/lemptop.nix
+      ] ++ (attrValues
+        (attrsets.mergeAttrsList [
+          (modulesIn ./profiles/core)
+          (modulesIn ./profiles/station)
+          (modulesIn ./profiles/email)
+        ]));
     };
 
     templates = {
diff --git a/home/dwm b/home/dwm
deleted file mode 160000
-Subproject 8aba66977b5f5234e252ce0df0ebc8f205cad20
diff --git a/home/dwmblocks b/home/dwmblocks
deleted file mode 160000
-Subproject a933ce0d6109524b393feb3e7156cbf0de88b42
diff --git a/home/st b/home/st
deleted file mode 160000
-Subproject e03a7d3f0b6bf4028389a82d372d0f89a922b9d
diff --git a/lib/default.nix b/lib/default.nix
index 56348bb..196b76b 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -12,4 +12,8 @@ lib: prev: with lib; {
     concatLists
     listToAttrs
   ];
+
+  # Collects the inputs of a flake recursively (with possible duplicates).
+  collectFlakeInputs = input:
+    [ input ] ++ concatMap collectFlakeInputs (builtins.attrValues (input.inputs or {}));
 }
diff --git a/lemptop.nix b/machines/lemptop.nix
index 83bc2c9..83bc2c9 100644
--- a/lemptop.nix
+++ b/machines/lemptop.nix
diff --git a/shell-scripts/checkout b/mut/bin/checkout
index 95f28c8..95f28c8 100644
--- a/shell-scripts/checkout
+++ b/mut/bin/checkout
diff --git a/shell-scripts/compile b/mut/bin/compile
index 04c0586..04c0586 100755
--- a/shell-scripts/compile
+++ b/mut/bin/compile
diff --git a/shell-scripts/filter-ansi b/mut/bin/filter-ansi
index 369f9fd..369f9fd 100755
--- a/shell-scripts/filter-ansi
+++ b/mut/bin/filter-ansi
diff --git a/shell-scripts/get-sshables b/mut/bin/get-sshables
index f67c23c..f67c23c 100755
--- a/shell-scripts/get-sshables
+++ b/mut/bin/get-sshables
diff --git a/shell-scripts/kakup b/mut/bin/kakup
index af1a520..af1a520 100755
--- a/shell-scripts/kakup
+++ b/mut/bin/kakup
diff --git a/shell-scripts/kubeconfig-merge b/mut/bin/kubeconfig-merge
index 73d3ac1..73d3ac1 100644
--- a/shell-scripts/kubeconfig-merge
+++ b/mut/bin/kubeconfig-merge
diff --git a/shell-scripts/lfub b/mut/bin/lfub
index 9012f50..9012f50 100644
--- a/shell-scripts/lfub
+++ b/mut/bin/lfub
diff --git a/shell-scripts/linkhandler b/mut/bin/linkhandler
index f62b581..f62b581 100755
--- a/shell-scripts/linkhandler
+++ b/mut/bin/linkhandler
diff --git a/shell-scripts/mailsync b/mut/bin/mailsync
index 426e5b7..426e5b7 100644
--- a/shell-scripts/mailsync
+++ b/mut/bin/mailsync
diff --git a/shell-scripts/maimpick b/mut/bin/maimpick
index 5de26c1..5de26c1 100644
--- a/shell-scripts/maimpick
+++ b/mut/bin/maimpick
diff --git a/shell-scripts/news b/mut/bin/news
index 097582b..097582b 100755
--- a/shell-scripts/news
+++ b/mut/bin/news
diff --git a/shell-scripts/nixup b/mut/bin/nixup
index afbe4b1..afbe4b1 100755
--- a/shell-scripts/nixup
+++ b/mut/bin/nixup
diff --git a/shell-scripts/notmuch-hook b/mut/bin/notmuch-hook
index da376b6..da376b6 100644
--- a/shell-scripts/notmuch-hook
+++ b/mut/bin/notmuch-hook
diff --git a/shell-scripts/openfile b/mut/bin/openfile
index 0f60b10..0f60b10 100644
--- a/shell-scripts/openfile
+++ b/mut/bin/openfile
diff --git a/shell-scripts/pass-ansible-vault-client b/mut/bin/pass-ansible-vault-client
index 8b8d026..8b8d026 100755
--- a/shell-scripts/pass-ansible-vault-client
+++ b/mut/bin/pass-ansible-vault-client
diff --git a/shell-scripts/sb-battery b/mut/bin/sb-battery
index aeb7413..aeb7413 100644
--- a/shell-scripts/sb-battery
+++ b/mut/bin/sb-battery
diff --git a/shell-scripts/sb-clock b/mut/bin/sb-clock
index ba9e43d..ba9e43d 100644
--- a/shell-scripts/sb-clock
+++ b/mut/bin/sb-clock
diff --git a/shell-scripts/sb-internet b/mut/bin/sb-internet
index 225d376..225d376 100644
--- a/shell-scripts/sb-internet
+++ b/mut/bin/sb-internet
diff --git a/shell-scripts/sb-mailbox b/mut/bin/sb-mailbox
index ab1669e..ab1669e 100644
--- a/shell-scripts/sb-mailbox
+++ b/mut/bin/sb-mailbox
diff --git a/shell-scripts/sb-nettraf b/mut/bin/sb-nettraf
index 06b3c49..06b3c49 100644
--- a/shell-scripts/sb-nettraf
+++ b/mut/bin/sb-nettraf
diff --git a/shell-scripts/sb-news b/mut/bin/sb-news
index a155c0a..a155c0a 100644
--- a/shell-scripts/sb-news
+++ b/mut/bin/sb-news
diff --git a/shell-scripts/set-bg b/mut/bin/set-bg
index bede726..bede726 100644
--- a/shell-scripts/set-bg
+++ b/mut/bin/set-bg
diff --git a/shell-scripts/spectrwmbar b/mut/bin/spectrwmbar
index a106b01..a106b01 100644
--- a/shell-scripts/spectrwmbar
+++ b/mut/bin/spectrwmbar
diff --git a/shell-scripts/sysact b/mut/bin/sysact
index 4bb92dc..4bb92dc 100755
--- a/shell-scripts/sysact
+++ b/mut/bin/sysact
diff --git a/shell-scripts/terragrunt b/mut/bin/terragrunt
index 38918e8..38918e8 100755
--- a/shell-scripts/terragrunt
+++ b/mut/bin/terragrunt
diff --git a/shell-scripts/tmux-normal-mode b/mut/bin/tmux-normal-mode
index 5730017..5730017 100644
--- a/shell-scripts/tmux-normal-mode
+++ b/mut/bin/tmux-normal-mode
diff --git a/shell-scripts/transadd b/mut/bin/transadd
index a598fad..a598fad 100644
--- a/shell-scripts/transadd
+++ b/mut/bin/transadd
diff --git a/emacs/init.el b/mut/emacs/init.el
index 0d4f33d..b31b0f0 100644
--- a/emacs/init.el
+++ b/mut/emacs/init.el
@@ -39,16 +39,16 @@
 
 (defun rc/get-default-font ()
   (cond
-   ((eq system-type 'windows-nt) "Consolas-13")))
+   ((eq system-type 'windows-nt) "Consolas-13")
+   (t "mono-13")))
 (add-to-list 'default-frame-alist `(font . ,(rc/get-default-font)))
 (rc/require 'ansi-color)
 
-(rc/require 'ido)
-(rc/require 'ido-completing-read+)
-(rc/require 'smex)
+(rc/require 'ido 'ido-completing-read+ 'smex 'corfu)
 (ido-mode t)
 (ido-everywhere t)
 (ido-ubiquitous-mode t)
+(global-corfu-mode)
 
 (global-set-key (kbd "M-x") 'smex)
 (global-set-key (kbd "M-X") 'smex-major-mode-commands)
@@ -129,12 +129,39 @@
 (setq TeX-parse-self t)
 (setq-default TeX-master nil)
 
+(setq completion-auto-select 'second-tab)
+(setq completions-format 'one-column)
+(setq completions-max-height 20)
+(define-key completion-in-region-mode-map (kbd "M-p") #'minibuffer-previous-completion)
+(define-key completion-in-region-mode-map (kbd "M-n") #'minibuffer-next-completion)
+;; (rc/require 'consult 'vertico 'orderless)
+;; (setq completion-in-region-function #'completion--)
+
+
 (rc/require
  'nix-mode
+ 'go-mode
  'auctex
  'yaml-pro
+ 'rust-mode
  )
 
+(require 'lsp-mode)
+(add-hook 'rust-mode-hook #'lsp-deferred)
+(add-hook 'go-mode-hook #'lsp-deferred)
+(defun lsp-go-install-save-hooks ()
+  (add-hook 'before-save-hook #'lsp-format-buffer t t)
+  (add-hook 'before-save-hook #'lsp-organize-imports t t))
+(add-hook 'go-mode-hook #'lsp-go-install-save-hooks)
+(lsp-register-custom-settings
+ '(("gopls.hints.assignVariableTypes" t t)
+   ("gopls.hints.compositeLiteralFields" t t)
+   ("gopls.hints.compositeLiteralTypes" t t)
+   ("gopls.hints.constantValues" t t)
+   ("gopls.hints.functionTypeParameters" t t)
+   ("gopls.hints.parameterNames" t t)
+   ("gopls.hints.rangeVariableTypes" t t)))
+
 (rc/require-theme 'gruber-darker)
 (custom-set-variables
  ;; custom-set-variables was added by Custom.
@@ -143,9 +170,9 @@
  ;; If there is more than one, they won't work right.
  '(custom-enabled-themes '(gruber-darker))
  '(custom-safe-themes
-   '("e13beeb34b932f309fb2c360a04a460821ca99fe58f69e65557d6c1b10ba18c7" default))
+   '("ba4ab079778624e2eadbdc5d9345e6ada531dc3febeb24d257e6d31d5ed02577" "a9dc7790550dcdb88a23d9f81cc0333490529a20e160a8599a6ceaf1104192b5" "5f128efd37c6a87cd4ad8e8b7f2afaba425425524a68133ac0efd87291d05874" "5b9a45080feaedc7820894ebbfe4f8251e13b66654ac4394cb416fef9fdca789" "9013233028d9798f901e5e8efb31841c24c12444d3b6e92580080505d56fd392" "6adeb971e4d5fe32bee0d5b1302bc0dfd70d4b42bad61e1c346599a6dc9569b5" "8d3ef5ff6273f2a552152c7febc40eabca26bae05bd12bc85062e2dc224cde9a" "75b2a02e1e0313742f548d43003fcdc45106553af7283fb5fad74359e07fe0e2" "b9761a2e568bee658e0ff723dd620d844172943eb5ec4053e2b199c59e0bcc22" "9d29a302302cce971d988eb51bd17c1d2be6cd68305710446f658958c0640f68" "f053f92735d6d238461da8512b9c071a5ce3b9d972501f7a5e6682a90bf29725" "dc8285f7f4d86c0aebf1ea4b448842a6868553eded6f71d1de52f3dcbc960039" "38c0c668d8ac3841cb9608522ca116067177c92feeabc6f002a27249976d7434" "162201cf5b5899938cfaec99c8cb35a2f1bf0775fc9ccbf5e63130a1ea217213" "ff24d14f5f7d355f47d53fd016565ed128bf3af30eb7ce8cae307ee4fe7f3fd0" "da75eceab6bea9298e04ce5b4b07349f8c02da305734f7c0c8c6af7b5eaa9738" "e3daa8f18440301f3e54f2093fe15f4fe951986a8628e98dcd781efbec7a46f2" "631c52620e2953e744f2b56d102eae503017047fb43d65ce028e88ef5846ea3b" "88f7ee5594021c60a4a6a1c275614103de8c1435d6d08cc58882f920e0cec65e" "dfb1c8b5bfa040b042b4ef660d0aab48ef2e89ee719a1f24a4629a0c5ed769e8" "e13beeb34b932f309fb2c360a04a460821ca99fe58f69e65557d6c1b10ba18c7" default))
  '(package-selected-packages
-   '(go-mode auctex yaml-pro paredit nix-mode direnv gruber-darker-theme magit multiple-cursors ido-completing-read+ editorconfig smex)))
+   '(doom-themes corfu yaml-pro smex rust-mode nix-mode multiple-cursors magit lsp-ui ido-completing-read+ gruber-darker-theme go-mode editorconfig direnv dash-functional auctex)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/neovim/README.md b/mut/neovim/README.md
index 3a441bd..3a441bd 100644
--- a/neovim/README.md
+++ b/mut/neovim/README.md
diff --git a/neovim/compiler/ansible-lint.vim b/mut/neovim/compiler/ansible-lint.vim
index 9427092..9427092 100644
--- a/neovim/compiler/ansible-lint.vim
+++ b/mut/neovim/compiler/ansible-lint.vim
diff --git a/neovim/compiler/go-test.vim b/mut/neovim/compiler/go-test.vim
index 61442e5..61442e5 100644
--- a/neovim/compiler/go-test.vim
+++ b/mut/neovim/compiler/go-test.vim
diff --git a/neovim/compiler/helm.vim b/mut/neovim/compiler/helm.vim
index 7e4b21d..7e4b21d 100644
--- a/neovim/compiler/helm.vim
+++ b/mut/neovim/compiler/helm.vim
diff --git a/neovim/compiler/racket.vim b/mut/neovim/compiler/racket.vim
index 1f98a41..1f98a41 100644
--- a/neovim/compiler/racket.vim
+++ b/mut/neovim/compiler/racket.vim
diff --git a/neovim/compiler/terragrunt.vim b/mut/neovim/compiler/terragrunt.vim
index 54f94ef..54f94ef 100644
--- a/neovim/compiler/terragrunt.vim
+++ b/mut/neovim/compiler/terragrunt.vim
diff --git a/neovim/debug b/mut/neovim/debug
index 6319340..6319340 100644
--- a/neovim/debug
+++ b/mut/neovim/debug
diff --git a/neovim/fnl/conf/diagnostic.fnl b/mut/neovim/fnl/conf/diagnostic.fnl
index 7ef1dd3..7ef1dd3 100644
--- a/neovim/fnl/conf/diagnostic.fnl
+++ b/mut/neovim/fnl/conf/diagnostic.fnl
diff --git a/neovim/fnl/conf/events.fnl b/mut/neovim/fnl/conf/events.fnl
index 00d75d4..00d75d4 100644
--- a/neovim/fnl/conf/events.fnl
+++ b/mut/neovim/fnl/conf/events.fnl
diff --git a/neovim/fnl/conf/filetype.fnl b/mut/neovim/fnl/conf/filetype.fnl
index 29f64b0..29f64b0 100644
--- a/neovim/fnl/conf/filetype.fnl
+++ b/mut/neovim/fnl/conf/filetype.fnl
diff --git a/neovim/fnl/conf/init.fnl b/mut/neovim/fnl/conf/init.fnl
index 90bc20c..90bc20c 100644
--- a/neovim/fnl/conf/init.fnl
+++ b/mut/neovim/fnl/conf/init.fnl
diff --git a/neovim/fnl/conf/lsp.fnl b/mut/neovim/fnl/conf/lsp.fnl
index 35fa34f..35fa34f 100644
--- a/neovim/fnl/conf/lsp.fnl
+++ b/mut/neovim/fnl/conf/lsp.fnl
diff --git a/neovim/fnl/conf/macros.fnl b/mut/neovim/fnl/conf/macros.fnl
index 9ce8b26..9ce8b26 100644
--- a/neovim/fnl/conf/macros.fnl
+++ b/mut/neovim/fnl/conf/macros.fnl
diff --git a/neovim/fnl/conf/newtab/init.fnl b/mut/neovim/fnl/conf/newtab/init.fnl
index fbf8e18..fbf8e18 100644
--- a/neovim/fnl/conf/newtab/init.fnl
+++ b/mut/neovim/fnl/conf/newtab/init.fnl
diff --git a/neovim/fnl/conf/nix-develop/init.fnl b/mut/neovim/fnl/conf/nix-develop/init.fnl
index 0983e06..0983e06 100644
--- a/neovim/fnl/conf/nix-develop/init.fnl
+++ b/mut/neovim/fnl/conf/nix-develop/init.fnl
diff --git a/neovim/fnl/conf/pkgs.fnl b/mut/neovim/fnl/conf/pkgs.fnl
index 1445454..1445454 100644
--- a/neovim/fnl/conf/pkgs.fnl
+++ b/mut/neovim/fnl/conf/pkgs.fnl
diff --git a/neovim/fnl/conf/pkgs/cmp.fnl b/mut/neovim/fnl/conf/pkgs/cmp.fnl
index 76319f4..76319f4 100644
--- a/neovim/fnl/conf/pkgs/cmp.fnl
+++ b/mut/neovim/fnl/conf/pkgs/cmp.fnl
diff --git a/neovim/fnl/conf/pkgs/conjure.fnl b/mut/neovim/fnl/conf/pkgs/conjure.fnl
index c07a6f4..c07a6f4 100644
--- a/neovim/fnl/conf/pkgs/conjure.fnl
+++ b/mut/neovim/fnl/conf/pkgs/conjure.fnl
diff --git a/neovim/fnl/conf/pkgs/dap.fnl b/mut/neovim/fnl/conf/pkgs/dap.fnl
index 6476d3e..6476d3e 100644
--- a/neovim/fnl/conf/pkgs/dap.fnl
+++ b/mut/neovim/fnl/conf/pkgs/dap.fnl
diff --git a/neovim/fnl/conf/pkgs/gitsigns.fnl b/mut/neovim/fnl/conf/pkgs/gitsigns.fnl
index 813d410..813d410 100644
--- a/neovim/fnl/conf/pkgs/gitsigns.fnl
+++ b/mut/neovim/fnl/conf/pkgs/gitsigns.fnl
diff --git a/neovim/fnl/conf/pkgs/harpoon.fnl b/mut/neovim/fnl/conf/pkgs/harpoon.fnl
index 3f5fc48..3f5fc48 100644
--- a/neovim/fnl/conf/pkgs/harpoon.fnl
+++ b/mut/neovim/fnl/conf/pkgs/harpoon.fnl
diff --git a/neovim/fnl/conf/pkgs/heirline.fnl b/mut/neovim/fnl/conf/pkgs/heirline.fnl
index c8d9c52..c8d9c52 100644
--- a/neovim/fnl/conf/pkgs/heirline.fnl
+++ b/mut/neovim/fnl/conf/pkgs/heirline.fnl
diff --git a/neovim/fnl/conf/pkgs/lsp_lines.fnl b/mut/neovim/fnl/conf/pkgs/lsp_lines.fnl
index 7194bd9..7194bd9 100644
--- a/neovim/fnl/conf/pkgs/lsp_lines.fnl
+++ b/mut/neovim/fnl/conf/pkgs/lsp_lines.fnl
diff --git a/neovim/fnl/conf/pkgs/lsp_signature.fnl b/mut/neovim/fnl/conf/pkgs/lsp_signature.fnl
index 7fecc9e..7fecc9e 100644
--- a/neovim/fnl/conf/pkgs/lsp_signature.fnl
+++ b/mut/neovim/fnl/conf/pkgs/lsp_signature.fnl
diff --git a/neovim/fnl/conf/pkgs/lspconfig.fnl b/mut/neovim/fnl/conf/pkgs/lspconfig.fnl
index accd001..accd001 100644
--- a/neovim/fnl/conf/pkgs/lspconfig.fnl
+++ b/mut/neovim/fnl/conf/pkgs/lspconfig.fnl
diff --git a/neovim/fnl/conf/pkgs/neotest.fnl b/mut/neovim/fnl/conf/pkgs/neotest.fnl
index 251cdcb..251cdcb 100644
--- a/neovim/fnl/conf/pkgs/neotest.fnl
+++ b/mut/neovim/fnl/conf/pkgs/neotest.fnl
diff --git a/neovim/fnl/conf/pkgs/noice.fnl b/mut/neovim/fnl/conf/pkgs/noice.fnl
index 58ac761..58ac761 100644
--- a/neovim/fnl/conf/pkgs/noice.fnl
+++ b/mut/neovim/fnl/conf/pkgs/noice.fnl
diff --git a/neovim/fnl/conf/pkgs/null-ls.fnl b/mut/neovim/fnl/conf/pkgs/null-ls.fnl
index 9908823..9908823 100644
--- a/neovim/fnl/conf/pkgs/null-ls.fnl
+++ b/mut/neovim/fnl/conf/pkgs/null-ls.fnl
diff --git a/neovim/fnl/conf/pkgs/test.fnl b/mut/neovim/fnl/conf/pkgs/test.fnl
index 4f0bcc4..4f0bcc4 100644
--- a/neovim/fnl/conf/pkgs/test.fnl
+++ b/mut/neovim/fnl/conf/pkgs/test.fnl
diff --git a/neovim/fnl/conf/pkgs/tree-sitter-context.fnl b/mut/neovim/fnl/conf/pkgs/tree-sitter-context.fnl
index 12fedc6..12fedc6 100644
--- a/neovim/fnl/conf/pkgs/tree-sitter-context.fnl
+++ b/mut/neovim/fnl/conf/pkgs/tree-sitter-context.fnl
diff --git a/neovim/fnl/conf/pkgs/treesitter.fnl b/mut/neovim/fnl/conf/pkgs/treesitter.fnl
index c613be0..c613be0 100644
--- a/neovim/fnl/conf/pkgs/treesitter.fnl
+++ b/mut/neovim/fnl/conf/pkgs/treesitter.fnl
diff --git a/neovim/fnl/conf/pkgs/venn.fnl b/mut/neovim/fnl/conf/pkgs/venn.fnl
index 064e84e..064e84e 100644
--- a/neovim/fnl/conf/pkgs/venn.fnl
+++ b/mut/neovim/fnl/conf/pkgs/venn.fnl
diff --git a/neovim/fnl/conf/settings.fnl b/mut/neovim/fnl/conf/settings.fnl
index ec68e6c..ec68e6c 100644
--- a/neovim/fnl/conf/settings.fnl
+++ b/mut/neovim/fnl/conf/settings.fnl
diff --git a/neovim/fnl/conf/wict-nvim/builder.fnl b/mut/neovim/fnl/conf/wict-nvim/builder.fnl
index 177b773..177b773 100644
--- a/neovim/fnl/conf/wict-nvim/builder.fnl
+++ b/mut/neovim/fnl/conf/wict-nvim/builder.fnl
diff --git a/neovim/fnl/conf/wict-nvim/effects.fnl b/mut/neovim/fnl/conf/wict-nvim/effects.fnl
index e4321da..e4321da 100644
--- a/neovim/fnl/conf/wict-nvim/effects.fnl
+++ b/mut/neovim/fnl/conf/wict-nvim/effects.fnl
diff --git a/neovim/fnl/conf/wict-nvim/frames/frame.fnl b/mut/neovim/fnl/conf/wict-nvim/frames/frame.fnl
index d32c9b5..d32c9b5 100644
--- a/neovim/fnl/conf/wict-nvim/frames/frame.fnl
+++ b/mut/neovim/fnl/conf/wict-nvim/frames/frame.fnl
diff --git a/neovim/fnl/conf/wict-nvim/frames/vec.fnl b/mut/neovim/fnl/conf/wict-nvim/frames/vec.fnl
index 4a9515d..4a9515d 100644
--- a/neovim/fnl/conf/wict-nvim/frames/vec.fnl
+++ b/mut/neovim/fnl/conf/wict-nvim/frames/vec.fnl
diff --git a/neovim/fnl/conf/wict-nvim/init.fnl b/mut/neovim/fnl/conf/wict-nvim/init.fnl
index 9e40fad..9e40fad 100644
--- a/neovim/fnl/conf/wict-nvim/init.fnl
+++ b/mut/neovim/fnl/conf/wict-nvim/init.fnl
diff --git a/neovim/fnl/conf/wictl-nvim/init.fnl b/mut/neovim/fnl/conf/wictl-nvim/init.fnl
index bd04182..bd04182 100644
--- a/neovim/fnl/conf/wictl-nvim/init.fnl
+++ b/mut/neovim/fnl/conf/wictl-nvim/init.fnl
diff --git a/neovim/fnl/conf/wictl-nvim/resolvers.fnl b/mut/neovim/fnl/conf/wictl-nvim/resolvers.fnl
index df5f2ac..df5f2ac 100644
--- a/neovim/fnl/conf/wictl-nvim/resolvers.fnl
+++ b/mut/neovim/fnl/conf/wictl-nvim/resolvers.fnl
diff --git a/neovim/fnl/conf/wictl-nvim/term.fnl b/mut/neovim/fnl/conf/wictl-nvim/term.fnl
index 51e263a..51e263a 100644
--- a/neovim/fnl/conf/wictl-nvim/term.fnl
+++ b/mut/neovim/fnl/conf/wictl-nvim/term.fnl
diff --git a/neovim/init.fnl b/mut/neovim/init.fnl
index 7e82675..7e82675 100644
--- a/neovim/init.fnl
+++ b/mut/neovim/init.fnl
diff --git a/neovim/init.lua b/mut/neovim/init.lua
index 3de4446..3de4446 100644
--- a/neovim/init.lua
+++ b/mut/neovim/init.lua
diff --git a/neovim/test.py b/mut/neovim/test.py
index e69de29..e69de29 100644
--- a/neovim/test.py
+++ b/mut/neovim/test.py
diff --git a/overlays/#vimPlugins.nix# b/overlays/#vimPlugins.nix#
deleted file mode 100644
index 7933c5a..0000000
--- a/overlays/#vimPlugins.nix#
+++ /dev/null
@@ -1,53 +0,0 @@
-{pkgs, ...}: (final: prev: {
-  vimPlugins = let
-    getVimPlugin = {
-      name,
-      git,
-      rev,
-      ref ? "master",
-    }:
-      pkgs.vimUtils.buildVimPluginFrom2Nix {
-        inherit name;
-        src = builtins.fetchGit {
-          url = "https://github.com/${git}";
-          submodules = true;
-          inherit rev;
-          inherit ref;
-        };
-      };
-  in
-    prev.vimPlugins
-    // {
-      neotest-python = getVimPlugin {
-        name = "neotest-python";
-        git = "nvim-neotest/neotest-python";
-        rev = "e53920d145d37783c8d8428365a0a230e0a18cb5";
-      };
-      firvish-nvim = getVimPlugin {
-        name = "firvish-nvim";
-        git = "Furkanzmc/firvish.nvim";
-        rev = "127f9146175d6bbaff6a8b761081cfd2279f8351";
-      };
-      nvim-parinfer = getVimPlugin {
-        name = "nvim-parinfer";
-        git = "gpanders/nvim-parinfer";
-        rev = "82bce5798993f4fe5ced20e74003b492490b4fe8";
-      };
-      vim-just = getVimPlugin {
-        name = "vim-just";
-        git = "NoahTheDuke/vim-just";
-        rev = "838c9096d4c5d64d1000a6442a358746324c2123";
-      };
-      vim-rest-console = getVimPlugin {
-        name = "vim-rest-console";
-        git = "diepm/vim-rest-console";
-        rev = "7b407f47185468d1b57a8bd71cdd66c9a99359b2";
-      };
-      codeium-vim = getVimPlugin {
-        name = "codeium-vim";
-        git = "Exafunction/codeium.vim";
-        rev = "be2fa21f4f63850382a0cefeaa9f766b977c9f0c";
-        ref = "refs/heads/main";
-      };
-    };
-})
diff --git a/overlays/.#vimPlugins.nix b/overlays/.#vimPlugins.nix
deleted file mode 120000
index 92794ea..0000000
--- a/overlays/.#vimPlugins.nix
+++ /dev/null
@@ -1 +0,0 @@
-mike@lemptop.166922:1691484931
\ No newline at end of file
diff --git a/overlays/vimPlugins.nix b/overlays/vimPlugins.nix
index 7933c5a..65235fa 100644
--- a/overlays/vimPlugins.nix
+++ b/overlays/vimPlugins.nix
@@ -1,3 +1,4 @@
+
 {pkgs, ...}: (final: prev: {
   vimPlugins = let
     getVimPlugin = {
diff --git a/configuration.nix b/profiles/core/configuration.nix
index e677306..e677306 100644
--- a/configuration.nix
+++ b/profiles/core/configuration.nix
diff --git a/profiles/core/hm.nix b/profiles/core/hm.nix
new file mode 100644
index 0000000..e1a29d6
--- /dev/null
+++ b/profiles/core/hm.nix
@@ -0,0 +1,24 @@
+{inputs, config, lib, ...}: {
+  imports = [
+    inputs.home-manager.nixosModules.default
+    (mkAliasOptionModule [ "hm" ] [ "home-manager" "users" my.username ])
+  ];
+
+  system.extraDependencies = collectFlakeInputs inputs.home-manager;
+
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    verbose = true;
+    extraSpecialArgs = { inherit inputs; };
+  };
+
+  hm = {
+    home.stateVersion = config.system.stateVersion;
+    home.enableNixpkgsReleaseCheck = false;
+
+    systemd.user.startServices = "sd-switch";
+
+    manual.html.enable = true;
+  };
+}
diff --git a/home.nix b/profiles/core/home.nix
index 7b3b97c..5d57f76 100644
--- a/home.nix
+++ b/profiles/core/home.nix
@@ -1,7 +1,5 @@
 {
-  flake,
-  username,
-  email,
+  inputs,
   config,
   pkgs,
   ...
@@ -93,7 +91,8 @@
   };
 
   programs.emacs = {
-      enable = true;
+    enable = true;
+    package = pkgs.emacs29;
   };
 
   programs.tmux = {
diff --git a/email/gmail.nix b/profiles/email/gmail.nix
index 760532b..fa5d44e 100644
--- a/email/gmail.nix
+++ b/profiles/email/gmail.nix
@@ -86,7 +86,7 @@
           enable = true;
           create = "both"; remove = "both"; expunge = "both";
           groups = {
-            gmail = {
+            family = {
                 channels = {
                     Inbox = { farPattern = "INBOX"; nearPattern = "INBOX"; extraConfig = { Create = "Near"; Expunge = "Both"; }; };
                     Archive = { farPattern = "[Gmail]/All Mail"; nearPattern = "Archive"; extraConfig = { Create = "Near"; Expunge = "Both"; }; };
diff --git a/email/mailsync.nix b/profiles/email/mailsync.nix
index 3fcb0c5..3fcb0c5 100644
--- a/email/mailsync.nix
+++ b/profiles/email/mailsync.nix
diff --git a/email/neomutt.nix b/profiles/email/neomutt.nix
index 384173f..384173f 100644
--- a/email/neomutt.nix
+++ b/profiles/email/neomutt.nix
diff --git a/email/notmuch.nix b/profiles/email/notmuch.nix
index 3b182c7..3b182c7 100644
--- a/email/notmuch.nix
+++ b/profiles/email/notmuch.nix
diff --git a/modules/nix.nix b/profiles/nix.nix
index 0967ef4..0967ef4 100644
--- a/modules/nix.nix
+++ b/profiles/nix.nix
diff --git a/home/codeium.nix b/profiles/station/codeium.nix
index f3841b3..f3841b3 100644
--- a/home/codeium.nix
+++ b/profiles/station/codeium.nix
diff --git a/home/kak-lsp.toml b/profiles/station/kak-lsp.toml
index b0592cf..b0592cf 100644
--- a/home/kak-lsp.toml
+++ b/profiles/station/kak-lsp.toml
diff --git a/home/kakoune.nix b/profiles/station/kakoune.nix
index 41caf9f..41caf9f 100644
--- a/home/kakoune.nix
+++ b/profiles/station/kakoune.nix
diff --git a/home/meta.nix b/profiles/station/meta.nix
index e6f3a78..e6f3a78 100644
--- a/home/meta.nix
+++ b/profiles/station/meta.nix
diff --git a/home/mpv.nix b/profiles/station/mpv.nix
index 1b673ab..1b673ab 100644
--- a/home/mpv.nix
+++ b/profiles/station/mpv.nix
diff --git a/home/neovim.nix b/profiles/station/neovim.nix
index 8957c89..8957c89 100644
--- a/home/neovim.nix
+++ b/profiles/station/neovim.nix
diff --git a/home/newsboat.nix b/profiles/station/newsboat.nix
index fc47060..fc47060 100644
--- a/home/newsboat.nix
+++ b/profiles/station/newsboat.nix
diff --git a/home/packages.nix b/profiles/station/packages.nix
index 02c5b8e..02c5b8e 100644
--- a/home/packages.nix
+++ b/profiles/station/packages.nix
diff --git a/home/suckless.nix b/profiles/station/suckless.nix
index d10414d..d10414d 100644
--- a/home/suckless.nix
+++ b/profiles/station/suckless.nix
diff --git a/home/zathura.nix b/profiles/station/zathura.nix
index 198f039..198f039 100644
--- a/home/zathura.nix
+++ b/profiles/station/zathura.nix
diff --git a/shell-scripts.nix b/shell-scripts.nix
deleted file mode 100644
index 3b849e0..0000000
--- a/shell-scripts.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}:
-with builtins; let
-  script-names = attrNames (readDir ./shell-scripts);
-  package = (
-    filename:
-      with pkgs; let
-      in
-        stdenv.mkDerivation {
-          name = filename;
-
-          buildCommand = ''
-            install -Dm755 $script $out/bin/${filename}
-          '';
-
-          script = substituteAll {
-            src = ./shell-scripts/${filename};
-            isExecutable = true;
-            inherit bash;
-            home = config.home.homeDirectory;
-          };
-        }
-  );
-  packages = map package script-names;
-in
-  packages