remove dead code with deadnix

move nixos and darwin back into modules dir
switch from uuid to label disks
2025-07-06 22:30:13 +00:00 · 2023-02-20 20:45:56 -05:00 · 2023-02-20 20:37:37 -05:00 · 2023-02-20 20:30:45 -05:00 · 2023-02-20 20:26:14 -05:00 · 2023-02-20 20:13:52 -05:00
231 changed files with 4175 additions and 2181 deletions
--- a/.gitignore
+++ b/.gitignore
@ -4,3 +4,6 @@
 **/.direnv/**
 result
 .luarc.json
+private/**
+!private/**.age
+!private/**.sha512
--- a/modules/neovim/.stylua.toml
+++ b/modules/neovim/.stylua.toml
--- a/README.md
+++ b/README.md
@ -1,3 +1,5 @@
+# System Configurations
+
 This repository contains configuration files for my NixOS, macOS, and WSL
 hosts.

@ -6,15 +8,31 @@ configuration may be difficult to translate to a non-Nix system.

 However, some of the configurations are easier to lift directly:

- [Neovim](https://github.com/nmasur/dotfiles/tree/master/modules/neovim/lua)
- [Fish functions](https://github.com/nmasur/dotfiles/tree/master/modules/shell/fish/functions)
- [More fish aliases](https://github.com/nmasur/dotfiles/blob/master/modules/shell/fish/default.nix)
- [Git aliases](https://github.com/nmasur/dotfiles/blob/master/modules/shell/git.nix)
+- [Neovim](https://github.com/nmasur/dotfiles/tree/master/modules/common/neovim/config)
+- [Fish functions](https://github.com/nmasur/dotfiles/tree/master/modules/common/shell/fish/functions)
+- [More fish aliases](https://github.com/nmasur/dotfiles/blob/master/modules/common/shell/fish/default.nix)
+- [Git aliases](https://github.com/nmasur/dotfiles/blob/master/modules/common/shell/git.nix)
 - [Hammerspoon](https://github.com/nmasur/dotfiles/tree/master/modules/darwin/hammerspoon)

+Try out my Neovim config (requires [nix](https://nixos.org/download.html)):
+
+```bash
+nix run github:nmasur/dotfiles#neovim
+```
+
+Or build it as a package (requires [nix](https://nixos.org/download.html)):
+
+```bash
+nix build github:nmasur/dotfiles#neovim
+```
+
+If you already have a Neovim configuration, you may need to move it out of
+`~/.config/nvim` or set `XDG_CONFIG_HOME` to another value; otherwise both
+configs might conflict with each other.
+
 ---

-# Installation
+# Full Installation

 ## NixOS - From Live Disk

@ -26,7 +44,7 @@ installer disk:
 ```bash
 lsblk # Choose the disk you want to wipe
 nix-shell -p nixVersions.stable
-nix run github:nmasur/dotfiles#installer -- nvme0n1 desktop
+nix run github:nmasur/dotfiles#installer -- nvme0n1 tempest
 ```

 ## NixOS - From Existing System
@ -36,7 +54,7 @@ following command:

 ```bash
 nix-shell -p nixVersions.stable
-sudo nixos-rebuild switch --flake github:nmasur/dotfiles#desktop
+sudo nixos-rebuild switch --flake github:nmasur/dotfiles#tempest
 ```

 ## Windows - From NixOS WSL
@ -47,7 +65,7 @@ the WSL configuration:

 ```
 nix-shell -p nixVersions.stable
-sudo nixos-rebuild switch --flake github:nmasur/dotfiles#wsl
+sudo nixos-rebuild switch --flake github:nmasur/dotfiles#hydra
 ```

 You should also download the
@ -74,25 +92,9 @@ nix-build https://github.com/LnL7/nix-darwin/archive/master.tar.gz -A installer
 Then switch to the macOS configuration:

 ```bash
-darwin-rebuild switch --flake github:nmasur/dotfiles#macbook
+darwin-rebuild switch --flake github:nmasur/dotfiles#lookingglass
 ```

-### Dealing with corporate MITM SSL certificates:
-
-```bash
-# Get the certificates
-openssl s_client -showcerts -verify 5 -connect cache.nixos.org:443 < /dev/null
-
-# Paste them in here
-sudo nvim $NIX_SSL_CERT_FILE
-```
-
-### Dealing with Neovim issues:
-
-Update Neovim Packer plugins: `:PackerSync`
-
-Update TreeSitter languages: `:TSUpdateSync`
-
 ---

 # Flake Templates
--- a/apps/default.nix
+++ b/apps/default.nix
@ -0,0 +1,70 @@
+{ pkgs, ... }: rec {
+
+  default = {
+    type = "app";
+    program = builtins.toString (pkgs.writeShellScript "default" ''
+      ${pkgs.gum}/bin/gum style --margin "1 2" --padding "0 2" --foreground "15" --background "55" "Options"
+      ${pkgs.gum}/bin/gum format --type=template -- '  {{ Italic "Run with" }} {{ Color "15" "69" " nix run github:nmasur/dotfiles#" }}{{ Color "15" "62" "someoption" }}{{ Color "15" "69" " " }}.'
+      echo ""
+      echo ""
+      ${pkgs.gum}/bin/gum format --type=template -- \
+          '  • {{ Color "15" "57" " readme " }} {{ Italic "Documentation for this repository." }}' \
+          '  • {{ Color "15" "57" " rebuild " }} {{ Italic "Switch to this configuration." }}' \
+          '  • {{ Color "15" "57" " installer " }} {{ Italic "Format and install from nothing." }}' \
+          '  • {{ Color "15" "57" " neovim " }} {{ Italic "Test out the Neovim package." }}' \
+          '  • {{ Color "15" "57" " loadkey " }} {{ Italic "Load an ssh key for this machine using melt." }}' \
+          '  • {{ Color "15" "57" " encrypt-secret " }} {{ Italic "Encrypt a secret for all machines." }}' \
+          '  • {{ Color "15" "57" " reencrypt-secrets " }} {{ Italic "Reencrypt all secrets when new machine is added." }}' \
+          '  • {{ Color "15" "57" " netdata " }} {{ Italic "Connect a machine to Netdata cloud." }}'
+      echo ""
+      echo ""
+    '');
+  };
+
+  # Format and install from nothing
+  installer = import ./installer.nix { inherit pkgs; };
+
+  # Display the readme for this repository
+  readme = import ./readme.nix { inherit pkgs; };
+
+  # Rebuild
+  rebuild = {
+    type = "app";
+    program = builtins.toString (pkgs.writeShellScript "rebuild" ''
+      echo ${pkgs.system}
+      SYSTEM=${if pkgs.stdenv.isDarwin then "darwin" else "linux"}
+      if [ "$SYSTEM" == "darwin" ]; then
+          darwin-rebuild switch --flake github:nmasur/dotfiles#lookingglass
+      else
+          nixos-rebuild switch --flake github:nmasur/dotfiles
+      fi
+    '');
+  };
+
+  # Load the SSH key for this machine
+  loadkey = import ./loadkey.nix { inherit pkgs; };
+
+  # Encrypt secret for all machines
+  encrypt-secret = import ./encrypt-secret.nix { inherit pkgs; };
+
+  # Re-encrypt secrets for all machines
+  reencrypt-secrets = import ./reencrypt-secrets.nix { inherit pkgs; };
+
+  # Connect machine metrics to Netdata Cloud
+  netdata = import ./netdata-cloud.nix { inherit pkgs; };
+
+  # Run neovim as an app
+  neovim = {
+    type = "app";
+    program = "${
+        (import ../modules/common/neovim/package {
+          inherit pkgs;
+          colors =
+            import ../colorscheme/gruvbox/neovim-gruvbox.nix { inherit pkgs; };
+        })
+      }/bin/nvim";
+  };
+
+  nvim = neovim;
+
+}
--- a/apps/encrypt-secret.nix
+++ b/apps/encrypt-secret.nix
@ -11,7 +11,7 @@
    tmpfile=$(mktemp)
    echo "''${secret}" > ''${tmpfile}
    ${pkgs.age}/bin/age --encrypt --armor --recipients-file ${
-      builtins.toString ../hosts/public-keys
+      builtins.toString ../public-keys
    } $tmpfile
    rm $tmpfile
  '');
--- a/apps/readme.nix
+++ b/apps/readme.nix
@ -3,7 +3,7 @@
  type = "app";

  program = builtins.toString (pkgs.writeShellScript "readme" ''
-    ${pkgs.glow}/bin/glow ${builtins.toString ../README.md}
+    ${pkgs.glow}/bin/glow --pager ${builtins.toString ../README.md}
  '');

 }
--- a/apps/reencrypt-secrets.nix
+++ b/apps/reencrypt-secrets.nix
@ -17,7 +17,7 @@
        --identity ~/.ssh/id_ed25519 $encryptedfile > $tmpfile
      echo "Encrypting ''${encryptedfile}..."
      ${pkgs.age}/bin/age --encrypt --armor --recipients-file ${
-        builtins.toString ../hosts/public-keys
+        builtins.toString ../public-keys
      } $tmpfile > $encryptedfile
      rm $tmpfile
    done
--- a/modules/colorscheme/everforest/default.nix
+++ b/modules/colorscheme/everforest/default.nix
--- a/colorscheme/gruvbox/default.nix
+++ b/colorscheme/gruvbox/default.nix
@ -0,0 +1,45 @@
+{
+  name = "gruvbox"; # Dark, Medium
+  author =
+    "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)";
+  dark = {
+    base00 = "#282828"; # ----
+    base01 = "#3c3836"; # ---
+    base02 = "#504945"; # --
+    base03 = "#665c54"; # -
+    base04 = "#bdae93"; # +
+    base05 = "#d5c4a1"; # ++
+    base06 = "#ebdbb2"; # +++
+    base07 = "#fbf1c7"; # ++++
+    base08 = "#fb4934"; # red
+    base09 = "#fe8019"; # orange
+    base0A = "#fabd2f"; # yellow
+    base0B = "#b8bb26"; # green
+    base0C = "#8ec07c"; # aqua/cyan
+    base0D = "#83a598"; # blue
+    base0E = "#d3869b"; # purple
+    base0F = "#d65d0e"; # brown
+    neovimConfig = ./neovim-gruvbox.nix;
+    batTheme = "gruvbox-dark";
+  };
+  light = {
+    base00 = "#fbf1c7"; # ----
+    base01 = "#ebdbb2"; # ---
+    base02 = "#d5c4a1"; # --
+    base03 = "#bdae93"; # -
+    base04 = "#665c54"; # +
+    base05 = "#504945"; # ++
+    base06 = "#3c3836"; # +++
+    base07 = "#282828"; # ++++
+    base08 = "#9d0006"; # red
+    base09 = "#af3a03"; # orange
+    base0A = "#b57614"; # yellow
+    base0B = "#79740e"; # green
+    base0C = "#427b58"; # aqua/cyan
+    base0D = "#076678"; # blue
+    base0E = "#8f3f71"; # purple
+    base0F = "#d65d0e"; # brown
+    neovimConfig = ./neovim-gruvbox.nix;
+    batTheme = "gruvbox-light";
+  };
+}
--- a/colorscheme/gruvbox/neovim-gruvbox.nix
+++ b/colorscheme/gruvbox/neovim-gruvbox.nix
@ -0,0 +1,12 @@
+{ pkgs, ... }: {
+
+  plugins = [ pkgs.vimPlugins.vim-gruvbox8 ];
+
+  vim.g.gruvbox_italicize_strings = 0;
+  vim.o.background = "dark";
+  vimscript = ''
+    let g:gruvbox_italicize_strings = 0
+    colorscheme gruvbox8
+  '';
+
+}
--- a/modules/colorscheme/nord/default.nix
+++ b/modules/colorscheme/nord/default.nix
--- a/modules/colorscheme/nord/neovim.lua
+++ b/modules/colorscheme/nord/neovim.lua
--- a/flake.lock
+++ b/flake.lock
@ -1,5 +1,53 @@
 {
  "nodes": {
+    "Comment-nvim-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1674040818,
+        "narHash": "sha256-7UtZAE9tPlnpeHS2LLol/LGVOxptDXNKWXHNHvFBNk4=",
+        "owner": "numToStr",
+        "repo": "Comment.nvim",
+        "rev": "eab2c83a0207369900e92783f56990808082eac2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numToStr",
+        "repo": "Comment.nvim",
+        "type": "github"
+      }
+    },
+    "bufferline-nvim-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1676130961,
+        "narHash": "sha256-3LT45i0eSMfUV9EBrtdtzHxFKRATIhRy/faDd3lI3mA=",
+        "owner": "akinsho",
+        "repo": "bufferline.nvim",
+        "rev": "84b0822b2af478d0b4f7b0f9249ca218855331db",
+        "type": "github"
+      },
+      "original": {
+        "owner": "akinsho",
+        "repo": "bufferline.nvim",
+        "type": "github"
+      }
+    },
+    "cmp-nvim-lsp-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1675708067,
+        "narHash": "sha256-DxpcPTBlvVP88PDoTheLV2fC76EXDqS2UpM5mAfj/D4=",
+        "owner": "hrsh7th",
+        "repo": "cmp-nvim-lsp",
+        "rev": "0e6b2ed705ddcff9738ec4ea838141654f12eeef",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hrsh7th",
+        "repo": "cmp-nvim-lsp",
+        "type": "github"
+      }
+    },
    "darwin": {
      "inputs": {
        "nixpkgs": [
@ -7,11 +55,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1664210064,
-        "narHash": "sha256-df6nKVZe/yAhmJ9csirTPahc0dldwm3HBhCVNA6qWr0=",
+        "lastModified": 1673295039,
+        "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "02d2551c927b7d65ded1b3c7cd13da5cc7ae3fcf",
+        "rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
        "type": "github"
      },
      "original": {
@ -21,14 +69,32 @@
        "type": "github"
      }
    },
+    "firefox-darwin": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1675471726,
+        "narHash": "sha256-526iHwidfdtZZ7aAU9od1/zbyfSFBEailBTet+Gvfqg=",
+        "owner": "bandithedoge",
+        "repo": "nixpkgs-firefox-darwin",
+        "rev": "813d55a3e3b3c0423eb5d1fcb4bf82197c9f7796",
+        "type": "github"
+      },
+      "original": {
+        "owner": "bandithedoge",
+        "repo": "nixpkgs-firefox-darwin",
+        "type": "github"
+      }
+    },
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1650374568,
-        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
        "type": "github"
      },
      "original": {
@ -38,6 +104,21 @@
      }
    },
    "flake-utils": {
+      "locked": {
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
      "locked": {
        "lastModified": 1659877975,
        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@ -52,6 +133,21 @@
        "type": "github"
      }
    },
+    "flake-utils_3": {
+      "locked": {
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@ -60,11 +156,11 @@
        "utils": "utils"
      },
      "locked": {
-        "lastModified": 1664273942,
-        "narHash": "sha256-PFQR1UJQs7a7eaH5YoCZky5dmxR5cjaKRK+MpPbR7YE=",
+        "lastModified": 1675935446,
+        "narHash": "sha256-WajulTn7QdwC7QuXRBavrANuIXE5z+08EdxdRw1qsNs=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "1f5ef2bb419a327fae28a83b50fab50959132c24",
+        "rev": "2dce7f1a55e785a22d61668516df62899278c9e4",
        "type": "github"
      },
      "original": {
@ -74,6 +170,47 @@
        "type": "github"
      }
    },
+    "nil": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs_2",
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1676110678,
+        "narHash": "sha256-hemg8rMKS2me2Wua9ZG/0aQ8fEOfytjyKB+WYcXfEKE=",
+        "owner": "oxalica",
+        "repo": "nil",
+        "rev": "ce2e0b5d60fe497134050796f7d12ffb6b50eb28",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "nil",
+        "type": "github"
+      }
+    },
+    "nix2vim": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1673891598,
+        "narHash": "sha256-EevceKxQtA+I0XVA8tBGKmYV1V1KbWc3gsswysMzeDk=",
+        "owner": "gytis-ivaskevicius",
+        "repo": "nix2vim",
+        "rev": "5b31eb81e2c6c74f9e8a4911660f3bf585d55158",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gytis-ivaskevicius",
+        "repo": "nix2vim",
+        "type": "github"
+      }
+    },
    "nixlib": {
      "locked": {
        "lastModified": 1636849918,
@ -97,11 +234,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1660727616,
-        "narHash": "sha256-zYTIvdPMYMx/EYqXODAwIIU30RiEHqNHdgarIHuEYZc=",
+        "lastModified": 1674666581,
+        "narHash": "sha256-KNI2s/xrL7WOYaPJAWKBtb7cCH3335rLfsL+B+ssuGY=",
        "owner": "nix-community",
        "repo": "nixos-generators",
-        "rev": "adccd191a0e83039d537e021f19495b7bad546a1",
+        "rev": "6a5dc1d3d557ea7b5c19b15ff91955124d0400fa",
        "type": "github"
      },
      "original": {
@ -112,11 +249,43 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1664195620,
-        "narHash": "sha256-/0V1a1gAR+QbiQe4aCxBoivhkxss0xyt2mBD6yDrgjw=",
+        "lastModified": 1639237670,
+        "narHash": "sha256-RTdL4rEQcgaZGpvtDgkp3oK/V+1LM3I53n0ACPSroAQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "edfb969386ebe6c3cf8f878775a7975cd88f926d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1675309347,
+        "narHash": "sha256-D3CQ6HRDT2m3XJlrzb5jKq4vNFR5xFTEFKC7iSjlFpM=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "62228ccc672ed000f35b1e5c82e4183e46767e52",
+        "rev": "006c3bd4dd2f5d1d2094047f307cbf9e2b73d9c5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1676110339,
+        "narHash": "sha256-kOS/L8OOL2odpCOM11IevfHxcUeE0vnZUQ74EOiwXcs=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "e5530aba13caff5a4f41713f1265b754dc2abfd8",
        "type": "github"
      },
      "original": {
@ -126,28 +295,45 @@
        "type": "github"
      }
    },
-    "nixpkgs_2": {
+    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1660318005,
-        "narHash": "sha256-g9WCa9lVUmOV6dYRbEPjv/TLOR5hamjeCcKExVGS3OQ=",
+        "lastModified": 1674868155,
+        "narHash": "sha256-eFNm2h6fNbgD7ZpO4MHikCB5pSnCJ7DTmwPisjetmwc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "5c211b47aeadcc178c5320afd4e74c7eed5c389f",
+        "rev": "ce20e9ebe1903ea2ba1ab006ec63093020c761cb",
        "type": "github"
      },
      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-22.05",
-        "type": "indirect"
+        "owner": "NixOS",
+        "ref": "nixos-22.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "null-ls-nvim-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1676246878,
+        "narHash": "sha256-hAUEa2zNsYXQ+TsHYHBzcW67lCxhiD7x+uPbdOZwY8o=",
+        "owner": "jose-elias-alvarez",
+        "repo": "null-ls.nvim",
+        "rev": "d4594231a06cecce73a78a256b0d7c7ab51f7dd5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "jose-elias-alvarez",
+        "repo": "null-ls.nvim",
+        "type": "github"
      }
    },
    "nur": {
      "locked": {
-        "lastModified": 1664282944,
-        "narHash": "sha256-PrID+Tc90HWhkbO4b2kk3MFgjK+iBDWtDd534Y2D2Zs=",
+        "lastModified": 1676251563,
+        "narHash": "sha256-itLKR2Haeh5wQ6dxkuZ8L5gwp3+CAggpN+w2e7cLQPg=",
        "owner": "nix-community",
        "repo": "nur",
-        "rev": "dcc2af3d2504af6726c5cf40eb5e1165d5700721",
+        "rev": "9a8b28a9d6611f6af9f7abb3e690fc755d6906fe",
        "type": "github"
      },
      "original": {
@ -156,24 +342,158 @@
        "type": "github"
      }
    },
+    "nvim-lspconfig-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1676175675,
+        "narHash": "sha256-Wg3NatT4DRBMF6hCxK4C2DC+geFMpfFUFogPbqeMt6E=",
+        "owner": "neovim",
+        "repo": "nvim-lspconfig",
+        "rev": "1712672e4da3003a0dd9f771d30389600b360f42",
+        "type": "github"
+      },
+      "original": {
+        "owner": "neovim",
+        "repo": "nvim-lspconfig",
+        "type": "github"
+      }
+    },
+    "nvim-tree-lua-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1676244722,
+        "narHash": "sha256-xoSekdZhWr59qTOM0/ihYiuKiwHiKYb42Ep5JHn65UM=",
+        "owner": "kyazdani42",
+        "repo": "nvim-tree.lua",
+        "rev": "ba1778e061f25814bc5940be886a7f41d7d7736e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "kyazdani42",
+        "repo": "nvim-tree.lua",
+        "type": "github"
+      }
+    },
+    "nvim-treesitter-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1676240774,
+        "narHash": "sha256-eRSU/9ysSvTyYxBrp9Whg0eXgAOsCdmIHMlYZK7bjRg=",
+        "owner": "nvim-treesitter",
+        "repo": "nvim-treesitter",
+        "rev": "7eb5f1a2e3949496f26c4084b521b30f2d08137a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nvim-treesitter",
+        "repo": "nvim-treesitter",
+        "type": "github"
+      }
+    },
    "root": {
      "inputs": {
+        "Comment-nvim-src": "Comment-nvim-src",
+        "bufferline-nvim-src": "bufferline-nvim-src",
+        "cmp-nvim-lsp-src": "cmp-nvim-lsp-src",
        "darwin": "darwin",
+        "firefox-darwin": "firefox-darwin",
        "home-manager": "home-manager",
+        "nil": "nil",
+        "nix2vim": "nix2vim",
        "nixos-generators": "nixos-generators",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_3",
+        "null-ls-nvim-src": "null-ls-nvim-src",
        "nur": "nur",
+        "nvim-lspconfig-src": "nvim-lspconfig-src",
+        "nvim-tree-lua-src": "nvim-tree-lua-src",
+        "nvim-treesitter-src": "nvim-treesitter-src",
+        "telescope-nvim-src": "telescope-nvim-src",
+        "telescope-project-nvim-src": "telescope-project-nvim-src",
+        "toggleterm-nvim-src": "toggleterm-nvim-src",
        "wallpapers": "wallpapers",
        "wsl": "wsl"
      }
    },
+    "rust-overlay": {
+      "inputs": {
+        "flake-utils": [
+          "nil",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nil",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1675391458,
+        "narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "telescope-nvim-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1675149856,
+        "narHash": "sha256-L4Kw94CUy6N7zcyy9INuR/O0fxQ7sp0IvGd/u7fHxMA=",
+        "owner": "nvim-telescope",
+        "repo": "telescope.nvim",
+        "rev": "203bf5609137600d73e8ed82703d6b0e320a5f36",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nvim-telescope",
+        "repo": "telescope.nvim",
+        "type": "github"
+      }
+    },
+    "telescope-project-nvim-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1671805267,
+        "narHash": "sha256-S4SOHzQ17ux5pcwwYFpVVLzjLeC4/EJ0IFPbrfzUJC8=",
+        "owner": "nvim-telescope",
+        "repo": "telescope-project.nvim",
+        "rev": "8e8ee37b7210761502cdf2c3a82b5ba8fb5b2972",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nvim-telescope",
+        "repo": "telescope-project.nvim",
+        "type": "github"
+      }
+    },
+    "toggleterm-nvim-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1675358836,
+        "narHash": "sha256-9O7p/7tRStg51OFhMc88M5ewYquiYC9x9CV4s5veVP8=",
+        "owner": "akinsho",
+        "repo": "toggleterm.nvim",
+        "rev": "19aad0f41f47affbba1274f05e3c067e6d718e1e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "akinsho",
+        "repo": "toggleterm.nvim",
+        "type": "github"
+      }
+    },
    "utils": {
      "locked": {
-        "lastModified": 1659877975,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
        "type": "github"
      },
      "original": {
@ -201,15 +521,15 @@
    "wsl": {
      "inputs": {
        "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_2"
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": "nixpkgs_4"
      },
      "locked": {
-        "lastModified": 1661772734,
-        "narHash": "sha256-DkvAaLDg9D6O0i2MzUknaf/U078K4KWAZaJQmNC/tL8=",
+        "lastModified": 1676126384,
+        "narHash": "sha256-3aAnN891Cb1pizewAgaHIo3W1WbAjXtoWuX8n3j8YoI=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "c1b0259313f661cf74051c916cf3bb4f061ce11f",
+        "rev": "a1c7e8bebac32cfac7aa8498bdfc60cbff13eb50",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -26,6 +26,9 @@
    # Community packages; used for Firefox extensions
    nur.url = "github:nix-community/nur";

+    # Use official Firefox binary for macOS
+    firefox-darwin.url = "github:bandithedoge/nixpkgs-firefox-darwin";
+
    # Wallpapers
    wallpapers = {
      url = "gitlab:exorcist365/wallpapers";
@ -38,9 +41,60 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };

+    # Convert Nix to Neovim config
+    nix2vim = {
+      url = "github:gytis-ivaskevicius/nix2vim";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    # Nix language server
+    nil.url = "github:oxalica/nil";
+
+    # Neovim plugins
+    nvim-lspconfig-src = {
+      url = "github:neovim/nvim-lspconfig";
+      flake = false;
+    };
+    cmp-nvim-lsp-src = {
+      url = "github:hrsh7th/cmp-nvim-lsp";
+      flake = false;
+    };
+    null-ls-nvim-src = {
+      url = "github:jose-elias-alvarez/null-ls.nvim";
+      flake = false;
+    };
+    Comment-nvim-src = {
+      url = "github:numToStr/Comment.nvim";
+      flake = false;
+    };
+    nvim-treesitter-src = {
+      url = "github:nvim-treesitter/nvim-treesitter";
+      flake = false;
+    };
+    telescope-nvim-src = {
+      url = "github:nvim-telescope/telescope.nvim";
+      flake = false;
+    };
+    telescope-project-nvim-src = {
+      url = "github:nvim-telescope/telescope-project.nvim";
+      flake = false;
+    };
+    toggleterm-nvim-src = {
+      url = "github:akinsho/toggleterm.nvim";
+      flake = false;
+    };
+    bufferline-nvim-src = {
+      url = "github:akinsho/bufferline.nvim";
+      flake = false;
+    };
+    nvim-tree-lua-src = {
+      url = "github:kyazdani42/nvim-tree.lua";
+      flake = false;
+    };
+
  };

-  outputs = { self, nixpkgs, ... }@inputs:
+  outputs = { nixpkgs, ... }@inputs:

    let

@ -50,10 +104,18 @@
        fullName = "Noah Masur";
        gitName = fullName;
        gitEmail = "7386960+nmasur@users.noreply.github.com";
-        mailServer = "noahmasur.com";
+        mail.server = "noahmasur.com";
        dotfilesRepo = "git@github.com:nmasur/dotfiles";
      };

+      # Common overlays to always use
+      overlays = [
+        inputs.nur.overlay
+        inputs.nix2vim.overlay
+        (import ./overlays/neovim-plugins.nix inputs)
+        (import ./overlays/calibre-web.nix)
+      ];
+
      # System types to support.
      supportedSystems =
        [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
@ -61,59 +123,58 @@
      # Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'.
      forAllSystems = nixpkgs.lib.genAttrs supportedSystems;

-    in {
+    in rec {

-      nixosConfigurations = with inputs; {
-        desktop = import ./hosts/desktop {
-          inherit nixpkgs home-manager nur globals wallpapers;
-        };
-        wsl = import ./hosts/wsl { inherit nixpkgs wsl home-manager globals; };
-        oracle =
-          import ./hosts/oracle { inherit nixpkgs home-manager globals; };
+      nixosConfigurations = {
+        tempest = import ./hosts/tempest { inherit inputs globals overlays; };
+        hydra = import ./hosts/hydra { inherit inputs globals overlays; };
+        flame = import ./hosts/flame { inherit inputs globals overlays; };
+        swan = import ./hosts/swan { inherit inputs globals overlays; };
      };

-      darwinConfigurations = with inputs; {
-        macbook = import ./hosts/macbook {
-          inherit nixpkgs darwin home-manager nur globals;
-        };
+      darwinConfigurations = {
+        lookingglass =
+          import ./hosts/lookingglass { inherit inputs globals overlays; };
+      };
+
+      # For quickly applying local settings with:
+      # home-manager switch --flake .#tempest
+      homeConfigurations = {
+        tempest =
+          nixosConfigurations.tempest.config.home-manager.users.${globals.user}.home;
+        lookingglass =
+          darwinConfigurations.lookingglass.config.home-manager.users."Noah.Masur".home;
      };

      # Package servers into images with a generator
-      packages.x86_64-linux = with inputs; {
-        aws = import ./hosts/aws {
-          inherit nixpkgs nixos-generators home-manager globals;
-          system = "x86_64-linux";
+      packages = forAllSystems (system: {
+
+        aws = {
+          "${system}" =
+            import ./generators/aws { inherit inputs globals system overlays; };
        };
-      };
+
+        staff = {
+          "${system}" = import ./generators/staff {
+            inherit inputs globals system overlays;
+          };
+        };
+
+        neovim = let pkgs = import nixpkgs { inherit system overlays; };
+        in import ./modules/common/neovim/package {
+          inherit pkgs;
+          colors =
+            import ./colorscheme/gruvbox/neovim-gruvbox.nix { inherit pkgs; };
+        };
+
+      });

      apps = forAllSystems (system:
-        let pkgs = import nixpkgs { inherit system; };
-        in rec {
-          default = readme;
-
-          # Format and install from nothing
-          installer = import ./apps/installer.nix { inherit pkgs; };
-
-          # Display the readme for this repository
-          readme = import ./apps/readme.nix { inherit pkgs; };
-
-          # Load the SSH key for this machine
-          loadkey = import ./apps/loadkey.nix { inherit pkgs; };
-
-          # Encrypt secret for all machines
-          encrypt-secret = import ./apps/encrypt-secret.nix { inherit pkgs; };
-
-          # Re-encrypt secrets for all machines
-          reencrypt-secrets =
-            import ./apps/reencrypt-secrets.nix { inherit pkgs; };
-
-          # Connect machine metrics to Netdata Cloud
-          netdata = import ./apps/netdata-cloud.nix { inherit pkgs; };
-
-        });
+        let pkgs = import nixpkgs { inherit system overlays; };
+        in import ./apps { inherit pkgs; });

      devShells = forAllSystems (system:
-        let pkgs = import nixpkgs { inherit system; };
+        let pkgs = import nixpkgs { inherit system overlays; };
        in {

          # Used to run commands and edit files in this repo
--- a/generators/aws/default.nix
+++ b/generators/aws/default.nix
@ -1,4 +1,6 @@
-{ nixpkgs, system, nixos-generators, home-manager, globals, ... }:
+{ inputs, globals, ... }:
+
+with inputs;

 nixos-generators.nixosGenerate {
  inherit system;
@ -13,16 +15,16 @@ nixos-generators.nixosGenerate {
      gitEmail = globals.gitEmail;
      networking.hostName = "sheep";
      gui.enable = false;
-      colorscheme = (import ../modules/colorscheme/gruvbox);
+      colorscheme = (import ../colorscheme/gruvbox);
      passwordHash = null;
      publicKey =
        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s";
      # AWS settings require this
      permitRootLogin = "prohibit-password";
    }
-    ../../hosts/common.nix
+    ../../modules/common
    ../../modules/nixos
-    ../../modules/services/sshd.nix
+    ../../modules/common/services/sshd.nix
  ] ++ [
    # Required to fix diskSize errors during build
    ({ ... }: { amazonImage.sizeMB = 16 * 1024; })
--- a/generators/aws/main.tf
+++ b/generators/aws/main.tf
--- a/generators/aws/workflow.yml
+++ b/generators/aws/workflow.yml
--- a/generators/staff/default.nix
+++ b/generators/staff/default.nix
@ -0,0 +1,17 @@
+# The Staff
+# ISO configuration for my USB drive
+
+{ inputs, system, ... }:
+
+with inputs;
+
+nixos-generators.nixosGenerate {
+  inherit system;
+  format = "install-iso";
+  modules = [{
+    networking.hostName = "staff";
+    users.extraUsers.root.openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s"
+    ];
+  }];
+}
--- a/hosts/desktop/default.nix
+++ b/hosts/desktop/default.nix
@ -1,45 +0,0 @@
-{ nixpkgs, home-manager, nur, globals, wallpapers, ... }:
-
-# System configuration for my desktop
-nixpkgs.lib.nixosSystem {
-  system = "x86_64-linux";
-  specialArgs = { };
-  modules = [
-    globals
-    home-manager.nixosModules.home-manager
-    {
-      networking.hostName = "desktop";
-      nixpkgs.overlays = [ nur.overlay ];
-      # Set registry to flake packages, used for nix X commands
-      nix.registry.nixpkgs.flake = nixpkgs;
-      identityFile = "/home/${globals.user}/.ssh/id_ed25519";
-      gaming.steam = true;
-      gaming.leagueoflegends = true;
-      gaming.legendary = true;
-      gui = {
-        enable = true;
-        compositor.enable = true;
-        wallpaper = "${wallpapers}/gruvbox/road.jpg";
-        gtk.theme = { name = "Adwaita-dark"; };
-      };
-      colorscheme = (import ../../modules/colorscheme/gruvbox);
-      passwordHash =
-        "$6$PZYiMGmJIIHAepTM$Wx5EqTQ5GApzXx58nvi8azh16pdxrN6Qrv1wunDlzveOgawitWzcIxuj76X9V868fsPi/NOIEO8yVXqwzS9UF.";
-    }
-
-    ./hardware-configuration.nix
-    ../common.nix
-    ../../modules/hardware
-    ../../modules/nixos
-    ../../modules/graphical
-    ../../modules/gaming
-    ../../modules/applications
-    ../../modules/mail/himalaya.nix
-    ../../modules/repositories/notes.nix
-    ../../modules/services/keybase.nix
-    ../../modules/services/gnupg.nix
-    ../../modules/services/mullvad.nix
-    ../../modules/programming/nix.nix
-    ../../modules/programming/haskell.nix
-  ];
-}
--- a/hosts/desktop/hardware-configuration.nix
+++ b/hosts/desktop/hardware-configuration.nix
@ -1,30 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-
-  boot.initrd.availableKernelModules =
-    [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-label/nixos";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-label/boot";
-    fsType = "vfat";
-  };
-
-  swapDevices = [ ];
-
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-  hardware.cpu.intel.updateMicrocode =
-    lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
--- a/hosts/oracle/default.nix
+++ b/hosts/oracle/default.nix
@ -1,22 +1,33 @@
-{ nixpkgs, home-manager, globals, ... }:
-
+# The Flame
 # System configuration for an Oracle free server

 # How to install:
 # https://blog.korfuri.fr/posts/2022/08/nixos-on-an-oracle-free-tier-ampere-machine/

+{ inputs, globals, overlays, ... }:
+
+with inputs;
+
 nixpkgs.lib.nixosSystem {
  system = "aarch64-linux";
  specialArgs = { };
  modules = [
-    (removeAttrs globals [ "mailServer" ])
+    ./hardware-configuration.nix
+    ../../modules/common
+    ../../modules/nixos
+    (removeAttrs globals [ "mail.server" ])
+    wsl.nixosModules.wsl
    home-manager.nixosModules.home-manager
    {
+      server = true;
      gui.enable = false;
-      colorscheme = (import ../../modules/colorscheme/gruvbox);
+      theme = { colors = (import ../../colorscheme/gruvbox).dark; };
+      nixpkgs.overlays = overlays;
+      wsl.enable = false;
+      caddy.enable = true;

      # FQDNs for various services
-      networking.hostName = "oracle";
+      networking.hostName = "flame";
      bookServer = "books.masu.rs";
      streamServer = "stream.masu.rs";
      nextcloudServer = "cloud.masu.rs";
@ -26,12 +37,11 @@ nixpkgs.lib.nixosSystem {
      giteaServer = "git.masu.rs";

      # Disable passwords, only use SSH key
-      passwordHash = null;
      publicKey =
        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s";

      # Nextcloud backup config
-      backupS3 = {
+      backup.s3 = {
        endpoint = "s3.us-west-002.backblazeb2.com";
        bucket = "noahmasur-backup";
        accessKeyId = "0026b0e73b2e2c80000000005";
@ -41,6 +51,7 @@ nixpkgs.lib.nixosSystem {
      users.users.nextcloud.extraGroups = [ "jellyfin" ];

      # Wireguard config for Transmission
+      wireguard.enable = true;
      networking.wireguard.interfaces.wg0 = {

        # The local IPs for this machine within the Wireguard network
@ -70,20 +81,18 @@ nixpkgs.lib.nixosSystem {

      # Grant access to Transmission directories from Jellyfin
      users.users.jellyfin.extraGroups = [ "transmission" ];
+
+      # Proxy traffic with Cloudflare
+      cloudflare.enable = true;
+
+      # Setup Minecraft server
+      gaming.minecraft-server.enable = true;
+
+      # Clone dotfiles
+      dotfiles.enable = true;
+
+      neovim.enable = true;
+
    }
-    ./hardware-configuration.nix
-    ../common.nix
-    ../../modules/nixos
-    ../../modules/hardware/server.nix
-    ../../modules/services/sshd.nix
-    ../../modules/services/calibre.nix
-    ../../modules/services/jellyfin.nix
-    ../../modules/services/nextcloud.nix
-    ../../modules/services/cloudflare.nix
-    ../../modules/services/transmission.nix
-    ../../modules/services/prometheus.nix
-    ../../modules/services/vaultwarden.nix
-    ../../modules/services/gitea.nix
-    ../../modules/gaming/minecraft-server.nix
  ];
 }
--- a/hosts/oracle/hardware-configuration.nix
+++ b/hosts/oracle/hardware-configuration.nix
@ -1,7 +1,7 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ lib, modulesPath, ... }:

 {
  imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
--- a/hosts/hydra/default.nix
+++ b/hosts/hydra/default.nix
@ -1,38 +1,49 @@
-{ nixpkgs, wsl, home-manager, globals, ... }:
-
+# The Hydra
 # System configuration for WSL
+
+{ inputs, globals, overlays, ... }:
+
+with inputs;
+
 nixpkgs.lib.nixosSystem {
  system = "x86_64-linux";
  specialArgs = { };
  modules = [
+    ../../modules/common
+    ../../modules/nixos
    globals
    wsl.nixosModules.wsl
    home-manager.nixosModules.home-manager
    {
-      networking.hostName = "wsl";
+      networking.hostName = "hydra";
+      nixpkgs.overlays = overlays;
      # Set registry to flake packages, used for nix X commands
      nix.registry.nixpkgs.flake = nixpkgs;
      identityFile = "/home/${globals.user}/.ssh/id_ed25519";
      gui.enable = false;
-      colorscheme = (import ../../modules/colorscheme/gruvbox);
-      passwordHash =
-        "$6$PZYiMGmJIIHAepTM$Wx5EqTQ5GApzXx58nvi8azh16pdxrN6Qrv1wunDlzveOgawitWzcIxuj76X9V868fsPi/NOIEO8yVXqwzS9UF.";
+      theme = {
+        colors = (import ../../colorscheme/gruvbox).dark;
+        dark = true;
+      };
+      passwordHash = nixpkgs.lib.fileContents ../../private/password.sha512;
      wsl = {
        enable = true;
-        automountPath = "/mnt";
+        wslConf.automount.root = "/mnt";
        defaultUser = globals.user;
        startMenuLaunchers = true;
+        nativeSystemd = true;
        wslConf.network.generateResolvConf = true; # Turn off if it breaks VPN
        interop.includePath =
          false; # Including Windows PATH will slow down Neovim command mode
      };
+
+      neovim.enable = true;
+      mail.enable = true;
+      mail.aerc.enable = true;
+      mail.himalaya.enable = true;
+      dotfiles.enable = true;
+      nixlang.enable = true;
+      lua.enable = true;
    }
-    ../common.nix
-    ../../modules/wsl
-    ../../modules/nixos
-    ../../modules/mail/himalaya.nix
-    ../../modules/repositories/notes.nix
-    ../../modules/programming/nix.nix
-    ../../modules/programming/lua.nix
  ];
 }
--- a/hosts/lookingglass/default.nix
+++ b/hosts/lookingglass/default.nix
@ -0,0 +1,48 @@
+# The Looking Glass
+# System configuration for my work Macbook
+
+{ inputs, globals, overlays, ... }:
+
+with inputs;
+
+darwin.lib.darwinSystem {
+  system = "x86_64-darwin";
+  specialArgs = { };
+  modules = [
+    ../../modules/common
+    ../../modules/darwin
+    (globals // {
+      user = "Noah.Masur";
+      gitName = "Noah-Masur_1701";
+      gitEmail = "Noah.Masur@take2games.com";
+    })
+    home-manager.darwinModules.home-manager
+    {
+      networking.hostName = "noah-masur-mac";
+      identityFile = "/Users/Noah.Masur/.ssh/id_ed25519";
+      gui.enable = true;
+      theme = {
+        colors = (import ../../colorscheme/gruvbox).dark;
+        dark = true;
+      };
+      mail.user = globals.user;
+      nixpkgs.overlays = [ firefox-darwin.overlay ] ++ overlays;
+      # Set registry to flake packages, used for nix X commands
+      nix.registry.nixpkgs.flake = nixpkgs;
+      neovim.enable = true;
+      mail.enable = true;
+      mail.aerc.enable = true;
+      mail.himalaya.enable = true;
+      kitty.enable = true;
+      discord.enable = true;
+      firefox.enable = true;
+      dotfiles.enable = true;
+      nixlang.enable = true;
+      terraform.enable = true;
+      python.enable = true;
+      lua.enable = true;
+      kubernetes.enable = true;
+      "1password".enable = true;
+    }
+  ];
+}
--- a/hosts/macbook/default.nix
+++ b/hosts/macbook/default.nix
@ -1,36 +0,0 @@
-{ nixpkgs, darwin, home-manager, nur, globals, ... }:
-
-# System configuration for my work MacBook
-darwin.lib.darwinSystem {
-  system = "x86_64-darwin";
-  specialArgs = { };
-  modules = [
-    (globals // {
-      user = "Noah.Masur";
-      gitName = "Noah-Masur_1701";
-      gitEmail = "Noah.Masur@take2games.com";
-    })
-    home-manager.darwinModules.home-manager
-    {
-      identityFile = "/home/${globals.user}/.ssh/id_ed25519";
-      gui.enable = true;
-      colorscheme = (import ../../modules/colorscheme/gruvbox);
-      mailUser = globals.user;
-      networking.hostName = "noah-masur-mac";
-      nixpkgs.overlays = [ nur.overlay ];
-      # Set registry to flake packages, used for nix X commands
-      nix.registry.nixpkgs.flake = nixpkgs;
-    }
-    ../common.nix
-    ../../modules/darwin
-    ../../modules/applications/alacritty.nix
-    ../../modules/applications/discord.nix
-    ../../modules/mail/himalaya.nix
-    ../../modules/repositories/notes.nix
-    ../../modules/programming/nix.nix
-    ../../modules/programming/terraform.nix
-    ../../modules/programming/python.nix
-    ../../modules/programming/lua.nix
-    ../../modules/programming/kubernetes.nix
-  ];
-}
--- a/hosts/swan/default.nix
+++ b/hosts/swan/default.nix
@ -0,0 +1,48 @@
+# The Swan
+# System configuration for my home NAS server
+
+{ inputs, globals, overlays, ... }:
+
+with inputs;
+
+nixpkgs.lib.nixosSystem {
+  system = "x86_64-linux";
+  specialArgs = { };
+  modules = [
+    ./hardware-configuration.nix
+    ../../modules/common
+    ../../modules/nixos
+    (removeAttrs globals [ "mail.server" ])
+    wsl.nixosModules.wsl
+    home-manager.nixosModules.home-manager
+    {
+      server = true;
+      gui.enable = false;
+      theme = { colors = (import ../../colorscheme/gruvbox).dark; };
+      nixpkgs.overlays = overlays;
+      wsl.enable = false;
+      caddy.enable = true;
+
+      networking.hostName = "swan";
+
+      # Disable passwords, only use SSH key
+      publicKey =
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s";
+
+      # Clone dotfiles
+      dotfiles.enable = true;
+
+      neovim.enable = true;
+
+      boot.zfs.enabled = true;
+      boot.kernelPackages =
+        config.boot.zfs.package.latestCompatibleLinuxPackages;
+      boot.zfs.extraPools = [ "mypool" ];
+      services.zfs.autoScrub.enable = true;
+      services.zfs.autoScrub.interval = "daily";
+
+      services.nfs.server.enable = true;
+
+    }
+  ];
+}
--- a/hosts/tempest/default.nix
+++ b/hosts/tempest/default.nix
@ -0,0 +1,62 @@
+# The Tempest
+# System configuration for my desktop
+
+{ inputs, globals, overlays, ... }:
+
+with inputs;
+
+nixpkgs.lib.nixosSystem {
+  system = "x86_64-linux";
+  specialArgs = { };
+  modules = [
+    ./hardware-configuration.nix
+    ../../modules/common
+    ../../modules/nixos
+    globals
+    wsl.nixosModules.wsl
+    home-manager.nixosModules.home-manager
+    {
+      physical = true;
+      networking.hostName = "tempest";
+      nixpkgs.overlays = [ nur.overlay ] ++ overlays;
+      # Set registry to flake packages, used for nix X commands
+      nix.registry.nixpkgs.flake = nixpkgs;
+      identityFile = "/home/${globals.user}/.ssh/id_ed25519";
+      gui.enable = true;
+      theme = {
+        colors = (import ../../colorscheme/gruvbox).dark;
+        dark = true;
+      };
+      wallpaper = "${wallpapers}/gruvbox/road.jpg";
+      gtk.theme.name = nixpkgs.lib.mkDefault "Adwaita-dark";
+      passwordHash = nixpkgs.lib.fileContents ../../private/password.sha512;
+      wsl.enable = false;
+      publicKey = null;
+
+      neovim.enable = true;
+      media.enable = true;
+      firefox.enable = true;
+      kitty.enable = true;
+      _1password.enable = true;
+      discord.enable = true;
+      nautilus.enable = true;
+      obsidian.enable = true;
+      mail.enable = true;
+      mail.aerc.enable = true;
+      mail.himalaya.enable = true;
+      keybase.enable = true;
+      # mullvad.enable = true;
+      nixlang.enable = true;
+      dotfiles.enable = true;
+
+      gaming = {
+        enable = true;
+        steam.enable = true;
+        legendary.enable = true;
+        lutris.enable = true;
+        leagueoflegends.enable = true;
+      };
+
+    }
+  ];
+}
--- a/hosts/tempest/hardware-configuration.nix
+++ b/hosts/tempest/hardware-configuration.nix
@ -0,0 +1,40 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, modulesPath, ... }:
+
+{
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+
+  boot.initrd.availableKernelModules =
+    [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.kernelModules = [ "amdgpu" ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  services.xserver.videoDrivers = [ "amdgpu" ];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-label/nixos";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-label/boot";
+    fsType = "vfat";
+  };
+
+  swapDevices = [ ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp5s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
+
+  powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
+  hardware.cpu.amd.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
--- a/modules/applications/1password.nix
+++ b/modules/applications/1password.nix
@ -1,10 +0,0 @@
-{ config, pkgs, lib, ... }: {
-
-  config = lib.mkIf config.gui.enable {
-    unfreePackages = [ "1password" "_1password-gui" ];
-    home-manager.users.${config.user} = {
-      home.packages = with pkgs; [ _1password-gui ];
-    };
-  };
-
-}
--- a/modules/applications/firefox.nix
+++ b/modules/applications/firefox.nix
@ -1,121 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  config = lib.mkIf config.gui.enable {
-
-    unfreePackages = [ "onepassword-password-manager" "okta-browser-plugin" ];
-
-    home-manager.users.${config.user} = {
-
-      programs.firefox = {
-        enable = true;
-        extensions = with pkgs.nur.repos.rycee.firefox-addons; [
-          ublock-origin
-          vimium
-          multi-account-containers
-          facebook-container
-          temporary-containers
-          onepassword-password-manager
-          okta-browser-plugin
-          sponsorblock
-          reddit-enhancement-suite
-          bypass-paywalls-clean
-          markdownload
-          darkreader
-          snowflake
-          don-t-fuck-with-paste
-          i-dont-care-about-cookies
-        ];
-        profiles.Profile0 = {
-          id = 0;
-          name = "default";
-          isDefault = true;
-          settings = {
-            "browser.aboutConfig.showWarning" = false;
-            "browser.warnOnQuit" = false;
-            "browser.theme.dark-private-windows" = true;
-            "browser.toolbars.bookmarks.visibility" = "newtab";
-            "browser.startup.page" = 3; # Restore previous session
-            "browser.newtabpage.enabled" = false; # Make new tabs blank
-            "general.autoScroll" = true; # Drag middle-mouse to scroll
-            "services.sync.prefs.sync.general.autoScroll" =
-              false; # Prevent disabling autoscroll
-            "extensions.pocket.enabled" = false;
-            "toolkit.legacyUserProfileCustomizations.stylesheets" =
-              true; # Allow userChrome.css
-            "layout.css.color-mix.enabled" = true;
-          };
-          userChrome = ''
-            :root {
-              --focus-outline-color: ${config.colorscheme.base04} !important;
-              --toolbar-color: ${config.colorscheme.base07} !important;
-              --tab-min-height: 30px !important;
-            }
-            /* Background of tab bar */
-            .toolbar-items {
-              background-color: ${config.colorscheme.base00} !important;
-            }
-            /* Tabs themselves */
-            .tabbrowser-tab .tab-stack {
-              border-radius: 5px 5px 0 0;
-              overflow: hidden;
-              background-color: ${config.colorscheme.base00};
-              color: ${config.colorscheme.base06} !important;
-            }
-            .tab-content {
-              border-bottom: 2px solid color-mix(in srgb, var(--identity-tab-color) 40%, transparent);
-              border-radius: 5px 5px 0 0;
-              background-color: ${config.colorscheme.base00};
-              color: ${config.colorscheme.base06} !important;
-            }
-            .tab-content[selected=true] {
-              border-bottom: 2px solid color-mix(in srgb, var(--identity-tab-color) 25%, transparent);
-              background-color: ${config.colorscheme.base01} !important;
-              color: ${config.colorscheme.base07} !important;
-            }
-            /* Below tab bar */
-            #nav-bar {
-              background: ${config.colorscheme.base01} !important;
-            }
-            /* URL bar in nav bar */
-            #urlbar[focused=true] {
-              color: ${config.colorscheme.base07} !important;
-              background: ${config.colorscheme.base02} !important;
-              caret-color: ${config.colorscheme.base05} !important;
-            }
-            #urlbar:not([focused=true]) {
-              color: ${config.colorscheme.base04} !important;
-              background: ${config.colorscheme.base02} !important;
-            }
-            #urlbar ::-moz-selection {
-              color: ${config.colorscheme.base07} !important;
-              background: ${config.colorscheme.base02} !important;
-            }
-            #urlbar-input-container {
-              border: 1px solid ${config.colorscheme.base01} !important;
-            }
-            #urlbar-background {
-              background: ${config.colorscheme.base01} !important;
-            }
-            /* Text in URL bar */
-            #urlbar-input, #urlbar-scheme, .searchbar-textbox {
-              color: ${config.colorscheme.base07} !important;
-            }
-          '';
-          userContent = ''
-            @-moz-document url-prefix(about:blank) {
-              * {
-                background-color:${config.colorscheme.base01} !important;
-              }
-            }
-          '';
-
-          extraConfig = "";
-        };
-
-      };
-    };
-
-  };
-
-}
--- a/modules/applications/media.nix
+++ b/modules/applications/media.nix
@ -1,11 +0,0 @@
-{ config, pkgs, lib, ... }: {
-
-  config = lib.mkIf config.gui.enable {
-    home-manager.users.${config.user}.home.packages = with pkgs; [
-      mpv # Video viewer
-      sxiv # Image viewer
-      mupdf # PDF viewer
-    ];
-  };
-
-}
--- a/modules/applications/nautilus.nix
+++ b/modules/applications/nautilus.nix
@ -1,13 +0,0 @@
-{ config, pkgs, lib, ... }: {
-
-  # Install Nautilus file manager
-  config = lib.mkIf config.gui.enable {
-    home-manager.users.${config.user} = {
-      home.packages = with pkgs; [
-        gnome.nautilus
-        gnome.sushi # Quick preview with spacebar
-      ];
-    };
-  };
-
-}
--- a/modules/applications/obsidian.nix
+++ b/modules/applications/obsidian.nix
@ -1,10 +0,0 @@
-{ config, pkgs, lib, ... }: {
-
-  config = lib.mkIf config.gui.enable {
-    unfreePackages = [ "obsidian" ];
-    home-manager.users.${config.user} = {
-      home.packages = with pkgs; [ obsidian ];
-    };
-  };
-
-}
--- a/modules/applications/qbittorrent.nix
+++ b/modules/applications/qbittorrent.nix
@ -1,12 +0,0 @@
-{ config, pkgs, lib, ... }: {
-
-  config = lib.mkIf config.gui.enable {
-
-    home-manager.users.${config.user} = {
-
-      home.packages = with pkgs; [ qbittorrent ];
-
-    };
-  };
-
-}
--- a/modules/colorscheme/gruvbox/default.nix
+++ b/modules/colorscheme/gruvbox/default.nix
@ -1,22 +0,0 @@
-{
-  name = "gruvbox"; # Dark, Medium
-  author =
-    "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)";
-  base00 = "#282828"; # ----
-  base01 = "#3c3836"; # ---
-  base02 = "#504945"; # --
-  base03 = "#665c54"; # -
-  base04 = "#bdae93"; # +
-  base05 = "#d5c4a1"; # ++
-  base06 = "#ebdbb2"; # +++
-  base07 = "#fbf1c7"; # ++++
-  base08 = "#fb4934"; # red
-  base09 = "#fe8019"; # orange
-  base0A = "#fabd2f"; # yellow
-  base0B = "#b8bb26"; # green
-  base0C = "#8ec07c"; # aqua/cyan
-  base0D = "#83a598"; # blue
-  base0E = "#d3869b"; # purple
-  base0F = "#d65d0e"; # brown
-  neovimConfig = ./neovim.lua;
-}
--- a/modules/colorscheme/gruvbox/neovim.lua
+++ b/modules/colorscheme/gruvbox/neovim.lua
@ -1,13 +0,0 @@
-local M = {}
-
-M.packer = function(use)
-    use({
-        "lifepillar/vim-gruvbox8",
-        config = function()
-            vim.g.gruvbox_italicize_strings = 0
-            vim.cmd("colorscheme gruvbox8")
-        end,
-    })
-end
-
-return M
--- a/modules/common/applications/1password.nix
+++ b/modules/common/applications/1password.nix
@ -0,0 +1,20 @@
+{ config, pkgs, lib, ... }: {
+
+  options = {
+    _1password = {
+      enable = lib.mkEnableOption {
+        description = "Enable 1Password.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf
+    (config.gui.enable && config._1password.enable && pkgs.stdenv.isLinux) {
+      unfreePackages = [ "1password" "_1password-gui" ];
+      home-manager.users.${config.user} = {
+        home.packages = with pkgs; [ _1password-gui ];
+      };
+    };
+
+}
--- a/modules/common/applications/alacritty.nix
+++ b/modules/common/applications/alacritty.nix
@ -1,6 +1,15 @@
 { config, pkgs, lib, ... }: {

-  config = lib.mkIf config.gui.enable {
+  options = {
+    alacritty = {
+      enable = lib.mkEnableOption {
+        description = "Enable Alacritty.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.gui.enable && config.alacritty.enable) {
    home-manager.users.${config.user} = {
      xsession.windowManager.i3.config.terminal = "alacritty";
      programs.rofi.terminal = "${pkgs.alacritty}/bin/alacritty";
@ -23,8 +32,8 @@
          key_bindings = [
            # Used for word completion in fish_user_key_bindings
            {
-              key = "L";
-              mods = "Control|Shift";
+              key = "Return";
+              mods = "Shift";
              chars = "\\x1F";
            }
            # Used for searching nixpkgs in fish_user_key_bindings
@ -34,8 +43,8 @@
              chars = "\\x11F";
            }
            {
-              key = "K";
-              mods = "Control";
+              key = "H";
+              mods = "Control|Shift";
              mode = "~Vi";
              action = "ToggleViMode";
            }
@ -54,32 +63,32 @@
          ];
          colors = {
            primary = {
-              background = config.colorscheme.base00;
-              foreground = config.colorscheme.base05;
+              background = config.theme.colors.base00;
+              foreground = config.theme.colors.base05;
            };
            cursor = {
              text = "#1d2021";
-              cursor = config.colorscheme.base05;
+              cursor = config.theme.colors.base05;
            };
            normal = {
              black = "#1d2021";
-              red = config.colorscheme.base08;
-              green = config.colorscheme.base0B;
-              yellow = config.colorscheme.base0A;
-              blue = config.colorscheme.base0D;
-              magenta = config.colorscheme.base0E;
-              cyan = config.colorscheme.base0C;
-              white = config.colorscheme.base05;
+              red = config.theme.colors.base08;
+              green = config.theme.colors.base0B;
+              yellow = config.theme.colors.base0A;
+              blue = config.theme.colors.base0D;
+              magenta = config.theme.colors.base0E;
+              cyan = config.theme.colors.base0C;
+              white = config.theme.colors.base05;
            };
            bright = {
-              black = config.colorscheme.base03;
-              red = config.colorscheme.base09;
-              green = config.colorscheme.base01;
-              yellow = config.colorscheme.base02;
-              blue = config.colorscheme.base04;
-              magenta = config.colorscheme.base06;
-              cyan = config.colorscheme.base0F;
-              white = config.colorscheme.base07;
+              black = config.theme.colors.base03;
+              red = config.theme.colors.base09;
+              green = config.theme.colors.base01;
+              yellow = config.theme.colors.base02;
+              blue = config.theme.colors.base04;
+              magenta = config.theme.colors.base06;
+              cyan = config.theme.colors.base0F;
+              white = config.theme.colors.base07;
            };
          };
          draw_bold_text_with_bright_colors = false;
--- a/modules/common/applications/default.nix
+++ b/modules/common/applications/default.nix
@ -3,9 +3,9 @@
  imports = [
    ./1password.nix
    ./alacritty.nix
-    ./calibre.nix
    ./discord.nix
    ./firefox.nix
+    ./kitty.nix
    ./media.nix
    ./obsidian.nix
    ./qbittorrent.nix
--- a/modules/common/applications/discord.nix
+++ b/modules/common/applications/discord.nix
@ -1,6 +1,15 @@
 { config, pkgs, lib, ... }: {

-  config = lib.mkIf config.gui.enable {
+  options = {
+    discord = {
+      enable = lib.mkEnableOption {
+        description = "Enable Discord.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.gui.enable && config.discord.enable) {
    unfreePackages = [ "discord" ];
    home-manager.users.${config.user} = {
      home.packages = with pkgs; [ discord ];
--- a/modules/common/applications/firefox.nix
+++ b/modules/common/applications/firefox.nix
@ -0,0 +1,164 @@
+{ config, pkgs, lib, ... }:
+
+{
+
+  options = {
+    firefox = {
+      enable = lib.mkEnableOption {
+        description = "Enable Firefox.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.gui.enable && config.firefox.enable) {
+
+    unfreePackages = [
+      (lib.mkIf config._1password.enable "onepassword-password-manager")
+      "okta-browser-plugin"
+    ];
+
+    home-manager.users.${config.user} = {
+
+      programs.firefox = {
+        enable = true;
+        package =
+          if pkgs.stdenv.isDarwin then pkgs.firefox-bin else pkgs.firefox;
+        profiles.default = {
+          id = 0;
+          name = "default";
+          isDefault = true;
+          extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+            ublock-origin
+            vimium
+            multi-account-containers
+            facebook-container
+            temporary-containers
+            (lib.mkIf config._1password.enable onepassword-password-manager)
+            okta-browser-plugin
+            sponsorblock
+            reddit-enhancement-suite
+            return-youtube-dislikes
+            markdownload
+            darkreader
+            snowflake
+            don-t-fuck-with-paste
+            i-dont-care-about-cookies
+            wappalyzer
+          ];
+          settings = {
+            "app.update.auto" = false;
+            "browser.aboutConfig.showWarning" = false;
+            "browser.warnOnQuit" = false;
+            "browser.quitShortcut.disabled" =
+              if pkgs.stdenv.isLinux then true else false;
+            "browser.theme.dark-private-windows" = true;
+            "browser.toolbars.bookmarks.visibility" = false;
+            "browser.startup.page" = 3; # Restore previous session
+            "browser.newtabpage.enabled" = false; # Make new tabs blank
+            "trailhead.firstrun.didSeeAboutWelcome" =
+              true; # Disable welcome splash
+            "dom.forms.autocomplete.formautofill" = false; # Disable autofill
+            "extensions.formautofill.creditCards.enabled" =
+              false; # Disable credit cards
+            "dom.payments.defaults.saveAddress" = false; # Disable address save
+            "general.autoScroll" = true; # Drag middle-mouse to scroll
+            "services.sync.prefs.sync.general.autoScroll" =
+              false; # Prevent disabling autoscroll
+            "extensions.pocket.enabled" = false;
+            "toolkit.legacyUserProfileCustomizations.stylesheets" =
+              true; # Allow userChrome.css
+            "layout.css.color-mix.enabled" = true;
+            "ui.systemUsesDarkTheme" =
+              if config.theme.dark == true then 1 else 0;
+          };
+          userChrome = ''
+            :root {
+              --focus-outline-color: ${config.theme.colors.base04} !important;
+              --toolbar-color: ${config.theme.colors.base07} !important;
+              --tab-min-height: 30px !important;
+            }
+            /* Background of tab bar */
+            .toolbar-items {
+              background-color: ${config.theme.colors.base00} !important;
+            }
+            /* Extra tab bar sides on macOS */
+            .titlebar-spacer {
+              background-color: ${config.theme.colors.base00} !important;
+            }
+            .titlebar-buttonbox-container {
+              background-color: ${config.theme.colors.base00} !important;
+            }
+            #tabbrowser-tabs {
+              border-inline-start: 0 !important;
+            }
+            /* Private Browsing indicator on macOS */
+            #private-browsing-indicator-with-label {
+              background-color: ${config.theme.colors.base00} !important;
+              margin-inline: 0 !important;
+              padding-inline: 7px;
+            }
+            /* Tabs themselves */
+            .tabbrowser-tab .tab-stack {
+              border-radius: 5px 5px 0 0;
+              overflow: hidden;
+              background-color: ${config.theme.colors.base00};
+              color: ${config.theme.colors.base06} !important;
+            }
+            .tab-content {
+              border-bottom: 2px solid color-mix(in srgb, var(--identity-tab-color) 40%, transparent);
+              border-radius: 5px 5px 0 0;
+              background-color: ${config.theme.colors.base00};
+              color: ${config.theme.colors.base06} !important;
+            }
+            .tab-content[selected=true] {
+              border-bottom: 2px solid color-mix(in srgb, var(--identity-tab-color) 25%, transparent);
+              background-color: ${config.theme.colors.base01} !important;
+              color: ${config.theme.colors.base07} !important;
+            }
+            /* Below tab bar */
+            #nav-bar {
+              background: ${config.theme.colors.base01} !important;
+            }
+            /* URL bar in nav bar */
+            #urlbar[focused=true] {
+              color: ${config.theme.colors.base07} !important;
+              background: ${config.theme.colors.base02} !important;
+              caret-color: ${config.theme.colors.base05} !important;
+            }
+            #urlbar:not([focused=true]) {
+              color: ${config.theme.colors.base04} !important;
+              background: ${config.theme.colors.base02} !important;
+            }
+            #urlbar ::-moz-selection {
+              color: ${config.theme.colors.base07} !important;
+              background: ${config.theme.colors.base02} !important;
+            }
+            #urlbar-input-container {
+              border: 1px solid ${config.theme.colors.base01} !important;
+            }
+            #urlbar-background {
+              background: ${config.theme.colors.base01} !important;
+            }
+            /* Text in URL bar */
+            #urlbar-input, #urlbar-scheme, .searchbar-textbox {
+              color: ${config.theme.colors.base07} !important;
+            }
+          '';
+          userContent = ''
+            @-moz-document url-prefix(about:blank) {
+              * {
+                background-color:${config.theme.colors.base01} !important;
+              }
+            }
+          '';
+
+          extraConfig = "";
+        };
+
+      };
+    };
+
+  };
+
+}
--- a/modules/common/applications/kitty.nix
+++ b/modules/common/applications/kitty.nix
@ -0,0 +1,88 @@
+{ config, pkgs, lib, ... }: {
+
+  options = {
+    kitty = {
+      enable = lib.mkEnableOption {
+        description = "Enable Kitty.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.gui.enable && config.kitty.enable) {
+    home-manager.users.${config.user} = {
+      # xsession.windowManager.i3.config.terminal = "kitty";
+      # programs.rofi.terminal = "${pkgs.kitty}/bin/kitty";
+      programs.kitty = {
+        enable = true;
+        environment = { };
+        extraConfig = "";
+        font.size = 14;
+        keybindings = {
+          "shift+enter" = "send_text all \\x1F";
+          "super+f" = "toggle_fullscreen";
+        };
+        settings = {
+
+          # Colors (adapted from: https://github.com/kdrag0n/base16-kitty/blob/master/templates/default-256.mustache)
+          background = config.theme.colors.base00;
+          foreground = config.theme.colors.base05;
+          selection_background = config.theme.colors.base05;
+          selection_foreground = config.theme.colors.base00;
+          url_color = config.theme.colors.base04;
+          cursor = config.theme.colors.base05;
+          active_border_color = config.theme.colors.base03;
+          inactive_border_color = config.theme.colors.base01;
+          active_tab_background = config.theme.colors.base00;
+          active_tab_foreground = config.theme.colors.base05;
+          inactive_tab_background = config.theme.colors.base01;
+          inactive_tab_foreground = config.theme.colors.base04;
+          tab_bar_background = config.theme.colors.base01;
+
+          # normal
+          color0 = config.theme.colors.base00;
+          color1 = config.theme.colors.base08;
+          color2 = config.theme.colors.base0B;
+          color3 = config.theme.colors.base0A;
+          color4 = config.theme.colors.base0D;
+          color5 = config.theme.colors.base0E;
+          color6 = config.theme.colors.base0C;
+          color7 = config.theme.colors.base05;
+
+          # bright
+          color8 = config.theme.colors.base03;
+          color9 = config.theme.colors.base08;
+          color10 = config.theme.colors.base0B;
+          color11 = config.theme.colors.base0A;
+          color12 = config.theme.colors.base0D;
+          color13 = config.theme.colors.base0E;
+          color14 = config.theme.colors.base0C;
+          color15 = config.theme.colors.base07;
+
+          # extended base16 colors
+          color16 = config.theme.colors.base09;
+          color17 = config.theme.colors.base0F;
+          color18 = config.theme.colors.base01;
+          color19 = config.theme.colors.base02;
+          color20 = config.theme.colors.base04;
+          color21 = config.theme.colors.base06;
+
+          # Scrollback
+          scrolling_lines = 10000;
+          scrollback_pager_history_size = 10; # MB
+          scrollback_pager = ''
+            ${pkgs.neovim}/bin/nvim -c 'setlocal nonumber nolist showtabline=0 foldcolumn=0|Man!' -c "autocmd VimEnter * normal G" -'';
+
+          # Window
+          window_padding_width = 6;
+
+          tab_bar_edge = "top";
+          tab_bar_style = "slant";
+
+          # Audio
+          enable_audio_bell = false;
+        };
+      };
+    };
+  };
+}
--- a/modules/common/applications/media.nix
+++ b/modules/common/applications/media.nix
@ -0,0 +1,30 @@
+{ config, pkgs, lib, ... }: {
+
+  options = {
+    media = {
+      enable = lib.mkEnableOption {
+        description = "Enable media programs.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.gui.enable && config.media.enable) {
+    home-manager.users.${config.user} = {
+      home.packages = with pkgs; [
+        mpv # Video viewer
+        sxiv # Image viewer
+        mupdf # PDF viewer
+        zathura # PDF viewer
+      ];
+
+      # Set default for opening PDFs
+      xdg.mimeApps.defaultApplications."application/pdf" =
+        [ "zathura.desktop" ];
+      xdg.mimeApps.defaultApplications."image/*" = [ "sxiv.desktop" ];
+
+    };
+
+  };
+
+}
--- a/modules/common/applications/nautilus.nix
+++ b/modules/common/applications/nautilus.nix
@ -0,0 +1,33 @@
+{ config, pkgs, lib, ... }: {
+
+  options = {
+    nautilus = {
+      enable = lib.mkEnableOption {
+        description = "Enable Nautilus file manager.";
+        default = false;
+      };
+    };
+  };
+
+  # Install Nautilus file manager
+  config = lib.mkIf (config.gui.enable && config.nautilus.enable) {
+    home-manager.users.${config.user} = {
+      home.packages = with pkgs; [
+        gnome.nautilus
+        gnome.sushi # Quick preview with spacebar
+      ];
+
+      # Set default for opening directories
+      xdg.mimeApps.defaultApplications."inode/directory" =
+        [ "nautilus.desktop" ];
+
+      programs.fish.functions = {
+        qr = {
+          body =
+            "${pkgs.qrencode}/bin/qrencode $argv[1] -o /tmp/qr.png | ${pkgs.gnome.sushi}/bin/sushi /tmp/qr.png";
+        };
+      };
+    };
+  };
+
+}
--- a/modules/common/applications/obsidian.nix
+++ b/modules/common/applications/obsidian.nix
@ -0,0 +1,19 @@
+{ config, pkgs, lib, ... }: {
+
+  options = {
+    obsidian = {
+      enable = lib.mkEnableOption {
+        description = "Enable Obsidian.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.gui.enable && config.obsidian.enable) {
+    unfreePackages = [ "obsidian" ];
+    home-manager.users.${config.user} = {
+      home.packages = with pkgs; [ obsidian ];
+    };
+  };
+
+}
--- a/modules/common/applications/qbittorrent.nix
+++ b/modules/common/applications/qbittorrent.nix
@ -0,0 +1,21 @@
+{ config, pkgs, lib, ... }: {
+
+  options = {
+    qbittorrent = {
+      enable = lib.mkEnableOption {
+        description = "Enable qBittorrent.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.gui.enable && config.qbittorrent.enable) {
+
+    home-manager.users.${config.user} = {
+
+      home.packages = with pkgs; [ qbittorrent ];
+
+    };
+  };
+
+}
--- a/modules/common/default.nix
+++ b/modules/common/default.nix
@ -1,11 +1,11 @@
 { config, lib, pkgs, ... }: {

  imports =
-    [ ../modules/shell ../modules/neovim ../modules/repositories/dotfiles.nix ];
+    [ ./applications ./mail ./neovim ./programming ./repositories ./shell ];

-  options = with lib; {
-    user = mkOption {
-      type = types.str;
+  options = {
+    user = lib.mkOption {
+      type = lib.types.str;
      description = "Primary user of the system";
    };
    fullName = lib.mkOption {
@ -23,21 +23,34 @@
    };
    identityFile = lib.mkOption {
      type = lib.types.str;
-      description = "Path to existing identity file.";
+      description = "Path to existing private key file.";
      default = "/etc/ssh/ssh_host_ed25519_key";
    };
    gui = {
-      enable = mkEnableOption {
-        description = "Enable graphics";
+      enable = lib.mkEnableOption {
+        description = "Enable graphics.";
        default = false;
      };
    };
-    colorscheme = mkOption {
-      type = types.attrs;
-      description = "Base16 color scheme";
+    theme = {
+      colors = lib.mkOption {
+        type = lib.types.attrs;
+        description = "Base16 color scheme.";
+        default = (import ../colorscheme/gruvbox).dark;
+      };
+      dark = lib.mkOption {
+        type = lib.types.bool;
+        description = "Enable dark mode.";
+        default = true;
+      };
    };
-    homePath = mkOption {
-      type = types.path;
+
+    # colorscheme = lib.mkOption {
+    #   type = types.attrs;
+    #   description = "Base16 color scheme";
+    # };
+    homePath = lib.mkOption {
+      type = lib.types.path;
      description = "Path of user's home directory.";
      default = builtins.toPath (if pkgs.stdenv.isDarwin then
        "/Users/${config.user}"
@ -45,27 +58,30 @@
        "/home/${config.user}");
    };

-    dotfilesPath = mkOption {
-      type = types.path;
+    dotfilesPath = lib.mkOption {
+      type = lib.types.path;
      description = "Path of dotfiles repository.";
      default = config.homePath + "/dev/personal/dotfiles";
    };
-    dotfilesRepo = mkOption {
-      type = types.str;
+    dotfilesRepo = lib.mkOption {
+      type = lib.types.str;
      description = "Link to dotfiles repository.";
    };
-    unfreePackages = mkOption {
-      type = types.listOf types.str;
+    unfreePackages = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
      description = "List of unfree packages to allow.";
      default = [ ];
    };
  };

-  config = let stateVersion = "22.11";
+  config = let stateVersion = "23.05";
  in {

    # Enable features in Nix commands
-    nix.extraOptions = "experimental-features = nix-command flakes";
+    nix.extraOptions = ''
+      experimental-features = nix-command flakes
+      warn-dirty = false
+    '';

    # Basic common system packages for all devices
    environment.systemPackages = with pkgs; [ git vim wget curl ];
--- a/modules/common/mail/aerc.nix
+++ b/modules/common/mail/aerc.nix
@ -0,0 +1,189 @@
+{ config, pkgs, lib, ... }: {
+
+  options.mail.aerc.enable = lib.mkEnableOption "Aerc email.";
+
+  config = lib.mkIf config.mail.aerc.enable {
+
+    home-manager.users.${config.user} = {
+
+      home.packages = with pkgs; [
+        w3m # Render HTML
+        dante # Socksify for rendering HTML
+      ];
+
+      programs.aerc = {
+        enable = true;
+        extraBinds = {
+          # Binds are of the form <key sequence> = <command to run>
+          # To use '=' in a key sequence, substitute it with "Eq": "<Ctrl+Eq>"
+          # If you wish to bind #, you can wrap the key sequence in quotes: "#" = quit
+          global = {
+            "<C-p>" = ":prev-tab<Enter>";
+            "<C-n>" = ":next-tab <Enter>";
+            "<C-t>" = ":term<Enter>";
+            "?" = ":help keys<Enter>";
+          };
+
+          messages = {
+            q = ":quit<Enter>";
+
+            j = ":next <Enter>";
+            "<Down>" = ":next<Enter>";
+            "<C-d>" = ":next 50%<Enter>";
+            "<C-f>" = ":next 100%<Enter>";
+            "<PgDn>" = ":next 100%<Enter>";
+
+            k = ":prev <Enter>";
+            "<Up>" = ":prev<Enter>";
+            "<C-u>" = ":prev 50%<Enter>";
+            "<C-b>" = ":prev 100%<Enter>";
+            "<PgUp>" = ":prev 100%<Enter>";
+            g = ":select 0 <Enter>";
+            G = ":select -1<Enter>";
+
+            J = ":next-folder <Enter>";
+            K = ":prev-folder<Enter>";
+            H = ":collapse-folder<Enter>";
+            L = ":expand-folder<Enter>";
+
+            v = ":mark -t<Enter>";
+            V = ":mark -v<Enter>";
+
+            T = ":toggle-threads<Enter>";
+
+            "<Enter>" = ":view<Enter>";
+            d = ":prompt 'Really delete this message?' 'delete-message'<Enter>";
+            D = ":move Trash<Enter>";
+            A = ":archive flat<Enter>";
+
+            C = ":compose<Enter>";
+
+            rr = ":reply -a<Enter>";
+            rq = ":reply -aq<Enter>";
+            Rr = ":reply<Enter>";
+            Rq = ":reply -q<Enter>";
+
+            c = ":cf<space>";
+            "$" = ":term<space>";
+            "!" = ":term<space>";
+            "|" = ":pipe<space>";
+
+            "/" = ":search<space>";
+            "\\" = ":filter <space>";
+            n = ":next-result<Enter>";
+            N = ":prev-result<Enter>";
+            "<Esc>" = ":clear<Enter>";
+          };
+
+          "messages:folder=Drafts" = { "<Enter>" = ":recall<Enter>"; };
+
+          view = {
+            "/" = ":toggle-key-passthrough <Enter> /";
+            q = ":close<Enter>";
+            O = ":open<Enter>";
+            S = ":save<space>";
+            "|" = ":pipe<space>";
+            D = ":move Trash<Enter>";
+            A = ":archive flat<Enter>";
+
+            "<C-l>" = ":open-link <space>";
+
+            f = ":forward <Enter>";
+            rr = ":reply -a<Enter>";
+            rq = ":reply -aq<Enter>";
+            Rr = ":reply<Enter>";
+            Rq = ":reply -q<Enter>";
+
+            H = ":toggle-headers<Enter>";
+            "<C-k>" = ":prev-part<Enter>";
+            "<C-j>" = ":next-part<Enter>";
+            J = ":next <Enter>";
+            K = ":prev<Enter>";
+          };
+
+          "view::passthrough" = {
+            "$noinherit" = "true";
+            "$ex" = "<C-x>";
+            "<Esc>" = ":toggle-key-passthrough<Enter>";
+          };
+
+          compose = {
+            # Keybindings used when the embedded terminal is not selected in the compose
+            # view
+            "$noinherit" = "true";
+            "$ex" = "<C-x>";
+            "<C-k>" = ":prev-field<Enter>";
+            "<C-j>" = ":next-field<Enter>";
+            "<A-p>" = ":switch-account -p<Enter>";
+            "<A-n>" = ":switch-account -n<Enter>";
+            "<tab>" = ":next-field<Enter>";
+            "<C-p>" = ":prev-tab<Enter>";
+            "<C-n>" = ":next-tab<Enter>";
+          };
+
+          "compose::editor" = {
+            # Keybindings used when the embedded terminal is selected in the compose view
+            "$noinherit" = "true";
+            "$ex" = "<C-x>";
+            "<C-k>" = ":prev-field<Enter>";
+            "<C-j>" = ":next-field<Enter>";
+            "<C-p>" = ":prev-tab<Enter>";
+            "<C-n>" = ":next-tab<Enter>";
+          };
+
+          "compose::review" = {
+            # Keybindings used when reviewing a message to be sent
+            y = ":send <Enter>";
+            n = ":abort<Enter>";
+            p = ":postpone<Enter>";
+            q = ":choose -o d discard abort -o p postpone postpone<Enter>";
+            e = ":edit<Enter>";
+            a = ":attach<space>";
+            d = ":detach<space>";
+          };
+
+          terminal = {
+            "$noinherit" = "true";
+            "$ex" = "<C-x>";
+            "<C-p>" = ":prev-tab<Enter>";
+            "<C-n>" = ":next-tab<Enter>";
+          };
+
+        };
+        extraConfig = {
+          general.unsafe-accounts-conf = true;
+          viewer = { pager = "${pkgs.less}/bin/less -R"; };
+          filters = {
+            "text/plain" =
+              "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/colorize";
+            "text/calendar" =
+              "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/calendar";
+            "text/html" =
+              "${pkgs.aerc}/share/aerc/filters/html"; # Requires w3m, dante
+            # "text/html" =
+            #   "${pkgs.aerc}/share/aerc/filters/html | ${pkgs.aerc}/share/aerc/filters/colorize";
+            # "text/*" =
+            #   ''${pkgs.bat}/bin/bat -fP --file-name="$AERC_FILENAME "'';
+            "message/delivery-status" =
+              "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/colorize";
+            "message/rfc822" =
+              "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/colorize";
+            "application/x-sh" = "${pkgs.bat}/bin/bat -fP -l sh";
+            "application/pdf" = "${pkgs.zathura}/bin/zathura -";
+          };
+        };
+      };
+      accounts.email.accounts.home.aerc = {
+        enable = true;
+        extraAccounts = {
+          check-mail = "5m";
+          check-mail-cmd = "${pkgs.isync}/bin/mbsync -a";
+        };
+      };
+
+      programs.fish.shellAbbrs = { ae = "aerc"; };
+
+    };
+
+  };
+}
--- a/modules/common/mail/default.nix
+++ b/modules/common/mail/default.nix
@ -1,41 +1,38 @@
 { config, pkgs, lib, ... }: {

-  # Required to place identity file on machine
-  imports = [ ../shell/age.nix ];
+  imports = [ ./himalaya.nix ./aerc.nix ];

  options = {
-    mailUser = lib.mkOption {
+    mail.enable = lib.mkEnableOption "Mail service.";
+    mail.user = lib.mkOption {
      type = lib.types.str;
      description = "User name for the email address.";
      default = config.user;
    };
-    mailServer = lib.mkOption {
+    mail.server = lib.mkOption {
      type = lib.types.str;
      description = "Server name for the email address.";
    };
  };

-  config = {
+  config = lib.mkIf config.mail.enable {

    home-manager.users.${config.user} = {
-
-      programs.himalaya = { enable = true; };
      programs.mbsync = { enable = true; };
      services.mbsync = lib.mkIf pkgs.stdenv.isLinux {
        enable = true;
        frequency = "*:0/5";
      };
-
      accounts.email = {
        maildirBasePath = "${config.homePath}/mail";
        accounts = {
-          home = let address = "${config.mailUser}@${config.mailServer}";
+          home = let address = "${config.mail.user}@${config.mail.server}";
          in {
            userName = address;
            realName = config.fullName;
            primary = true;
            inherit address;
-            aliases = map (mailUser: "${mailUser}@${config.mailServer}") [
+            aliases = map (user: "${user}@${config.mail.server}") [
              "me"
              "hey"
              "admin"
@ -44,13 +41,6 @@
            flavor = "plain";
            folders = { };
            getmail = { };
-            himalaya = {
-              enable = true;
-              settings = {
-                downloads-dir = config.userDirs.download;
-                smtp-insecure = true;
-              };
-            };
            imap = {
              host = "imap.purelymail.com";
              port = 993;
@ -88,8 +78,6 @@
        };
      };

-      programs.fish.shellAbbrs = { hi = "himalaya"; };
-
    };

  };
--- a/modules/common/mail/himalaya.nix
+++ b/modules/common/mail/himalaya.nix
@ -0,0 +1,25 @@
+{ config, lib, ... }: {
+
+  options.mail.himalaya.enable = lib.mkEnableOption "Himalaya email.";
+
+  config = lib.mkIf config.mail.himalaya.enable {
+
+    home-manager.users.${config.user} = {
+
+      programs.himalaya = { enable = true; };
+      accounts.email.accounts.home.himalaya = {
+        enable = true;
+        backend = "imap";
+        sender = "smtp";
+        settings = {
+          downloads-dir = config.userDirs.download;
+          smtp-insecure = true;
+        };
+      };
+
+      programs.fish.shellAbbrs = { hi = "himalaya"; };
+
+    };
+
+  };
+}
--- a/modules/common/neovim/config/bufferline.nix
+++ b/modules/common/neovim/config/bufferline.nix
@ -0,0 +1,22 @@
+{ pkgs, ... }: {
+  plugins = [
+    pkgs.vimPlugins.bufferline-nvim
+    pkgs.vimPlugins.vim-bbye # Better closing of buffers
+  ];
+  setup.bufferline = {
+    options = {
+      diagnostics = "nvim_lsp";
+      always_show_bufferline = false;
+      separator_style = "slant";
+      offsets = [{ filetype = "NvimTree"; }];
+    };
+  };
+  lua = ''
+    -- Move buffers
+    vim.keymap.set("n", "L", ":BufferLineCycleNext<CR>", { silent = true })
+    vim.keymap.set("n", "H", ":BufferLineCyclePrev<CR>", { silent = true })
+
+    -- Kill buffer
+    vim.keymap.set("n", "<Leader>x", " :Bdelete<CR>", { silent = true })
+  '';
+}
--- a/modules/common/neovim/config/completion.nix
+++ b/modules/common/neovim/config/completion.nix
@ -0,0 +1,155 @@
+{ pkgs, dsl, ... }: {
+
+  plugins = [
+    pkgs.vimPlugins.cmp-nvim-lsp
+    pkgs.vimPlugins.cmp-buffer
+    pkgs.vimPlugins.cmp-path
+    pkgs.vimPlugins.cmp-cmdline
+    pkgs.vimPlugins.cmp-nvim-lua
+    pkgs.vimPlugins.luasnip
+    pkgs.vimPlugins.cmp_luasnip
+    pkgs.vimPlugins.cmp-rg
+    pkgs.vimPlugins.friendly-snippets
+  ];
+
+  use.cmp.setup = dsl.callWith {
+
+    # Disable in telescope buffers
+    enabled = dsl.rawLua ''
+      function()
+          if vim.bo.buftype == "prompt" then
+              return false
+          end
+          return true
+      end
+    '';
+
+    snippet.expand = dsl.rawLua ''
+      function(args)
+          require("luasnip").lsp_expand(args.body)
+      end
+    '';
+
+    mapping = {
+      "['<C-n>']" = dsl.rawLua
+        "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Insert })";
+      "['<C-p>']" = dsl.rawLua
+        "require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Insert })";
+      "['<Down>']" = dsl.rawLua
+        "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Select })";
+      "['<Up>']" = dsl.rawLua
+        "require('cmp').mapping.select_prev_item({ behavior = require('cmp').SelectBehavior.Select })";
+      "['<C-d>']" = dsl.rawLua "require('cmp').mapping.scroll_docs(-4)";
+      "['<C-f>']" = dsl.rawLua "require('cmp').mapping.scroll_docs(4)";
+      "['<C-e>']" = dsl.rawLua "require('cmp').mapping.abort()";
+      "['<CR>']" = dsl.rawLua
+        "require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Replace, select = true, })";
+      "['<C-r>']" = dsl.rawLua
+        "require('cmp').mapping.confirm({ behavior = require('cmp').ConfirmBehavior.Replace, select = true, })";
+      "['<Esc>']" = dsl.rawLua ''
+        function(_)
+            cmp.mapping({
+                i = cmp.mapping.abort(),
+                c = cmp.mapping.close(),
+            })
+            vim.cmd("stopinsert") --- Abort and leave insert mode
+        end
+      '';
+      "['<C-l>']" = dsl.rawLua ''
+        cmp.mapping(function(_)
+            if require("luasnip").expand_or_jumpable() then
+                require("luasnip").expand_or_jump()
+            end
+        end, { "i", "s" })
+      '';
+    };
+
+    sources = [
+      { name = "nvim_lua"; }
+      { name = "nvim_lsp"; }
+      { name = "luasnip"; }
+      { name = "path"; }
+      {
+        name = "buffer";
+        keyword_length = 3;
+        max_item_count = 10;
+      }
+      {
+        name = "rg";
+        keyword_length = 6;
+        max_item_count = 10;
+        option = { additional_arguments = "--ignore-case"; };
+      }
+    ];
+
+    formatting = {
+      fields = [ "kind" "abbr" "menu" ];
+      format = dsl.rawLua ''
+        function(entry, vim_item)
+            local kind_icons = {
+                Text = "",
+                Method = "m",
+                Function = "",
+                Constructor = "",
+                Field = "",
+                Variable = "",
+                Class = "",
+                Interface = "",
+                Module = "",
+                Property = "",
+                Unit = "",
+                Value = "",
+                Enum = "",
+                Keyword = "",
+                Snippet = "",
+                Color = "",
+                File = "",
+                Reference = "",
+                Folder = "",
+                EnumMember = "",
+                Constant = "",
+                Struct = "",
+                Event = "",
+                Operator = "",
+                TypeParameter = "",
+            }
+            vim_item.kind = string.format("%s", kind_icons[vim_item.kind])
+            vim_item.menu = ({
+                luasnip = "[Snippet]",
+                buffer = "[Buffer]",
+                path = "[Path]",
+                rg = "[Grep]",
+                nvim_lsp = "[LSP]",
+                nvim_lua = "[Lua]",
+            })[entry.source.name]
+            return vim_item
+        end
+      '';
+    };
+
+    experimental = {
+      native_menu = false; # Use cmp menu instead of Vim menu
+      ghost_text = true; # Show preview auto-completion
+    };
+
+  };
+
+  lua = ''
+    -- Use buffer source for `/`
+    require('cmp').setup.cmdline("/", {
+        sources = {
+            { name = "buffer", keyword_length = 5 },
+        },
+    })
+
+    -- Use cmdline & path source for ':'
+    require('cmp').setup.cmdline(":", {
+        sources = require('cmp').config.sources({
+            { name = "path" },
+        }, {
+            { name = "cmdline" },
+        }),
+    })
+  '';
+
+}
--- a/modules/common/neovim/config/gitsigns.lua
+++ b/modules/common/neovim/config/gitsigns.lua
@ -0,0 +1,35 @@
+vim.keymap.set("", "<Space>", "<Nop>", { silent = true })
+vim.g.mapleader = " "
+vim.g.maplocalleader = " "
+
+local gitsigns = require("gitsigns")
+vim.keymap.set("n", "<Leader>gB", gitsigns.blame_line)
+vim.keymap.set("n", "<Leader>gp", gitsigns.preview_hunk)
+vim.keymap.set("v", "<Leader>gp", gitsigns.preview_hunk)
+vim.keymap.set("n", "<Leader>gd", gitsigns.diffthis)
+vim.keymap.set("v", "<Leader>gd", gitsigns.diffthis)
+vim.keymap.set("n", "<Leader>rgf", gitsigns.reset_buffer)
+vim.keymap.set("v", "<Leader>hs", gitsigns.stage_hunk)
+vim.keymap.set("n", "<Leader>hr", gitsigns.reset_hunk)
+vim.keymap.set("v", "<Leader>hr", gitsigns.reset_hunk)
+
+-- Navigation
+vim.keymap.set("n", "]g", function()
+    if vim.wo.diff then
+        return "]g"
+    end
+    vim.schedule(function()
+        gitsigns.next_hunk()
+    end)
+    return "<Ignore>"
+end, { expr = true })
+
+vim.keymap.set("n", "[g", function()
+    if vim.wo.diff then
+        return "[g"
+    end
+    vim.schedule(function()
+        gitsigns.prev_hunk()
+    end)
+    return "<Ignore>"
+end, { expr = true })
--- a/modules/common/neovim/config/gitsigns.nix
+++ b/modules/common/neovim/config/gitsigns.nix
@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  plugins = [ pkgs.vimPlugins.gitsigns-nvim ];
+  setup.gitsigns = { };
+  lua = builtins.readFile ./gitsigns.lua;
+}
--- a/modules/common/neovim/config/lsp.lua
+++ b/modules/common/neovim/config/lsp.lua
@ -0,0 +1,10 @@
+vim.keymap.set("n", "gd", vim.lsp.buf.definition)
+vim.keymap.set("n", "gT", vim.lsp.buf.type_definition)
+vim.keymap.set("n", "gi", vim.lsp.buf.implementation)
+vim.keymap.set("n", "gh", vim.lsp.buf.hover)
+-- vim.keymap.set("n", "gr", telescope.lsp_references)
+vim.keymap.set("n", "<Leader>R", vim.lsp.buf.rename)
+vim.keymap.set("n", "]e", vim.diagnostic.goto_next)
+vim.keymap.set("n", "[e", vim.diagnostic.goto_prev)
+vim.keymap.set("n", "<Leader>de", vim.diagnostic.open_float)
+vim.keymap.set("n", "<Leader>E", vim.lsp.buf.code_action)
--- a/modules/common/neovim/config/lsp.nix
+++ b/modules/common/neovim/config/lsp.nix
@ -0,0 +1,66 @@
+{ pkgs, dsl, ... }: {
+
+  plugins = [
+    pkgs.vimPlugins.nvim-lspconfig
+    pkgs.vimPlugins.lsp-colors-nvim
+    pkgs.vimPlugins.null-ls-nvim
+  ];
+
+  use.lspconfig.sumneko_lua.setup = dsl.callWith {
+    settings = { Lua = { diagnostics = { globals = [ "vim" "hs" ]; }; }; };
+    capabilities = dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
+    cmd = [ "${pkgs.sumneko-lua-language-server}/bin/lua-language-server" ];
+  };
+
+  use.lspconfig.nil_ls.setup = dsl.callWith {
+    cmd = [ "${pkgs.nil}/bin/nil" ];
+    capabilities = dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
+  };
+
+  use.lspconfig.pyright.setup = dsl.callWith {
+    cmd = [ "${pkgs.pyright}/bin/pyright-langserver" "--stdio" ];
+  };
+
+  use.lspconfig.terraformls.setup =
+    dsl.callWith { cmd = [ "${pkgs.terraform-ls}/bin/terraform-ls" "serve" ]; };
+
+  vim.api.nvim_create_augroup = dsl.callWith [ "LspFormatting" { } ];
+
+  lua = ''
+    ${builtins.readFile ./lsp.lua}
+
+    require("null-ls").setup({
+        sources = {
+            require("null-ls").builtins.formatting.stylua.with({ command = "${pkgs.stylua}/bin/stylua" }),
+            require("null-ls").builtins.formatting.black.with({ command = "${pkgs.black}/bin/black" }),
+            require("null-ls").builtins.diagnostics.flake8.with({ command = "${pkgs.python310Packages.flake8}/bin/flake8" }),
+            require("null-ls").builtins.formatting.fish_indent.with({ command = "${pkgs.fish}/bin/fish_indent" }),
+            require("null-ls").builtins.formatting.nixfmt.with({ command = "${pkgs.nixfmt}/bin/nixfmt" }),
+            require("null-ls").builtins.formatting.rustfmt.with({ command = "${pkgs.rustfmt}/bin/rustfmt" }),
+            require("null-ls").builtins.diagnostics.shellcheck.with({ command = "${pkgs.shellcheck}/bin/shellcheck" }),
+            require("null-ls").builtins.formatting.shfmt.with({
+                command = "${pkgs.shfmt}/bin/shfmt",
+                extra_args = { "-i", "4", "-ci" },
+            }),
+            require("null-ls").builtins.formatting.terraform_fmt.with({
+                command = "${pkgs.terraform}/bin/terraform",
+                extra_filetypes = { "hcl" },
+            }),
+        },
+
+        on_attach = function(client, bufnr)
+            if client.supports_method("textDocument/formatting") then
+                vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
+                vim.api.nvim_create_autocmd("BufWritePre", {
+                    group = augroup,
+                    buffer = bufnr,
+                    callback = function()
+                        vim.lsp.buf.format({ bufnr = bufnr })
+                    end,
+                })
+            end
+        end,
+    })
+  '';
+
+}
--- a/modules/common/neovim/config/misc.nix
+++ b/modules/common/neovim/config/misc.nix
@ -0,0 +1,70 @@
+{ pkgs, dsl, lib, ... }: {
+  plugins = [
+    pkgs.vimPlugins.vim-surround # Keybinds for surround characters
+    pkgs.vimPlugins.vim-eunuch # File manipulation commands
+    pkgs.vimPlugins.vim-fugitive # Git commands
+    pkgs.vimPlugins.vim-repeat # Better repeat using .
+    pkgs.vimPlugins.comment-nvim # Smart comment commands
+    pkgs.vimPlugins.impatient-nvim # Faster load times
+    pkgs.vimPlugins.glow-nvim # Markdown preview popup
+    pkgs.vimPlugins.nvim-colorizer-lua # Hex color previews
+  ];
+
+  setup.Comment = { };
+  setup.colorizer = { };
+
+  vim.o = {
+    termguicolors = true; # Set to truecolor
+    hidden = true; # Don't unload buffers when leaving them
+    list = true; # Reveal whitespace with dashes
+    expandtab = true; # Tabs into spaces
+    shiftwidth = 4; # Amount to shift with > key
+    softtabstop = 4; # Amount to shift with <TAB> key
+    ignorecase = true; # Ignore case when searching
+    smartcase = true; # Check case when using capitals in search
+    infercase = true; # Don't match cases when completing suggestions
+    incsearch = true; # Search while typing
+    visualbell = true; # No sounds
+    scrolljump = 1; # Number of lines to scroll
+    scrolloff = 3; # Margin of lines to see while scrolling
+    splitright = true; # Vertical splits on the right side
+    splitbelow = true; # Horizontal splits on the bottom side
+    pastetoggle = "<F3>"; # Use F3 to enter raw paste mode
+    clipboard = "unnamedplus"; # Uses system clipboard for yanking
+    updatetime = 300; # Faster diagnostics
+    mouse = "nv"; # Mouse interaction / scrolling
+    inccommand = "split"; # Live preview search and replace
+  };
+
+  vim.wo = {
+    number = true; # Show line numbers
+    relativenumber = true; # Relative numbers instead of absolute
+  };
+
+  # Better backup, swap and undo storage
+  vim.o.backup = true; # Easier to recover and more secure
+  vim.bo.swapfile = false; # Instead of swaps, create backups
+  vim.bo.undofile = true; # Keeps undos after quit
+  vim.o.backupdir = dsl.rawLua ''vim.fn.stdpath("cache") .. "/backup"'';
+
+  # Required for nvim-cmp completion
+  vim.opt.completeopt = [ "menu" "menuone" "noselect" ];
+
+  lua = lib.mkBefore ''
+    require("impatient")
+    ${builtins.readFile ../lua/keybinds.lua};
+    ${builtins.readFile ../lua/settings.lua};
+  '';
+
+  vimscript = ''
+    " Remember last position when reopening file
+    au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal! g`\"" | endif
+
+    " LaTeX options
+    au FileType tex inoremap ;bf \textbf{}<Esc>i
+    au BufWritePost *.tex silent! execute "!pdflatex -output-directory=%:p:h % >/dev/null 2>&1" | redraw!
+
+    " Flash highlight when yanking
+    au TextYankPost * silent! lua vim.highlight.on_yank { timeout = 250 }
+  '';
+}
--- a/modules/common/neovim/config/statusline.nix
+++ b/modules/common/neovim/config/statusline.nix
@ -0,0 +1,9 @@
+{ pkgs, ... }: {
+  plugins = [ pkgs.vimPlugins.lualine-nvim ];
+  setup.lualine = {
+    options = {
+      theme = "gruvbox";
+      icons_enabled = true;
+    };
+  };
+}
--- a/modules/common/neovim/config/syntax.nix
+++ b/modules/common/neovim/config/syntax.nix
@ -0,0 +1,52 @@
+{ pkgs, ... }: {
+
+  plugins = [
+    (pkgs.vimPlugins.nvim-treesitter.withPlugins (_plugins:
+      with pkgs.tree-sitter-grammars; [
+        tree-sitter-hcl
+        tree-sitter-python
+        tree-sitter-lua
+        tree-sitter-nix
+        tree-sitter-fish
+        tree-sitter-toml
+        tree-sitter-yaml
+        tree-sitter-json
+      ]))
+    pkgs.vimPlugins.vim-matchup # Better % jumping in languages
+    pkgs.vimPlugins.nginx-vim
+    pkgs.vimPlugins.vim-helm
+    pkgs.vimPlugins.vim-puppet
+  ];
+
+  setup."nvim-treesitter.configs" = {
+    highlight = { enable = true; };
+    indent = { enable = true; };
+
+    textobjects = {
+      select = {
+        enable = true;
+        lookahead = true; # Jump forward automatically
+
+        keymaps = {
+          "['af']" = "@function.outer";
+          "['if']" = "@function.inner";
+          "['ac']" = "@class.outer";
+          "['ic']" = "@class.inner";
+          "['al']" = "@loop.outer";
+          "['il']" = "@loop.inner";
+          "['aa']" = "@call.outer";
+          "['ia']" = "@call.inner";
+          "['ar']" = "@parameter.outer";
+          "['ir']" = "@parameter.inner";
+          "['aC']" = "@comment.outer";
+          "['iC']" = "@comment.outer";
+          "['a/']" = "@comment.outer";
+          "['i/']" = "@comment.outer";
+          "['a;']" = "@statement.outer";
+          "['i;']" = "@statement.outer";
+        };
+      };
+    };
+  };
+
+}
--- a/modules/common/neovim/config/telescope.lua
+++ b/modules/common/neovim/config/telescope.lua
@ -0,0 +1,69 @@
+local telescope = require("telescope.builtin")
+vim.keymap.set("n", "<Leader>k", telescope.keymaps)
+vim.keymap.set("n", "<Leader>/", telescope.live_grep)
+vim.keymap.set("n", "<Leader>ff", telescope.find_files)
+vim.keymap.set("n", "<Leader>fp", telescope.git_files)
+vim.keymap.set("n", "<Leader>fw", telescope.grep_string)
+vim.keymap.set("n", "<Leader>b", telescope.buffers)
+vim.keymap.set("n", "<Leader>hh", telescope.help_tags)
+vim.keymap.set("n", "<Leader>fr", telescope.oldfiles)
+vim.keymap.set("n", "<Leader>cc", telescope.commands)
+vim.keymap.set("n", "<Leader>gc", telescope.git_commits)
+vim.keymap.set("n", "<Leader>gf", telescope.git_bcommits)
+vim.keymap.set("n", "<Leader>gb", telescope.git_branches)
+vim.keymap.set("n", "<Leader>gs", telescope.git_status)
+vim.keymap.set("n", "<Leader>s", telescope.current_buffer_fuzzy_find)
+
+vim.keymap.set("n", "<Leader>N", function()
+    local opts = {
+        prompt_title = "Search Notes",
+        cwd = "$NOTES_PATH",
+    }
+    telescope.live_grep(opts)
+end)
+
+vim.keymap.set("n", "<Leader>fN", function()
+    local opts = {
+        prompt_title = "Find Notes",
+        cwd = "$NOTES_PATH",
+    }
+    telescope.find_files(opts)
+end)
+
+vim.keymap.set("n", "<Leader>cr", function()
+    local opts = require("telescope.themes").get_ivy({
+        layout_config = {
+            bottom_pane = {
+                height = 15,
+            },
+        },
+    })
+    telescope.command_history(opts)
+end)
+
+-- Zoxide
+vim.keymap.set("n", "<Leader>fz", require("telescope").extensions.zoxide.list)
+
+-- Project
+require("telescope").load_extension("project")
+vim.keymap.set("n", "<C-p>", function()
+    local opts = require("telescope.themes").get_ivy({
+        layout_config = {
+            bottom_pane = {
+                height = 10,
+            },
+        },
+    })
+    require("telescope").extensions.project.project(opts)
+end)
+
+-- File browser
+require("telescope").load_extension("file_browser")
+vim.keymap.set("n", "<Leader>fa", require("telescope").extensions.file_browser.file_browser)
+vim.keymap.set("n", "<Leader>fD", function()
+    local opts = {
+        prompt_title = "Find Downloads",
+        cwd = "~/downloads",
+    }
+    require("telescope").extensions.file_browser.file_browser(opts)
+end)
--- a/modules/common/neovim/config/telescope.nix
+++ b/modules/common/neovim/config/telescope.nix
@ -0,0 +1,34 @@
+{ pkgs, dsl, ... }: {
+
+  plugins = [
+    pkgs.vimPlugins.telescope-nvim
+    pkgs.vimPlugins.telescope-project-nvim
+    pkgs.vimPlugins.telescope-fzy-native-nvim
+    pkgs.vimPlugins.telescope-file-browser-nvim
+    pkgs.vimPlugins.telescope-zoxide
+  ];
+
+  setup.telescope = {
+    defaults = {
+      mappings = {
+        i = {
+          "['<esc>']" = dsl.rawLua "require('telescope.actions').close";
+          "['<C-h>']" = "which_key";
+        };
+      };
+    };
+    pickers = {
+      find_files = { theme = "ivy"; };
+      oldfiles = { theme = "ivy"; };
+      buffers = { theme = "dropdown"; };
+    };
+    extensions = {
+      fzy_native = { };
+      zoxide = { };
+      project = { base_dirs = [ "~/dev" ]; };
+    };
+  };
+
+  lua = builtins.readFile ./telescope.lua;
+
+}
--- a/modules/common/neovim/config/toggleterm.lua
+++ b/modules/common/neovim/config/toggleterm.lua
@ -0,0 +1,40 @@
+vim.keymap.set("t", "<A-CR>", "<C-\\><C-n>") --- Exit terminal mode
+
+-- Only set these keymaps for toggleterm
+vim.api.nvim_create_autocmd("TermOpen", {
+    pattern = "term://*toggleterm#*",
+    callback = function()
+        -- vim.keymap.set("t", "<Esc>", "<C-\\><C-n>") --- Exit terminal mode
+        vim.keymap.set("t", "<C-h>", "<C-\\><C-n><C-w>h")
+        vim.keymap.set("t", "<C-j>", "<C-\\><C-n><C-w>j")
+        vim.keymap.set("t", "<C-k>", "<C-\\><C-n><C-w>k")
+        vim.keymap.set("t", "<C-l>", "<C-\\><C-n><C-w>l")
+    end,
+})
+
+local terminal = require("toggleterm.terminal").Terminal
+
+local basicterminal = terminal:new()
+function TERM_TOGGLE()
+    basicterminal:toggle()
+end
+
+local nixpkgs = terminal:new({ cmd = "nix repl '<nixpkgs>'" })
+function NIXPKGS_TOGGLE()
+    nixpkgs:toggle()
+end
+
+local gitwatch = terminal:new({ cmd = "fish --interactive --init-command 'gh run watch'" })
+function GITWATCH_TOGGLE()
+    gitwatch:toggle()
+end
+
+local k9s = terminal:new({ cmd = "k9s" })
+function K9S_TOGGLE()
+    k9s:toggle()
+end
+
+vim.keymap.set("n", "<Leader>t", TERM_TOGGLE)
+vim.keymap.set("n", "<Leader>P", NIXPKGS_TOGGLE)
+vim.keymap.set("n", "<Leader>gw", GITWATCH_TOGGLE)
+vim.keymap.set("n", "<Leader>9", K9S_TOGGLE)
--- a/modules/common/neovim/config/toggleterm.nix
+++ b/modules/common/neovim/config/toggleterm.nix
@ -0,0 +1,13 @@
+{ pkgs, dsl, ... }: {
+
+  plugins = [ pkgs.vimPlugins.toggleterm-nvim ];
+
+  use.toggleterm.setup = dsl.callWith {
+    open_mapping = dsl.rawLua "[[<c-\\>]]";
+    hide_numbers = true;
+    direction = "float";
+  };
+
+  lua = builtins.readFile ./toggleterm.lua;
+
+}
--- a/modules/common/neovim/config/tree.nix
+++ b/modules/common/neovim/config/tree.nix
@ -0,0 +1,77 @@
+{ pkgs, dsl, ... }: {
+
+  plugins = [ pkgs.vimPlugins.nvim-tree-lua pkgs.vimPlugins.nvim-web-devicons ];
+
+  # Disable netrw eagerly
+  # https://github.com/kyazdani42/nvim-tree.lua/commit/fb8735e96cecf004fbefb086ce85371d003c5129
+  vim.g = {
+    loaded = 1;
+    loaded_netrwPlugin = 1;
+  };
+
+  setup.nvim-tree = {
+    disable_netrw = true;
+    hijack_netrw = true;
+    update_focused_file = {
+      enable = true;
+      update_cwd = true;
+      ignore_list = { };
+    };
+    diagnostics = {
+      enable = true;
+      icons = {
+        hint = "";
+        info = "";
+        warning = "";
+        error = "";
+      };
+    };
+    renderer = {
+      icons = {
+        glyphs = {
+          git = {
+            unstaged = "~";
+            staged = "+";
+            unmerged = "";
+            renamed = "➜";
+            deleted = "";
+            untracked = "?";
+            ignored = "◌";
+          };
+        };
+      };
+    };
+    view = {
+      width = 30;
+      hide_root_folder = false;
+      side = "left";
+      mappings = {
+        custom_only = false;
+        list = [
+          {
+            key = [ "l" "<CR>" "o" ];
+            cb = dsl.rawLua
+              "require('nvim-tree.config').nvim_tree_callback('edit')";
+          }
+          {
+            key = "h";
+            cb = dsl.rawLua
+              "require('nvim-tree.config').nvim_tree_callback('close_node')";
+          }
+          {
+            key = "v";
+            cb = dsl.rawLua
+              "require('nvim-tree.config').nvim_tree_callback('vsplit')";
+          }
+        ];
+      };
+      number = false;
+      relativenumber = false;
+    };
+  };
+
+  lua = ''
+    vim.keymap.set("n", "<Leader>e", ":NvimTreeFindFileToggle<CR>", { silent = true })
+  '';
+
+}
--- a/modules/common/neovim/default.nix
+++ b/modules/common/neovim/default.nix
@ -0,0 +1,44 @@
+{ config, pkgs, lib, ... }:
+
+let
+
+  neovim = import ./package {
+    inherit pkgs;
+    colors = import config.theme.colors.neovimConfig { inherit pkgs; };
+  };
+
+in {
+
+  options.neovim.enable = lib.mkEnableOption "Neovim.";
+
+  config = lib.mkIf config.neovim.enable {
+    home-manager.users.${config.user} =
+
+      {
+
+        home.packages = [ neovim ];
+
+        programs.git.extraConfig.core.editor = "nvim";
+        home.sessionVariables = {
+          EDITOR = "nvim";
+          MANPAGER = "nvim +Man!";
+        };
+        programs.fish = {
+          shellAliases = { vim = "nvim"; };
+          shellAbbrs = {
+            v = lib.mkForce "nvim";
+            vl = lib.mkForce "nvim -c 'normal! `0' -c 'bdelete 1'";
+            vll = "nvim -c 'Telescope oldfiles'";
+          };
+        };
+        programs.kitty.settings.scrollback_pager = lib.mkForce ''
+          ${neovim}/bin/nvim -c 'setlocal nonumber nolist showtabline=0 foldcolumn=0|Man!' -c "autocmd VimEnter * normal G" -'';
+
+      };
+
+    # # Used for icons in Vim
+    # fonts.fonts = with pkgs; [ nerdfonts ];
+
+  };
+
+}
--- a/modules/common/neovim/init.lua
+++ b/modules/common/neovim/init.lua
@ -1,3 +1,4 @@
 require("packer_init")
 require("settings")
 require("keybinds")
+require("background")
--- a/modules/common/neovim/lua/keybinds.lua
+++ b/modules/common/neovim/lua/keybinds.lua
--- a/modules/common/neovim/lua/packer/completion.lua
+++ b/modules/common/neovim/lua/packer/completion.lua
--- a/modules/common/neovim/lua/packer/lsp.lua
+++ b/modules/common/neovim/lua/packer/lsp.lua
@ -46,8 +46,8 @@ M.packer = function(use)
                    capabilities = capabilities,
                })
            end
-            if on_path("rnix-lsp") then
-                require("lspconfig").rnix.setup({ capabilities = capabilities })
+            if on_path("nil") then
+                require("lspconfig").nil_ls.setup({ capabilities = capabilities })
            end

            vim.keymap.set("n", "gd", vim.lsp.buf.definition)
@ -79,6 +79,7 @@ M.packer = function(use)
                return vim.fn.executable(program) == 1
            end

+            local augroup = vim.api.nvim_create_augroup("LspFormatting", {})
            require("null-ls").setup({
                sources = {
                    require("null-ls").builtins.formatting.stylua.with({
@ -132,15 +133,15 @@ M.packer = function(use)
                    -- require("null-ls").builtins.diagnostics.pylint,
                },
                -- Format on save
-                on_attach = function(client)
-                    if client.resolved_capabilities.document_formatting then
-                        local id = vim.api.nvim_create_augroup("LspFormatting", {
-                            clear = true,
-                        })
+                on_attach = function(client, bufnr)
+                    if client.supports_method("textDocument/formatting") then
+                        vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
                        vim.api.nvim_create_autocmd("BufWritePre", {
-                            group = id,
-                            pattern = "*",
-                            callback = vim.lsp.buf.formatting_seq_sync,
+                            group = augroup,
+                            buffer = bufnr,
+                            callback = function()
+                                vim.lsp.buf.format({ bufnr = bufnr })
+                            end,
                        })
                    end
                end,
--- a/modules/common/neovim/lua/packer/misc.lua
+++ b/modules/common/neovim/lua/packer/misc.lua
@ -0,0 +1,67 @@
+local M = {}
+
+M.packer = function(use)
+    -- Important tweaks
+    use("tpope/vim-surround") --- Manipulate parentheses
+
+    -- Convenience tweaks
+    use("tpope/vim-eunuch") --- File manipulation in Vim
+    use("tpope/vim-vinegar") --- Fixes netrw file explorer
+    use("tpope/vim-fugitive") --- Git commands and syntax
+    use("tpope/vim-repeat") --- Actually repeat using .
+
+    -- Use gc or gcc to add comments
+    use({
+        "numToStr/Comment.nvim",
+        config = function()
+            require("Comment").setup()
+        end,
+    })
+
+    -- Alignment tool
+    use({
+        "godlygeek/tabular",
+        config = function()
+            vim.keymap.set("", "<Leader>ta", ":Tabularize /")
+            vim.keymap.set("", "<Leader>t#", ":Tabularize /#<CR>")
+            vim.keymap.set("", "<Leader>tl", ":Tabularize /---<CR>")
+        end,
+    })
+
+    -- Markdown renderer / wiki notes
+    -- use("vimwiki/vimwiki")
+    use({
+        "jakewvincent/mkdnflow.nvim",
+        config = function()
+            require("mkdnflow").setup({
+                modules = {
+                    bib = false,
+                    conceal = true,
+                    folds = false,
+                },
+                perspective = {
+                    priority = "current",
+                    fallback = "first",
+                    nvim_wd_heel = false, -- Don't change working dir
+                },
+                links = {
+                    style = "markdown",
+                    conceal = true,
+                },
+                wrap = true,
+                to_do = {
+                    symbols = { " ", "-", "x" },
+                },
+            })
+            vim.api.nvim_create_autocmd("FileType", {
+                pattern = "markdown",
+                callback = function()
+                    vim.o.autowriteall = true -- Save in new buffer
+                    vim.o.wrapmargin = 79 -- Wrap text automatically
+                end,
+            })
+        end,
+    })
+end
+
+return M
--- a/modules/common/neovim/lua/packer/speed.lua
+++ b/modules/common/neovim/lua/packer/speed.lua
@ -0,0 +1,13 @@
+local M = {}
+
+M.packer = function(use)
+    -- Startup speed hacks
+    use({
+        "lewis6991/impatient.nvim",
+        config = function()
+            require("impatient")
+        end,
+    })
+end
+
+return M
--- a/modules/common/neovim/lua/packer/syntax.lua
+++ b/modules/common/neovim/lua/packer/syntax.lua
@ -8,7 +8,7 @@ M.packer = function(use)
    -- Syntax engine
    use({
        "nvim-treesitter/nvim-treesitter",
-        commit = "989c75046c46d2ed96bb65c5badd6b8f785e7f09",
+        commit = "9ada5f70f98d51e9e3e76018e783b39fd1cd28f7",
        run = ":TSUpdate",
        config = function()
            require("nvim-treesitter.configs").setup({
@ -64,7 +64,6 @@ M.packer = function(use)
    })

    -- Additional syntax sources
-    use("bfontaine/Brewfile.vim") --- Brewfile syntax
    use("chr4/nginx.vim") --- Nginx syntax
    use("towolf/vim-helm") --- Helm syntax
    use("rodjek/vim-puppet") --- Puppet syntax
--- a/modules/common/neovim/lua/packer/telescope.lua
+++ b/modules/common/neovim/lua/packer/telescope.lua
--- a/modules/common/neovim/lua/packer/toggleterm.lua
+++ b/modules/common/neovim/lua/packer/toggleterm.lua
@ -50,7 +50,7 @@ M.packer = function(use)
            vim.keymap.set("n", "<Leader>t", TERM_TOGGLE)
            vim.keymap.set("n", "<Leader>P", NIXPKGS_TOGGLE)
            vim.keymap.set("n", "<Leader>gw", GITWATCH_TOGGLE)
-            vim.keymap.set("n", "<C-k>", K9S_TOGGLE)
+            vim.keymap.set("n", "<Leader>9", K9S_TOGGLE)
        end,
    })

--- a/modules/common/neovim/lua/packer/visuals.lua
+++ b/modules/common/neovim/lua/packer/visuals.lua
--- a/modules/common/neovim/lua/packer_init.lua
+++ b/modules/common/neovim/lua/packer_init.lua
--- a/modules/common/neovim/lua/settings.lua
+++ b/modules/common/neovim/lua/settings.lua
@ -0,0 +1,17 @@
+-- ===========================================================================
+-- Settings
+-- ===========================================================================
+
+vim.filetype.add({
+    pattern = {
+        [".*%.tfvars"] = "hcl",
+        [".*%.tf"] = "hcl",
+    },
+})
+
+vim.api.nvim_create_autocmd("FileType", {
+    pattern = "*.eml",
+    callback = function()
+        vim.o.wrapmargin = 79 -- Wrap text automatically
+    end,
+})
--- a/modules/common/neovim/package/default.nix
+++ b/modules/common/neovim/package/default.nix
@ -0,0 +1,46 @@
+# { inputs, globals, extraConfig ? [ ], ... }:
+#
+# let
+#
+#   pkgs = import inputs.nixpkgs {
+#     system = inputs.system;
+#     overlays = [
+#       (import ./modules/neovim/plugins-overlay.nix inputs)
+#       inputs.nix2vim.overlay
+#     ];
+#   };
+#
+# in pkgs.neovimBuilder {
+#   package = pkgs.neovim-unwrapped;
+#   imports = [
+#     ./modules/common/neovim/plugins/bufferline.nix
+#     ./modules/common/neovim/plugins/completion.nix
+#     ./modules/common/neovim/plugins/gitsigns.nix
+#     ./modules/common/neovim/plugins/lsp.nix
+#     ./modules/common/neovim/plugins/misc.nix
+#     ./modules/common/neovim/plugins/statusline.nix
+#     ./modules/common/neovim/plugins/syntax.nix
+#     ./modules/common/neovim/plugins/telescope.nix
+#     ./modules/common/neovim/plugins/toggleterm.nix
+#     ./modules/common/neovim/plugins/tree.nix
+#   ] ++ extraConfig;
+# }
+
+{ pkgs, colors ? { }, ... }:
+
+pkgs.neovimBuilder {
+  package = pkgs.neovim-unwrapped;
+  imports = [
+    ../config/bufferline.nix
+    ../config/completion.nix
+    ../config/gitsigns.nix
+    ../config/lsp.nix
+    ../config/misc.nix
+    ../config/statusline.nix
+    ../config/syntax.nix
+    ../config/telescope.nix
+    ../config/toggleterm.nix
+    ../config/tree.nix
+    colors
+  ];
+}
--- a/modules/common/programming/default.nix
+++ b/modules/common/programming/default.nix
@ -0,0 +1,12 @@
+{ ... }: {
+
+  imports = [
+    ./haskell.nix
+    ./kubernetes.nix
+    ./lua.nix
+    ./nix.nix
+    ./python.nix
+    ./terraform.nix
+  ];
+
+}
--- a/modules/common/programming/haskell.nix
+++ b/modules/common/programming/haskell.nix
@ -0,0 +1,14 @@
+{ config, lib, ... }: {
+
+  options.haskell.enable = lib.mkEnableOption "Haskell programming language.";
+
+  config = lib.mkIf config.haskell.enable {
+
+    # Binary Cache for Haskell.nix
+    nix.settings.trusted-public-keys =
+      [ "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" ];
+    nix.settings.substituters = [ "https://cache.iog.io" ];
+
+  };
+
+}
--- a/modules/common/programming/kubernetes.nix
+++ b/modules/common/programming/kubernetes.nix
@ -0,0 +1,145 @@
+{ config, pkgs, lib, ... }: {
+
+  options.kubernetes.enable = lib.mkEnableOption "Kubernetes tools.";
+
+  config = lib.mkIf config.kubernetes.enable {
+    home-manager.users.${config.user} = {
+
+      home.packages = with pkgs; [
+        kubectl # Basic Kubernetes queries
+        kubernetes-helm # Helm CLI
+        fluxcd # Bootstrap clusters with Flux
+        kustomize # Kustomize CLI (for Flux)
+      ];
+
+      programs.fish.shellAbbrs = {
+        k = "kubectl";
+        pods = "kubectl get pods -A";
+        nodes = "kubectl get nodes";
+        deploys = "kubectl get deployments -A";
+        dash = "kube-dashboard";
+        ks = "k9s";
+      };
+
+      # Terminal Kubernetes UI
+      programs.k9s = {
+        enable = true;
+        # settings = { k9s = { headless = true; }; };
+        skin = {
+          k9s = {
+            body = {
+              fgColor = config.theme.colors.base06;
+              bgColor = config.theme.colors.base00;
+              logoColor = config.theme.colors.base02; # *blue ?
+            };
+            # Search bar
+            prompt = {
+              fgColor = config.theme.colors.base06;
+              bgColor = config.theme.colors.base00;
+              suggestColor = config.theme.colors.base03;
+            };
+            # Header left side
+            info = {
+              fgColor = config.theme.colors.base04;
+              sectionColor = config.theme.colors.base05;
+            };
+            dialog = {
+              fgColor = config.theme.colors.base06;
+              bgColor = config.theme.colors.base00;
+              buttonFgColor = config.theme.colors.base06;
+              buttonBgColor = config.theme.colors.base0E;
+              buttonFocusFgColor = config.theme.colors.base07;
+              buttonFocusBgColor = config.theme.colors.base02; # *cyan
+              labelFgColor = config.theme.colors.base09;
+              fieldFgColor = config.theme.colors.base06;
+            };
+            frame = {
+              border = {
+                fgColor = config.theme.colors.base01;
+                focusColor = config.theme.colors.base06;
+              };
+              menu = {
+                fgColor = config.theme.colors.base06;
+                keyColor = config.theme.colors.base0E; # *magenta
+                numKeyColor = config.theme.colors.base0E; # *magenta
+              };
+              crumbs = {
+                fgColor = config.theme.colors.base06;
+                bgColor = config.theme.colors.base01;
+                activeColor = config.theme.colors.base03;
+              };
+              status = {
+                newColor = config.theme.colors.base04; # *cyan
+                modifyColor = config.theme.colors.base0D; # *blue
+                addColor = config.theme.colors.base0B; # *green
+                errorColor = config.theme.colors.base08; # *red
+                highlightColor = config.theme.colors.base09; # *orange
+                killColor = config.theme.colors.base03; # *comment
+                completedColor = config.theme.colors.base03; # *comment
+              };
+              title = {
+                fgColor = config.theme.colors.base06;
+                bgColor = config.theme.colors.base00;
+                highlightColor = config.theme.colors.base09; # *orange
+                counterColor = config.theme.colors.base0D; # *blue
+                filterColor = config.theme.colors.base0E; # *magenta
+              };
+            };
+            views = {
+              charts = {
+                bgColor = config.theme.colors.base00;
+                defaultDialColors =
+                  [ config.theme.colors.base0D config.theme.colors.base08 ];
+                # - *blue
+                # - *red
+                defaultChartColors =
+                  [ config.theme.colors.base0D config.theme.colors.base08 ];
+                # - *blue
+                # - *red
+              };
+              table = {
+                # List of resources
+                fgColor = config.theme.colors.base06;
+                bgColor = config.theme.colors.base00;
+
+                # Row selection
+                cursorFgColor = config.theme.colors.base07;
+                cursorBgColor = config.theme.colors.base01;
+
+                # Header row
+                header = {
+                  fgColor = config.theme.colors.base0D;
+                  bgColor = config.theme.colors.base00;
+                  sorterColor = config.theme.colors.base0A; # *selection
+                };
+              };
+              xray = {
+                fgColor = config.theme.colors.base06;
+                bgColor = config.theme.colors.base00;
+                cursorColor = config.theme.colors.base06;
+                graphicColor = config.theme.colors.base0D;
+                showIcons = false;
+              };
+              yaml = {
+                keyColor = config.theme.colors.base0D;
+                colonColor = config.theme.colors.base04;
+                fgColor = config.theme.colors.base03;
+              };
+              logs = {
+                fgColor = config.theme.colors.base06;
+                bgColor = config.theme.colors.base00;
+                indicator = {
+                  fgColor = config.theme.colors.base06;
+                  bgColor = config.theme.colors.base00;
+                };
+              };
+            };
+          };
+        };
+      };
+
+    };
+
+  };
+
+}
--- a/modules/common/programming/lua.nix
+++ b/modules/common/programming/lua.nix
@ -0,0 +1,12 @@
+{ config, pkgs, lib, ... }: {
+
+  options.lua.enable = lib.mkEnableOption "Lua programming language.";
+
+  config = lib.mkIf config.lua.enable {
+    home-manager.users.${config.user}.home.packages = with pkgs; [
+      stylua # Lua formatter
+      sumneko-lua-language-server # Lua LSP
+    ];
+  };
+
+}
--- a/modules/common/programming/nix.nix
+++ b/modules/common/programming/nix.nix
@ -0,0 +1,18 @@
+{ config, pkgs, lib, ... }: {
+
+  options.nixlang.enable = lib.mkEnableOption "Nix programming language.";
+
+  config = lib.mkIf config.nixlang.enable {
+
+    home-manager.users.${config.user} = {
+
+      home.packages = with pkgs; [
+        nixfmt # Nix file formatter
+        nil # Nix language server
+      ];
+
+    };
+
+  };
+
+}
--- a/modules/common/programming/python.nix
+++ b/modules/common/programming/python.nix
@ -0,0 +1,22 @@
+{ config, pkgs, lib, ... }: {
+
+  options.python.enable = lib.mkEnableOption "Python programming language.";
+
+  config = lib.mkIf config.python.enable {
+
+    home-manager.users.${config.user} = {
+
+      home.packages = with pkgs; [
+        # python310 # Standard Python interpreter
+        nodePackages.pyright # Python language server
+        black # Python formatter
+        python310Packages.flake8 # Python linter
+      ];
+
+      programs.fish.shellAbbrs = { py = "python3"; };
+
+    };
+
+  };
+
+}
--- a/modules/common/programming/terraform.nix
+++ b/modules/common/programming/terraform.nix
@ -0,0 +1,22 @@
+{ config, pkgs, lib, ... }: {
+
+  options.terraform.enable = lib.mkEnableOption "Terraform tools.";
+
+  config = lib.mkIf config.terraform.enable {
+
+    home-manager.users.${config.user} = {
+      programs.fish.shellAbbrs = {
+        # Terraform
+        te = "terraform";
+      };
+      home.packages = with pkgs; [
+        terraform # Terraform executable
+        terraform-ls # Language server
+        tflint # Linter
+      ];
+
+    };
+
+  };
+
+}
--- a/modules/common/repositories/default.nix
+++ b/modules/common/repositories/default.nix
@ -0,0 +1,5 @@
+{ ... }: {
+
+  imports = [ ./dotfiles.nix ./notes.nix ];
+
+}
--- a/modules/common/repositories/dotfiles.nix
+++ b/modules/common/repositories/dotfiles.nix
@ -0,0 +1,30 @@
+{ config, pkgs, lib, ... }: {
+
+  options.dotfiles.enable = lib.mkEnableOption "Clone dotfiles.";
+
+  config = lib.mkIf config.dotfiles.enable {
+
+    home-manager.users.${config.user} = {
+
+      home.activation = {
+
+        # Always clone dotfiles repository if it doesn't exist
+        cloneDotfiles =
+          config.home-manager.users.${config.user}.lib.dag.entryAfter
+          [ "writeBoundary" ] ''
+            if [ ! -d "${config.dotfilesPath}" ]; then
+                $DRY_RUN_CMD mkdir --parents $VERBOSE_ARG $(dirname "${config.dotfilesPath}")
+                $DRY_RUN_CMD ${pkgs.git}/bin/git clone ${config.dotfilesRepo} "${config.dotfilesPath}"
+            fi
+          '';
+
+      };
+
+      # Set a variable for dotfiles repo, not necessary but convenient
+      home.sessionVariables.DOTS = config.dotfilesPath;
+
+    };
+
+  };
+
+}
--- a/modules/common/repositories/notes.nix
+++ b/modules/common/repositories/notes.nix
@ -3,7 +3,7 @@
  home-manager.users.${config.user} = {

    home.sessionVariables = {
-      NOTES_PATH = "${config.homePath}/dev/personal/notes";
+      NOTES_PATH = "${config.homePath}/dev/personal/notes/content";
    };

  };
--- a/modules/common/shell/bash/scripts/ocr.sh
+++ b/modules/common/shell/bash/scripts/ocr.sh
@ -1,5 +1,4 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p tesseract
+#!/usr/bin/env bash

 # Yoinked from https://github.com/JJGO/dotfiles
 # Adapted from https://github.com/sdushantha/bin
@ -9,13 +8,13 @@ TEXT_FILE="/tmp/ocr.txt"
 IMAGE_FILE="/tmp/ocr.png"

 function notify-send() {
-    osascript -e "display notification \"$2\" with title \"OCR\""
+    /usr/bin/osascript -e "display notification \"$2\" with title \"OCR\""
 }

 PATH="/usr/local/bin/:$PATH"

 # Take screenshot by selecting the area
-screencapture -i "$IMAGE_FILE"
+/usr/sbin/screencapture -i "$IMAGE_FILE"

 # Get the exit code of the previous command.
 # So in this case, it is the screenshot command. If it did not exit with an
@ -44,7 +43,7 @@ fi

 # Copy text to clipboard
 # xclip -selection clip < "$TEXT_FILE"
-pbcopy <"$TEXT_FILE"
+/usr/bin/pbcopy <"$TEXT_FILE"

 # Send a notification with the text that was grabbed using OCR
 notify-send "ocr" "$(cat $TEXT_FILE)"
--- a/modules/common/shell/charm.nix
+++ b/modules/common/shell/charm.nix
@ -0,0 +1,15 @@
+{ config, pkgs, lib, ... }: {
+
+  options.charm.enable = lib.mkEnableOption "Charm utilities.";
+
+  config.home-manager.users.${config.user} = lib.mkIf config.charm.enable {
+
+    home.packages = with pkgs; [
+      glow # Markdown previews
+      skate # Key-value store
+      charm # Manage account and filesystem
+    ];
+
+  };
+
+}
--- a/modules/common/shell/default.nix
+++ b/modules/common/shell/default.nix
--- a/modules/common/shell/direnv.nix
+++ b/modules/common/shell/direnv.nix
--- a/modules/common/shell/fish/default.nix
+++ b/modules/common/shell/fish/default.nix
@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }: {
+{ config, pkgs, ... }: {

  users.users.${config.user}.shell = pkgs.fish;
  programs.fish.enable =
@ -7,10 +7,11 @@
  home-manager.users.${config.user} = {

    # Packages used in abbreviations and aliases
-    home.packages = with pkgs; [ curl ];
+    home.packages = with pkgs; [ curl exa ];

    programs.fish = {
      enable = true;
+      shellAliases = { ls = "exa"; };
      functions = {
        commandline-git-commits = {
          description = "Insert commit into commandline";
@ -41,7 +42,6 @@
          description = "Tidy up JSON using jq";
          body = "pbpaste | jq '.' | pbcopy"; # Need to fix for non-macOS
        };
-        ls = { body = "${pkgs.exa}/bin/exa $argv"; };
        note = {
          description = "Edit or create a note";
          argumentNames = "filename";
--- a/modules/common/shell/fish/functions/commandline-git-commits.fish
+++ b/modules/common/shell/fish/functions/commandline-git-commits.fish
--- a/modules/common/shell/fish/functions/edit.fish
+++ b/modules/common/shell/fish/functions/edit.fish
--- a/modules/common/shell/fish/functions/fcd.fish
+++ b/modules/common/shell/fish/functions/fcd.fish
--- a/modules/common/shell/fish/functions/fish_user_key_bindings.fish
+++ b/modules/common/shell/fish/functions/fish_user_key_bindings.fish
@ -14,7 +14,7 @@ bind -M insert \cp projects
 bind -M default \cp projects
 bind -M insert \x1F accept-autosuggestion
 bind -M default \x1F accept-autosuggestion
-bind -M insert \cn 'commandline -r "nix run github:NixOS/nixpkgs/nixpkgs-unstable#"'
-bind -M default \cn 'commandline -r "nix run github:NixOS/nixpkgs/nixpkgs-unstable#"'
+bind -M insert \cn 'commandline -r "nix run nixpkgs#"'
+bind -M default \cn 'commandline -r "nix run nixpkgs#"'
 bind -M insert \x11F nix-fzf
 bind -M default \x11F nix-fzf
--- a/modules/common/shell/fish/functions/fish_vi_cursor.fish
+++ b/modules/common/shell/fish/functions/fish_vi_cursor.fish
--- a/modules/common/shell/fish/functions/git-add-fuzzy.fish
+++ b/modules/common/shell/fish/functions/git-add-fuzzy.fish
--- a/modules/common/shell/fish/functions/git-commits.fish
+++ b/modules/common/shell/fish/functions/git-commits.fish
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Noah Masur	450118d234	remove dead code with deadnix	2023-02-20 20:45:56 -05:00
Noah Masur	cc84f1d37a	move nixos and darwin back into modules dir	2023-02-20 20:37:37 -05:00
Noah Masur	ded498f4c9	switch from uuid to label disks	2023-02-20 20:30:45 -05:00
Noah Masur	0d0ee1fc5a	improve readme clarity	2023-02-20 20:26:14 -05:00
Noah Masur	251dce68bb	remove mitm ssl instructions	2023-02-20 20:13:52 -05:00
Noah Masur	448c97665b	move public-keys to root directory	2023-02-20 20:02:21 -05:00
Noah Masur	86aa02aae4	rename patches directory to overlays	2023-02-20 20:00:54 -05:00
Noah Masur	6cd22bc7ce	remove bypass-paywalls-clean no longer available from mozilla extensions	2023-02-20 17:49:19 -05:00
Noah Masur	048de4772c	rename 1password module with underscore	2023-02-20 17:49:00 -05:00
Noah Masur	700e59e6c8	update outdated readme	2023-02-20 17:48:11 -05:00
Noah Masur	07e0afa1e9	fix: iso generating	2023-02-20 17:32:14 -05:00
Noah Masur	6577b9e49b	initial setup for swan and staff	2023-02-18 10:24:54 -05:00
Noah Masur	58a0e6166d	allow reading windows ntfs drives	2023-02-17 18:15:23 -05:00
Noah Masur	e8c5a10df7	attempt to set default apps for xdg-open	2023-02-17 18:14:57 -05:00
Noah Masur	37fa835c66	update lockfile, host name updates	2023-02-12 21:26:12 -05:00
Noah Masur	fa69557ced	change hostname theme	2023-02-11 14:35:38 +00:00
Noah Masur	a9a06fb5fc	fix steam games not launching	2023-02-05 17:16:20 -05:00
Noah Masur	ceaad9d186	update lockfile, fix age not building	2023-02-02 11:01:12 -05:00
Noah Masur	521937e366	fix desktop for new pc build	2023-01-31 09:07:47 -05:00
Noah Masur	8915f17ea3	fixes for latest wsl	2023-01-28 15:36:52 +00:00
Noah Masur	17799909b2	fix: polybar not showing i3 workspaces	2023-01-21 19:46:56 -05:00
Noah Masur	7a4c3b930d	firefox working again still polybar is broken	2023-01-21 10:44:39 -05:00
Noah Masur	e7bbee5da0	fix desktop to work with refactor	2023-01-21 09:29:03 -05:00
Noah Masur	2dda6a31bd	update lockfile, fix treesitter for terraform filetypes	2023-01-09 13:09:12 -05:00
Noah Masur	e4d76189e6	update lockfile	2023-01-06 15:46:59 -05:00
Noah Masur	0bc8a233d8	enable missing neovim for macbook	2022-12-21 17:48:53 -07:00
Noah Masur	524a5aa347	enable missing configs for oracle	2022-12-22 00:47:25 +00:00
Noah Masur	b4ddb149cc	fix: bad references for server linux	2022-12-22 00:31:25 +00:00
Noah Masur	d021baa1bb	split nixos from darwin required because they don't share all attributes	2022-12-21 17:07:58 -07:00
Noah Masur	7063bd5f7a	fixes for module layout	2022-12-21 14:38:34 -07:00
Noah Masur	d040077d3a	convert to proper module layout	2022-12-21 14:18:03 -07:00
Noah Masur	bf1d2f1e9e	update lockfile	2022-12-20 18:23:00 -07:00
Noah Masur	fd7c523ebd	try to disable splash screen when updating firefox	2022-12-20 18:22:41 -07:00
Noah Masur	1b32457956	fix: update dock for hammerspoon shortcuts	2022-12-20 18:22:24 -07:00
Noah Masur	50acdd0c58	update packages	2022-12-18 22:19:56 -07:00
Noah Masur	a0c99a8449	fix: remove print crowding the hammerspoon log	2022-12-18 17:24:58 -07:00
Noah Masur	d1b144f441	upgrade macos to ventura	2022-12-13 21:02:42 -07:00
Noah Masur	adb7956213	fixes for python lsp	2022-12-11 09:52:32 -07:00
Noah Masur	e011a1c6f1	page readme app	2022-12-10 15:48:15 -07:00
Noah Masur	1d8638777c	enable rebuild app command	2022-12-10 15:48:05 -07:00
Noah Masur	2620b43925	fix firefox colors on macos	2022-12-10 15:47:39 -07:00
Noah Masur	7d53a80d49	add gum formatting for default app	2022-12-06 17:40:13 -07:00
Noah Masur	9b12369e43	fixes for oracle when updating to latest	2022-12-06 17:56:29 +00:00
Noah Masur	427bd1a421	update sources for nixos 22.11	2022-12-06 10:03:06 -07:00
Noah Masur	74e346fa63	fix: bad command for terraform-ls	2022-11-30 10:56:30 -07:00
Noah Masur	4a803427fb	Merge branch 'k9s-color'	2022-11-30 07:39:05 -07:00
Noah Masur	d127ccacb0	add declarative k9s color	2022-11-29 23:07:45 -07:00
Noah Masur	54e89d3acd	add neovim as nix app	2022-11-29 20:48:46 -07:00
Noah Masur	b258a40181	working flake build of neovim	2022-11-29 20:40:15 -07:00
Noah Masur	dfacb580ae	partial setup of neovim for home config	2022-11-29 19:14:14 -07:00
Noah Masur	650d1e91a2	only remove firefox quit shortcut on linux	2022-11-29 17:41:34 -07:00
Noah Masur	397b08fab4	remove more unnecessary plugin flake inputs	2022-11-29 09:44:10 -07:00
Noah Masur	33e8a6bc9b	refactor vim settings	2022-11-29 09:35:39 -07:00
Noah Masur	7a39acef1a	move some lua text to separate files	2022-11-28 22:36:30 -07:00
Noah Masur	3438446347	add nvim-tree to flake	2022-11-28 22:11:57 -07:00
Noah Masur	dee7c7302a	add gruvbox to neovim flake	2022-11-27 22:44:52 -07:00
Noah Masur	0d052a6463	toggleterm for build	2022-11-27 22:37:47 -07:00
Noah Masur	8b98b8f29d	working completion	2022-11-27 22:31:17 -07:00
Noah Masur	96c64c4da1	add lsp to neovim flake	2022-11-27 19:11:41 -07:00
Noah Masur	47a1823af4	more working plugins	2022-11-27 17:21:18 -07:00
Noah Masur	d86534727e	start of a WIP rebuild app	2022-11-27 13:10:22 -07:00
Noah Masur	13e5b9ddc5	brewfile syntax no longer needed	2022-11-27 13:10:01 -07:00
Noah Masur	bb200016cb	note about necessary plugins	2022-11-27 13:09:34 -07:00
Noah Masur	dc00ef26b5	some working stuff	2022-11-27 13:08:33 -07:00
Noah Masur	cf62184744	first neovim build package	2022-11-27 12:29:45 -07:00
Noah Masur	97ed5eb33b	switch from homebrew to firefox overlay for macos	2022-11-23 15:46:30 -07:00
Noah Masur	d672a77ddb	fix alt-e in fish for kitty	2022-11-23 14:37:57 -07:00
Noah Masur	52f9057ee5	unused n8n setup	2022-11-21 01:04:38 +00:00
Noah Masur	7ddd9d9aa4	add discord to macos dock	2022-11-20 12:12:18 -07:00
Noah Masur	b9ddaf095c	replace alacritty with kitty in macos dock	2022-11-20 12:09:03 -07:00
Noah Masur	f304392d58	fix: victormono italic glitch on macos	2022-11-20 11:55:11 -07:00
Noah Masur	3beacf9f3c	adjust k9s toggleterm keybind	2022-11-20 11:52:33 -07:00
Noah Masur	44c4084b57	fix: tfvars recognized as terraform	2022-11-20 11:51:46 -07:00
Noah Masur	42237eab13	fix: aerc doesn't recognize config file	2022-11-20 11:38:10 -07:00
Noah Masur	2848ae9424	switch kitty to victormono font	2022-11-19 19:40:04 -07:00
Noah Masur	a6f9b985fc	Revert "force neovim fish shell in toggleterm" This reverts commit `d1f12671b0`.	2022-11-19 19:12:04 -07:00
Noah Masur	d1f12671b0	force neovim fish shell in toggleterm	2022-11-19 19:12:01 -07:00
Noah Masur	30f9f869a7	force fish shell for kitty	2022-11-19 19:11:26 -07:00
Noah Masur	e1fc3317b5	adjust aws package layout	2022-11-18 22:35:00 -05:00
Noah Masur	07b5f855a6	disable firefox autofill	2022-11-16 15:52:24 -05:00
Noah Masur	5178c9f458	fix colorscheme for macbook	2022-11-16 15:52:00 -05:00
Noah Masur	2ab37d3298	move noisetorch to linux audio	2022-11-14 10:35:36 -05:00
Noah Masur	0176b14350	move qr to nautilusg	2022-11-14 10:35:16 -05:00
Noah Masur	8342746b69	fix wsl with new theme	2022-11-10 04:26:38 +00:00
Noah Masur	2340b862e5	add noisetorch for mic noise suppression	2022-11-07 20:54:01 -05:00
Noah Masur	b04c442c87	replace rnix lsp with nil	2022-11-07 08:04:29 -05:00
Noah Masur	5bbba2be39	set back to dark mode default	2022-11-05 19:38:43 -04:00
Noah Masur	c871f59791	fixes for light mode	2022-11-05 13:41:09 -04:00
Noah Masur	4ea56b0aab	fix: remove bell sounds from kitty	2022-11-03 21:20:29 -04:00
Noah Masur	7ae0649456	nixpkgs shortcut registries	2022-11-03 11:26:31 -04:00
Noah Masur	660ea997df	fix standalone home-manager on macos	2022-11-03 11:25:58 -04:00
Noah Masur	15f4116178	fixes for kitty on macos	2022-11-03 11:25:36 -04:00
Noah Masur	9386008fa2	fix: identity file wrong path on macos	2022-11-03 11:24:03 -04:00
Noah Masur	920ec8b43e	add terminfo to openssh devices	2022-11-03 08:51:51 -04:00
Noah Masur	6241b8e624	fix neovim tree-sitter bug requires installing tree-sitter and nodejs to environment :(	2022-11-03 08:30:28 -04:00
Noah Masur	7741394306	add back removed applications	2022-11-02 22:15:29 -04:00
Noah Masur	07fec71ba4	put hashed pass in a separate file	2022-11-02 21:47:11 -04:00
Noah Masur	41d289c5db	refactor colors and options preparing for light mode, even though specializations aren't working	2022-11-02 21:29:14 -04:00
Noah Masur	b2850e8b79	improve visuals of volume notification	2022-10-31 23:54:29 -04:00
Noah Masur	afd44279d2	tweaks to aerc, replace delete with move to trash	2022-10-31 23:43:14 -04:00
Noah Masur	d73ccab008	replace pulseaudio with pipewire closes #8	2022-10-31 23:40:53 -04:00
Noah Masur	969e89cda3	set kitty to default in i3	2022-10-31 20:47:42 -04:00
Noah Masur	38695b29bd	use shift+enter for completion in terminal	2022-10-31 20:47:33 -04:00
Noah Masur	40424a0102	temp: disable visidata bc of python errors	2022-10-31 14:46:04 -04:00
Noah Masur	d7b711ff02	replace alacritty with kitty on macos	2022-10-31 14:45:51 -04:00
Noah Masur	7bd2125438	fix: actually use exa for ls	2022-10-30 20:43:49 -04:00
Noah Masur	0448037a6b	set kitty tab style to slant	2022-10-30 20:43:34 -04:00
Noah Masur	7075371b11	remove warning about dirty git tree	2022-10-30 20:42:32 -04:00
Noah Masur	22885f1b27	temp: try to show users in lightdm greeter still isn't working unfortunately	2022-10-30 20:16:37 -04:00
Noah Masur	52edaa7d9c	prevent ctrl-q from quitting firefox will this affect macos?	2022-10-30 20:16:01 -04:00
Noah Masur	c74d003a57	change alacritty scrollback keybind to match kitty add fonts for kitty	2022-10-30 20:15:32 -04:00
Noah Masur	2d10939285	clean up flake inputs and allow standalone home-manager closes #11	2022-10-30 20:14:41 -04:00
Noah Masur	b15cd8c0b6	add basic kitty config closes #7	2022-10-30 20:13:32 -04:00
Noah Masur	dfd903d3c9	add aerc and fix nvim 0.8	2022-10-30 13:57:14 -04:00
Noah Masur	2af30faf7c	update system and fix nvim	2022-10-29 14:42:37 -04:00
Noah Masur	b718a01dc4	i think i fixed picom screen tearing	2022-10-29 08:57:14 -04:00
Noah Masur	e16674c817	tweaks for i3 and common	2022-10-28 23:58:33 -04:00
Noah Masur	bf09e166a9	fix: grub wrong monitor	2022-10-28 23:58:25 -04:00
Noah Masur	3dcafb8c25	package ocr script with dependencies	2022-10-25 20:22:17 -04:00
Noah Masur	be581dba1f	fix: jellyfin dir permissions for nextcloud	2022-10-23 04:16:42 +00:00
Noah Masur	941fa359d9	add windows app plaintext list	2022-10-22 15:10:30 +00:00
Noah Masur	f6096e3472	replace vimwiki with mkdnflow	2022-10-22 14:29:50 +00:00
Noah Masur	cd204f5ac3	move apps declaration to apps directory	2022-10-18 12:31:42 +00:00
Noah Masur	4c685eb8dd	ignore non-age files in private dir	2022-10-18 12:25:06 +00:00