remove mitm ssl instructions

no longer available from mozilla extensions

README.md

@@ -6,12 +6,28 @@ 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)
+- [Neovim](https://github.com/nmasur/dotfiles/tree/master/modules/neovim/config)
 - [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)
 - [Hammerspoon](https://github.com/nmasur/dotfiles/tree/master/modules/darwin/hammerspoon)
 
+Try out my Neovim config:
+
+```bash
+nix run github:nmasur/dotfiles#neovim
+```
+
+Or build it as a package:
+
+```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
@@ -36,7 +52,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 +63,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#flame
 ```
 
 You should also download the
@@ -74,25 +90,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

apps/default.nix

@@ -1,6 +1,25 @@
 { pkgs, ... }: rec {
 
-  default = readme;
+  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; };
@@ -8,6 +27,20 @@
   # 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; };
 
@@ -20,4 +53,18 @@
   # Connect machine metrics to Netdata Cloud
   netdata = import ./netdata-cloud.nix { inherit pkgs; };
 
+  # Run neovim as an app
+  neovim = {
+    type = "app";
+    program = "${
+        (import ../modules/neovim/package {
+          inherit pkgs;
+          colors =
+            import ../colorscheme/gruvbox/neovim-gruvbox.nix { inherit pkgs; };
+        })
+      }/bin/nvim";
+  };
+
+  nvim = neovim;
+
 }

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
   '');

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}
   '');
 
 }

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

colorscheme/gruvbox/default.nix

@@ -19,7 +19,7 @@
     base0D = "#83a598"; # blue
     base0E = "#d3869b"; # purple
     base0F = "#d65d0e"; # brown
-    neovimConfig = ./neovim.lua;
+    neovimConfig = ./neovim-gruvbox.nix;
     batTheme = "gruvbox-dark";
   };
   light = {
@@ -39,7 +39,7 @@
     base0D = "#076678"; # blue
     base0E = "#8f3f71"; # purple
     base0F = "#d65d0e"; # brown
-    neovimConfig = ./neovim.lua;
+    neovimConfig = ./neovim-gruvbox.nix;
     batTheme = "gruvbox-light";
   };
 }

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
+  '';
+
+}

darwin/alacritty.nix

@@ -1,7 +1,7 @@
 { config, pkgs, lib, ... }: {
 
   # MacOS-specific settings for Alacritty
-  home-manager.users.${config.user} = {
+  home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {
     programs.alacritty.settings = {
       font.size = lib.mkForce 20.0;
       shell.program = "${pkgs.fish}/bin/fish";

darwin/fonts.nix

@@ -1,6 +1,6 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, lib, ... }: {
 
-  home-manager.users.${config.user} = {
+  home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {
 
     home.packages = with pkgs;
       [ (nerdfonts.override { fonts = [ "VictorMono" ]; }) ];

darwin/hammerspoon.nix

@@ -0,0 +1,32 @@
+{ config, pkgs, lib, ... }: {
+
+  # Hammerspoon - MacOS custom automation scripting
+
+  config = lib.mkIf pkgs.stdenv.isDarwin {
+
+    home-manager.users.${config.user} = {
+      xdg.configFile."hammerspoon/init.lua".source = ./hammerspoon/init.lua;
+      xdg.configFile."hammerspoon/Spoons/ControlEscape.spoon".source =
+        ./hammerspoon/Spoons/ControlEscape.spoon;
+      xdg.configFile."hammerspoon/Spoons/DismissAlerts.spoon".source =
+        ./hammerspoon/Spoons/DismissAlerts.spoon;
+      xdg.configFile."hammerspoon/Spoons/Launcher.spoon/init.lua".source =
+        pkgs.substituteAll {
+          src = ./hammerspoon/Spoons/Launcher.spoon/init.lua;
+          firefox = "${pkgs.firefox-bin}/Applications/Firefox.app";
+          discord = "${pkgs.discord}/Applications/Discord.app";
+          kitty = "${pkgs.kitty}/Applications/kitty.app";
+        };
+      xdg.configFile."hammerspoon/Spoons/MoveWindow.spoon".source =
+        ./hammerspoon/Spoons/MoveWindow.spoon;
+    };
+
+    homebrew.casks = [ "hammerspoon" ];
+
+    system.activationScripts.postUserActivation.text = ''
+      defaults write org.hammerspoon.Hammerspoon MJConfigFile "~/.config/hammerspoon/init.lua"
+    '';
+
+  };
+
+}

darwin/hammerspoon/Spoons/ControlEscape.spoon/init.lua

@@ -69,7 +69,7 @@ function obj:init()
     -- If any other key is pressed, don't send escape
     self.asModifier = hs.eventtap.new({ hs.eventtap.event.types.keyDown }, function(_)
         self.sendEscape = false
-        print("Don't sent escape")
+        -- print("Don't sent escape")
     end)
 
     -- If mouse is moving significantly, don't send escape

darwin/hammerspoon/Spoons/Launcher.spoon/init.lua

@@ -56,13 +56,13 @@ function obj:init()
     -- Launcher shortcuts
     self.launcher:bind("ctrl", "space", function() end)
     self.launcher:bind("", "return", function()
-        self:switch("kitty.app")
+        self:switch("@kitty@")
     end)
     self.launcher:bind("", "C", function()
         self:switch("Calendar.app")
     end)
     self.launcher:bind("", "D", function()
-        self:switch("Discord.app")
+        self:switch("@discord@")
     end)
     self.launcher:bind("", "E", function()
         self:switch("Mail.app")
@@ -71,7 +71,7 @@ function obj:init()
         self:switch("Music.app")
     end)
     self.launcher:bind("", "F", function()
-        self:switch("Firefox.app")
+        self:switch("@firefox@")
     end)
     self.launcher:bind("", "H", function()
         self:switch("Hammerspoon.app")

darwin/homebrew.nix

@@ -0,0 +1,56 @@
+{ config, pkgs, lib, ... }: {
+
+  # Homebrew - Mac-specific packages that aren't in Nix
+  config = lib.mkIf pkgs.stdenv.isDarwin {
+
+    # Requires Homebrew to be installed
+    system.activationScripts.preUserActivation.text = ''
+      if ! xcode-select --version 2>/dev/null; then
+        $DRY_RUN_CMD xcode-select --install
+      fi
+      if ! /usr/local/bin/brew --version 2>/dev/null; then
+        $DRY_RUN_CMD /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+      fi
+    '';
+
+    homebrew = {
+      enable = true;
+      onActivation = {
+        autoUpdate = false; # Don't update during rebuild
+        cleanup = "zap"; # Uninstall all programs not declared
+        upgrade = true;
+      };
+      global = {
+        brewfile = true; # Run brew bundle from anywhere
+        lockfiles = false; # Don't save lockfile (since running from anywhere)
+      };
+      taps = [
+        "homebrew/cask" # Required for casks
+        "homebrew/cask-drivers" # Used for Logitech G-Hub
+      ];
+      brews = [
+        "trash" # Delete files and folders to trash instead of rm
+        "openjdk" # Required by Apache Directory Studio
+      ];
+      casks = [
+        "1password" # 1Password packaging on Nix is broken for macOS
+        "scroll-reverser" # Different scroll style for mouse vs. trackpad
+        "meetingbar" # Show meetings in menu bar
+        "gitify" # Git notifications in menu bar
+        "logitech-g-hub" # Mouse and keyboard management
+        "mimestream" # Gmail client
+        "obsidian" # Obsidian packaging on Nix is not available for macOS
+        "steam" # Not packaged for Nix
+        "apache-directory-studio" # Packaging on Nix is not available for macOS
+      ];
+    };
+
+    home-manager.users.${config.user} = {
+
+      programs.fish.shellAbbrs.t = "trash";
+
+    };
+
+  };
+
+}

darwin/kitty.nix

@@ -1,7 +1,7 @@
 { config, pkgs, lib, ... }: {
 
   # MacOS-specific settings for Kitty
-  home-manager.users.${config.user} = {
+  home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {
     programs.kitty = {
       darwinLaunchOptions = [ "--start-as=fullscreen" ];
       font.size = lib.mkForce 20;

darwin/networking.nix

@@ -0,0 +1,11 @@
+{ config, pkgs, lib, ... }: {
+
+  config = lib.mkIf pkgs.stdenv.isDarwin {
+    networking = {
+      computerName = "${config.fullName}'\\''s Mac";
+      # Adjust if necessary
+      # hostName = "";
+    };
+  };
+
+}

darwin/nixpkgs.nix

@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }: {
 
-  home-manager.users.${config.user} = {
+  home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {
 
     programs.fish = {
       shellAbbrs = {
@@ -14,14 +14,14 @@
                 set option "--option substitute false"
             end
             git -C ${config.dotfilesPath} add --intent-to-add --all
-            commandline -r "darwin-rebuild switch $option --flake ${config.dotfilesPath}#macbook"
+            commandline -r "darwin-rebuild switch $option --flake ${config.dotfilesPath}#lookingglass"
             commandline --function execute
           '';
         };
         rebuild-home = lib.mkForce {
           body = ''
             git -C ${config.dotfilesPath} add --intent-to-add --all
-            commandline -r "${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#macbook";
+            commandline -r "${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#lookingglass";
             commandline --function execute
           '';
         };

darwin/system.nix

@@ -0,0 +1,186 @@
+{ pkgs, lib, ... }: {
+
+  config = lib.mkIf pkgs.stdenv.isDarwin {
+
+    services.nix-daemon.enable = true;
+
+    environment.shells = [ pkgs.fish ];
+
+    security.pam.enableSudoTouchIdAuth = true;
+
+    system = {
+
+      keyboard = {
+        remapCapsLockToControl = true;
+        enableKeyMapping = true; # Allows for skhd
+      };
+
+      defaults = {
+        NSGlobalDomain = {
+
+          # Set to dark mode
+          AppleInterfaceStyle = "Dark";
+
+          # Don't change from dark to light automatically
+          # AppleInterfaceSwitchesAutomatically = false;
+
+          # Enable full keyboard access for all controls (e.g. enable Tab in modal dialogs)
+          AppleKeyboardUIMode = 3;
+
+          # Automatically show and hide the menu bar
+          _HIHideMenuBar = true;
+
+          # Expand save panel by default
+          NSNavPanelExpandedStateForSaveMode = true;
+
+          # Expand print panel by default
+          PMPrintingExpandedStateForPrint = true;
+
+          # Replace press-and-hold with key repeat
+          ApplePressAndHoldEnabled = false;
+
+          # Set a fast key repeat rate
+          KeyRepeat = 2;
+
+          # Shorten delay before key repeat begins
+          InitialKeyRepeat = 12;
+
+          # Save to local disk by default, not iCloud
+          NSDocumentSaveNewDocumentsToCloud = false;
+
+          # Disable autocorrect capitalization
+          NSAutomaticCapitalizationEnabled = false;
+
+          # Disable autocorrect smart dashes
+          NSAutomaticDashSubstitutionEnabled = false;
+
+          # Disable autocorrect adding periods
+          NSAutomaticPeriodSubstitutionEnabled = false;
+
+          # Disable autocorrect smart quotation marks
+          NSAutomaticQuoteSubstitutionEnabled = false;
+
+          # Disable autocorrect spellcheck
+          NSAutomaticSpellingCorrectionEnabled = false;
+        };
+
+        dock = {
+          # Automatically show and hide the dock
+          autohide = true;
+
+          # Add translucency in dock for hidden applications
+          showhidden = true;
+
+          # Enable spring loading on all dock items
+          enable-spring-load-actions-on-all-items = true;
+
+          # Highlight hover effect in dock stack grid view
+          mouse-over-hilite-stack = true;
+
+          mineffect = "genie";
+          orientation = "bottom";
+          show-recents = false;
+          tilesize = 44;
+        };
+
+        finder = {
+
+          # Default Finder window set to column view
+          FXPreferredViewStyle = "clmv";
+
+          # Finder search in current folder by default
+          FXDefaultSearchScope = "SCcf";
+
+          # Disable warning when changing file extension
+          FXEnableExtensionChangeWarning = false;
+
+          # Allow quitting of Finder application
+          QuitMenuItem = true;
+
+        };
+
+        # Disable "Are you sure you want to open" dialog
+        LaunchServices.LSQuarantine = false;
+
+        # Disable trackpad tap to click
+        trackpad.Clicking = false;
+
+        # universalaccess = {
+
+        #   # Zoom in with Control + Scroll Wheel
+        #   closeViewScrollWheelToggle = true;
+        #   closeViewZoomFollowsFocus = true;
+        # };
+
+        # Where to save screenshots
+        screencapture.location = "~/Downloads";
+
+      };
+
+      # Settings that don't have an option in nix-darwin
+      activationScripts.postActivation.text = ''
+        echo "Disable disk image verification"
+        defaults write com.apple.frameworks.diskimages skip-verify -bool true
+        defaults write com.apple.frameworks.diskimages skip-verify-locked -bool true
+        defaults write com.apple.frameworks.diskimages skip-verify-remote -bool true
+
+        echo "Avoid creating .DS_Store files on network volumes"
+        defaults write com.apple.desktopservices DSDontWriteNetworkStores -bool true
+
+        echo "Disable the warning before emptying the Trash"
+        defaults write com.apple.finder WarnOnEmptyTrash -bool false
+
+        echo "Require password immediately after sleep or screen saver begins"
+        defaults write com.apple.screensaver askForPassword -int 1
+        defaults write com.apple.screensaver askForPasswordDelay -int 0
+
+        echo "Allow apps from anywhere"
+        SPCTL=$(spctl --status)
+        if ! [ "$SPCTL" = "assessments disabled" ]; then
+            sudo spctl --master-disable
+        fi
+
+      '';
+
+      # User-level settings
+      activationScripts.postUserActivation.text = ''
+        echo "Show the ~/Library folder"
+        chflags nohidden ~/Library
+
+        echo "Enable dock magnification"
+        defaults write com.apple.dock magnification -bool true
+
+        echo "Set dock magnification size"
+        defaults write com.apple.dock largesize -int 48
+
+        echo "Define dock icon function"
+        __dock_item() {
+            printf "%s%s%s%s%s" \
+                   "<dict><key>tile-data</key><dict><key>file-data</key><dict>" \
+                   "<key>_CFURLString</key><string>" \
+                   "$1" \
+                   "</string><key>_CFURLStringType</key><integer>0</integer>" \
+                   "</dict></dict></dict>"
+        }
+
+        echo "Choose and order dock icons"
+        defaults write com.apple.dock persistent-apps -array \
+            "$(__dock_item /Applications/1Password.app)" \
+            "$(__dock_item /Applications/Slack.app)" \
+            "$(__dock_item /System/Applications/Calendar.app)" \
+            "$(__dock_item ${pkgs.firefox-bin}/Applications/Firefox.app)" \
+            "$(__dock_item /System/Applications/Messages.app)" \
+            "$(__dock_item /System/Applications/Mail.app)" \
+            "$(__dock_item /Applications/Mimestream.app)" \
+            "$(__dock_item /Applications/zoom.us.app)" \
+            "$(__dock_item ${pkgs.discord}/Applications/Discord.app)" \
+            "$(__dock_item /Applications/Obsidian.app)" \
+            "$(__dock_item ${pkgs.kitty}/Applications/kitty.app)" \
+            "$(__dock_item /System/Applications/System\ Settings.app)"
+      '';
+
+    };
+
+  };
+
+}

darwin/tmux.nix

@@ -1,6 +1,8 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, lib, ... }: {
 
-  home-manager.users.${config.user} = {
+  options.tmux.enable = lib.mkEnableOption "Tmux terminal multiplexer";
+
+  config.home-manager.users.${config.user} = lib.mkIf config.tmux.enable {
 
     programs.tmux = {
       enable = true;

darwin/user.nix

@@ -0,0 +1,21 @@
+{ config, pkgs, lib, ... }: {
+
+  config = lib.mkIf pkgs.stdenv.isDarwin {
+
+    users.users."${config.user}" = {
+      # macOS user
+      home = config.homePath;
+      shell = pkgs.fish; # Default shell
+
+    };
+
+    # Used for aerc
+    home-manager.users.${config.user} = {
+      home.sessionVariables = {
+        XDG_CONFIG_HOME = "${config.homePath}/.config";
+      };
+    };
+
+  };
+
+}

darwin/utilities.nix

@@ -15,7 +15,7 @@ let
 
 in {
 
-  home-manager.users.${config.user} = {
+  home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {
 
     home.packages = with pkgs; [
       # visidata # CSV inspector
@@ -34,7 +34,7 @@ in {
       ipcalc # Make IP network calculations
       (mkScript {
         name = "ocr";
-        file = ../shell/bash/scripts/ocr.sh;
+        file = ../modules/shell/bash/scripts/ocr.sh;
         env = [ tesseract ];
       })
     ];

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": 1666776005,
-        "narHash": "sha256-HwSMF19PpczfqNHKcFsA6cF4PVbG00uUSdbq6q3jB5o=",
+        "lastModified": 1673295039,
+        "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "f6648ca0698d1611d7eadfa72b122252b833f86c",
+        "rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
         "type": "github"
       },
       "original": {
@@ -26,11 +74,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1668992358,
-        "narHash": "sha256-24iH+wIbE1bKCFmqslwOpfrDypJ40mk1uGIqRUxDXxY=",
+        "lastModified": 1675471726,
+        "narHash": "sha256-526iHwidfdtZZ7aAU9od1/zbyfSFBEailBTet+Gvfqg=",
         "owner": "bandithedoge",
         "repo": "nixpkgs-firefox-darwin",
-        "rev": "066d4fd658acd075b45405eda9e3bca6a71a47b1",
+        "rev": "813d55a3e3b3c0423eb5d1fcb4bf82197c9f7796",
         "type": "github"
       },
       "original": {
@@ -42,11 +90,11 @@
     "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": {
@@ -56,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=",
@@ -70,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": [
@@ -78,11 +156,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1666903647,
-        "narHash": "sha256-sFI1Gh9DTGzHnBINondupUGYbe+T0wZcpcZjkW0qffM=",
+        "lastModified": 1675935446,
+        "narHash": "sha256-WajulTn7QdwC7QuXRBavrANuIXE5z+08EdxdRw1qsNs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "213a06295dff96668a1d673b9fd1c03ce1de6745",
+        "rev": "2dce7f1a55e785a22d61668516df62899278c9e4",
         "type": "github"
       },
       "original": {
@@ -92,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,
@@ -115,11 +234,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1666812839,
-        "narHash": "sha256-0nBDgjPU+iDsvz89W+cDEyhnFGSwCJmwDl/gMGqYiU0=",
+        "lastModified": 1674666581,
+        "narHash": "sha256-KNI2s/xrL7WOYaPJAWKBtb7cCH3335rLfsL+B+ssuGY=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "41f3518bc194389df22a3d198215eae75e6b5ab9",
+        "rev": "6a5dc1d3d557ea7b5c19b15ff91955124d0400fa",
         "type": "github"
       },
       "original": {
@@ -146,11 +265,27 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1666959691,
-        "narHash": "sha256-TRpWA3t8ata79HOGtFd5dDCl1kJQmIE16PDF53/Hcxo=",
+        "lastModified": 1675309347,
+        "narHash": "sha256-D3CQ6HRDT2m3XJlrzb5jKq4vNFR5xFTEFKC7iSjlFpM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "448a599c49978c2794401bfc3a2e1fba1a8663be",
+        "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": {
@@ -160,28 +295,45 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "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": 1667025500,
-        "narHash": "sha256-88akaieCIrqta3Uyha7Zv3FJWzKJebb2BrOdZba1zdI=",
+        "lastModified": 1676251563,
+        "narHash": "sha256-itLKR2Haeh5wQ6dxkuZ8L5gwp3+CAggpN+w2e7cLQPg=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "21dd192519af12a01f1348bbfa86cde47f7aa392",
+        "rev": "9a8b28a9d6611f6af9f7abb3e690fc755d6906fe",
         "type": "github"
       },
       "original": {
@@ -190,25 +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_2",
+        "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": {
@@ -236,15 +521,15 @@
     "wsl": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_3"
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1666720338,
-        "narHash": "sha256-7V91ZtTz7zDXb6hivktQ9RlBglP+WEkYFSciPJHwMJw=",
+        "lastModified": 1676126384,
+        "narHash": "sha256-3aAnN891Cb1pizewAgaHIo3W1WbAjXtoWuX8n3j8YoI=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "7bfb8f5aa91fee30a189eae32cda8ddc465076df",
+        "rev": "a1c7e8bebac32cfac7aa8498bdfc60cbff13eb50",
         "type": "github"
       },
       "original": {

flake.nix

@@ -41,6 +41,57 @@
       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:
@@ -53,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" ];
@@ -67,36 +126,55 @@
     in rec {
 
       nixosConfigurations = {
-        desktop = import ./hosts/desktop { inherit inputs globals; };
-        wsl = import ./hosts/wsl { inherit inputs globals; };
-        oracle = import ./hosts/oracle { inherit inputs globals; };
+        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 = {
-        macbook = import ./hosts/macbook { inherit inputs globals; };
+        lookingglass =
+          import ./hosts/lookingglass { inherit inputs globals overlays; };
       };
 
       # For quickly applying local settings with:
-      # home-manager switch --flake .#desktop
+      # home-manager switch --flake .#tempest
       homeConfigurations = {
-        desktop =
-          nixosConfigurations.desktop.config.home-manager.users.${globals.user}.home;
-        macbook =
-          darwinConfigurations.macbook.config.home-manager.users."Noah.Masur".home;
+        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.aws = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ]
-        (system: {
-          "${system}" = import ./hosts/aws { inherit inputs globals system; };
-        });
+      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/neovim/package {
+          inherit pkgs;
+          colors =
+            import ./colorscheme/gruvbox/neovim-gruvbox.nix { inherit pkgs; };
+        };
+
+      });
 
       apps = forAllSystems (system:
-        let pkgs = import nixpkgs { inherit system; };
+        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

generators/staff/default.nix

@@ -0,0 +1,17 @@
+# The Staff
+# ISO configuration for my USB drive
+
+{ inputs, globals, system, overlays, ... }:
+
+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"
+    ];
+  }];
+}

hosts/desktop/default.nix

@@ -1,48 +0,0 @@
-{ inputs, globals, ... }:
-
-with inputs;
-
-# 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";
-      gui.enable = true;
-      theme = {
-        colors = (import ../../modules/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;
-    }
-
-    ./hardware-configuration.nix
-    ../common.nix
-    ../../modules/hardware
-    ../../modules/nixos
-    ../../modules/graphical
-    ../../modules/applications/media.nix
-    ../../modules/applications/firefox.nix
-    ../../modules/applications/kitty.nix
-    ../../modules/applications/1password.nix
-    ../../modules/applications/discord.nix
-    ../../modules/applications/nautilus.nix
-    ../../modules/applications/obsidian.nix
-    ../../modules/mail
-    ../../modules/gaming/steam.nix
-    ../../modules/gaming/legendary.nix
-    ../../modules/repositories/notes.nix
-    ../../modules/services/keybase.nix
-    ../../modules/services/mullvad.nix
-    ../../modules/programming/nix.nix
-  ];
-}

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;
-}

hosts/flame/default.nix

@@ -1,24 +1,33 @@
-{ inputs, globals, ... }:
-
-with inputs;
-
+# 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
+    ../../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";
@@ -32,7 +41,7 @@ nixpkgs.lib.nixosSystem {
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s";
 
       # Nextcloud backup config
-      backupS3 = {
+      backup.s3 = {
         endpoint = "s3.us-west-002.backblazeb2.com";
         bucket = "noahmasur-backup";
         accessKeyId = "0026b0e73b2e2c80000000005";
@@ -42,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
@@ -71,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
   ];
 }

hosts/hydra/default.nix

@@ -1,42 +1,49 @@
-{ inputs, globals, ... }:
+# The Hydra
+# System configuration for WSL
+
+{ inputs, globals, overlays, ... }:
 
 with inputs;
 
-# System configuration for WSL
 nixpkgs.lib.nixosSystem {
   system = "x86_64-linux";
   specialArgs = { };
   modules = [
+    ../../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;
       theme = {
-        colors = (import ../../modules/colorscheme/gruvbox).dark;
+        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
-    ../../modules/repositories/notes.nix
-    ../../modules/programming/nix.nix
-    ../../modules/programming/lua.nix
   ];
 }

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
+    ../../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;
+    }
+  ];
+}

hosts/macbook/default.nix

@@ -1,43 +0,0 @@
-{ inputs, globals, ... }:
-
-with inputs;
-
-# 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 = "/Users/Noah.Masur/.ssh/id_ed25519";
-      gui.enable = true;
-      theme = {
-        colors = (import ../../modules/colorscheme/gruvbox).dark;
-        dark = true;
-      };
-      mailUser = globals.user;
-      networking.hostName = "noah-masur-mac";
-      nixpkgs.overlays = [ nur.overlay firefox-darwin.overlay ];
-      # Set registry to flake packages, used for nix X commands
-      nix.registry.nixpkgs.flake = nixpkgs;
-    }
-    ../common.nix
-    ../../modules/darwin
-    ../../modules/mail
-    ../../modules/applications/alacritty.nix
-    ../../modules/applications/kitty.nix
-    ../../modules/applications/discord.nix
-    ../../modules/applications/firefox.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
-  ];
-}

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
+    ../../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;
+
+    }
+  ];
+}

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
+    ../../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;
+      };
+
+    }
+  ];
+}

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, pkgs, 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-uuid/f0313f58-971a-46e3-9191-909fe5eb7f7e";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/FB26-799C";
+    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 "powersave";
+  hardware.cpu.amd.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

modules/applications/1password.nix

@@ -1,10 +1,20 @@
 { config, pkgs, lib, ... }: {
 
-  config = lib.mkIf config.gui.enable {
-    unfreePackages = [ "1password" "_1password-gui" ];
-    home-manager.users.${config.user} = {
-      home.packages = with pkgs; [ _1password-gui ];
+  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 ];
+      };
+    };
+
 }

modules/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";

modules/applications/default.nix

@@ -3,7 +3,6 @@
   imports = [
     ./1password.nix
     ./alacritty.nix
-    ./calibre.nix
     ./discord.nix
     ./firefox.nix
     ./kitty.nix

modules/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 ];

modules/applications/firefox.nix

@@ -1,45 +1,67 @@
 { config, pkgs, lib, ... }:
 
 {
-  config = lib.mkIf config.gui.enable {
 
-    unfreePackages = [ "onepassword-password-manager" "okta-browser-plugin" ];
+  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 = lib.mkIf pkgs.stdenv.isDarwin pkgs.firefox-bin;
-        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 = {
+        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" = true;
+            "browser.quitShortcut.disabled" =
+              if pkgs.stdenv.isLinux then true else false;
             "browser.theme.dark-private-windows" = true;
-            "browser.toolbars.bookmarks.visibility" = "newtab";
+            "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
@@ -60,6 +82,22 @@
             .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;

modules/applications/kitty.nix

@@ -1,6 +1,15 @@
 { config, pkgs, lib, ... }: {
 
-  config = lib.mkIf config.gui.enable {
+  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";

modules/applications/media.nix

@@ -1,12 +1,30 @@
 { 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
-      zathura # PDF viewer
-    ];
+  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" ];
+
+    };
+
   };
 
 }

modules/applications/nautilus.nix

@@ -1,13 +1,26 @@
 { 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 = 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 =

modules/applications/obsidian.nix

@@ -1,6 +1,15 @@
 { config, pkgs, lib, ... }: {
 
-  config = lib.mkIf config.gui.enable {
+  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 ];

modules/applications/qbittorrent.nix

@@ -1,6 +1,15 @@
 { config, pkgs, lib, ... }: {
 
-  config = lib.mkIf config.gui.enable {
+  options = {
+    qbittorrent = {
+      enable = lib.mkEnableOption {
+        description = "Enable qBittorrent.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.gui.enable && config.qbittorrent.enable) {
 
     home-manager.users.${config.user} = {
 

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

modules/darwin/hammerspoon.nix

@@ -1,15 +0,0 @@
-{ config, ... }: {
-
-  # Hammerspoon - MacOS custom automation scripting
-
-  home-manager.users.${config.user} = {
-    xdg.configFile.hammerspoon = { source = ./hammerspoon; };
-  };
-
-  homebrew.casks = [ "hammerspoon" ];
-
-  system.activationScripts.postUserActivation.text = ''
-    defaults write org.hammerspoon.Hammerspoon MJConfigFile "~/.config/hammerspoon/init.lua"
-  '';
-
-}

modules/darwin/homebrew.nix

@@ -1,53 +0,0 @@
-{ config, ... }: {
-
-  # Homebrew - Mac-specific packages that aren't in Nix
-
-  # Requires Homebrew to be installed
-  system.activationScripts.preUserActivation.text = ''
-    if ! xcode-select --version 2>/dev/null; then
-      $DRY_RUN_CMD xcode-select --install
-    fi
-    if ! /usr/local/bin/brew --version 2>/dev/null; then
-      $DRY_RUN_CMD /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-    fi
-  '';
-
-  homebrew = {
-    enable = true;
-    onActivation = {
-      autoUpdate = false; # Don't update during rebuild
-      cleanup = "zap"; # Uninstall all programs not declared
-      upgrade = true;
-    };
-    global = {
-      brewfile = true; # Run brew bundle from anywhere
-      lockfiles = false; # Don't save lockfile (since running from anywhere)
-    };
-    taps = [
-      "homebrew/cask" # Required for casks
-      "homebrew/cask-drivers" # Used for Logitech G-Hub
-    ];
-    brews = [
-      "trash" # Delete files and folders to trash instead of rm
-      "openjdk" # Required by Apache Directory Studio
-    ];
-    casks = [
-      "1password" # 1Password packaging on Nix is broken for macOS
-      "scroll-reverser" # Different scroll style for mouse vs. trackpad
-      "meetingbar" # Show meetings in menu bar
-      "gitify" # Git notifications in menu bar
-      "logitech-g-hub" # Mouse and keyboard management
-      "mimestream" # Gmail client
-      "obsidian" # Obsidian packaging on Nix is not available for macOS
-      "steam" # Not packaged for Nix
-      "apache-directory-studio" # Packaging on Nix is not available for macOS
-    ];
-  };
-
-  home-manager.users.${config.user} = {
-
-    programs.fish.shellAbbrs.t = "trash";
-
-  };
-
-}

modules/darwin/networking.nix

@@ -1,9 +0,0 @@
-{ config, ... }: {
-
-  networking = {
-    computerName = "${config.fullName}'\\''s Mac";
-    # Adjust if necessary
-    # hostName = "";
-  };
-
-}

modules/darwin/system.nix

@@ -1,182 +0,0 @@
-{ pkgs, ... }: {
-
-  services.nix-daemon.enable = true;
-
-  environment.shells = [ pkgs.fish ];
-
-  security.pam.enableSudoTouchIdAuth = true;
-
-  system = {
-
-    keyboard = {
-      remapCapsLockToControl = true;
-      enableKeyMapping = true; # Allows for skhd
-    };
-
-    defaults = {
-      NSGlobalDomain = {
-
-        # Set to dark mode
-        AppleInterfaceStyle = "Dark";
-
-        # Don't change from dark to light automatically
-        # AppleInterfaceSwitchesAutomatically = false;
-
-        # Enable full keyboard access for all controls (e.g. enable Tab in modal dialogs)
-        AppleKeyboardUIMode = 3;
-
-        # Automatically show and hide the menu bar
-        _HIHideMenuBar = true;
-
-        # Expand save panel by default
-        NSNavPanelExpandedStateForSaveMode = true;
-
-        # Expand print panel by default
-        PMPrintingExpandedStateForPrint = true;
-
-        # Replace press-and-hold with key repeat
-        ApplePressAndHoldEnabled = false;
-
-        # Set a fast key repeat rate
-        KeyRepeat = 2;
-
-        # Shorten delay before key repeat begins
-        InitialKeyRepeat = 12;
-
-        # Save to local disk by default, not iCloud
-        NSDocumentSaveNewDocumentsToCloud = false;
-
-        # Disable autocorrect capitalization
-        NSAutomaticCapitalizationEnabled = false;
-
-        # Disable autocorrect smart dashes
-        NSAutomaticDashSubstitutionEnabled = false;
-
-        # Disable autocorrect adding periods
-        NSAutomaticPeriodSubstitutionEnabled = false;
-
-        # Disable autocorrect smart quotation marks
-        NSAutomaticQuoteSubstitutionEnabled = false;
-
-        # Disable autocorrect spellcheck
-        NSAutomaticSpellingCorrectionEnabled = false;
-      };
-
-      dock = {
-        # Automatically show and hide the dock
-        autohide = true;
-
-        # Add translucency in dock for hidden applications
-        showhidden = true;
-
-        # Enable spring loading on all dock items
-        enable-spring-load-actions-on-all-items = true;
-
-        # Highlight hover effect in dock stack grid view
-        mouse-over-hilite-stack = true;
-
-        mineffect = "genie";
-        orientation = "bottom";
-        show-recents = false;
-        tilesize = 44;
-      };
-
-      finder = {
-
-        # Default Finder window set to column view
-        FXPreferredViewStyle = "clmv";
-
-        # Finder search in current folder by default
-        FXDefaultSearchScope = "SCcf";
-
-        # Disable warning when changing file extension
-        FXEnableExtensionChangeWarning = false;
-
-        # Allow quitting of Finder application
-        QuitMenuItem = true;
-
-      };
-
-      # Disable "Are you sure you want to open" dialog
-      LaunchServices.LSQuarantine = false;
-
-      # Disable trackpad tap to click
-      trackpad.Clicking = false;
-
-      # universalaccess = {
-
-      #   # Zoom in with Control + Scroll Wheel
-      #   closeViewScrollWheelToggle = true;
-      #   closeViewZoomFollowsFocus = true;
-      # };
-
-      # Where to save screenshots
-      screencapture.location = "~/Downloads";
-
-    };
-
-    # Settings that don't have an option in nix-darwin
-    activationScripts.postActivation.text = ''
-      echo "Disable disk image verification"
-      defaults write com.apple.frameworks.diskimages skip-verify -bool true
-      defaults write com.apple.frameworks.diskimages skip-verify-locked -bool true
-      defaults write com.apple.frameworks.diskimages skip-verify-remote -bool true
-
-      echo "Avoid creating .DS_Store files on network volumes"
-      defaults write com.apple.desktopservices DSDontWriteNetworkStores -bool true
-
-      echo "Disable the warning before emptying the Trash"
-      defaults write com.apple.finder WarnOnEmptyTrash -bool false
-
-      echo "Require password immediately after sleep or screen saver begins"
-      defaults write com.apple.screensaver askForPassword -int 1
-      defaults write com.apple.screensaver askForPasswordDelay -int 0
-
-      echo "Allow apps from anywhere"
-      SPCTL=$(spctl --status)
-      if ! [ "$SPCTL" = "assessments disabled" ]; then
-          sudo spctl --master-disable
-      fi
-
-    '';
-
-    # User-level settings
-    activationScripts.postUserActivation.text = ''
-      echo "Show the ~/Library folder"
-      chflags nohidden ~/Library
-
-      echo "Enable dock magnification"
-      defaults write com.apple.dock magnification -bool true
-
-      echo "Set dock magnification size"
-      defaults write com.apple.dock largesize -int 48
-
-      echo "Define dock icon function"
-      __dock_item() {
-          printf "%s%s%s%s%s" \
-                 "<dict><key>tile-data</key><dict><key>file-data</key><dict>" \
-                 "<key>_CFURLString</key><string>" \
-                 "$1" \
-                 "</string><key>_CFURLStringType</key><integer>0</integer>" \
-                 "</dict></dict></dict>"
-      }
-
-      echo "Choose and order dock icons"
-      defaults write com.apple.dock persistent-apps -array \
-          "$(__dock_item /Applications/1Password.app)" \
-          "$(__dock_item /Applications/Slack.app)" \
-          "$(__dock_item /System/Applications/Calendar.app)" \
-          "$(__dock_item ${pkgs.firefox-bin}/Applications/Firefox.app)" \
-          "$(__dock_item /System/Applications/Messages.app)" \
-          "$(__dock_item /System/Applications/Mail.app)" \
-          "$(__dock_item /Applications/Mimestream.app)" \
-          "$(__dock_item /Applications/zoom.us.app)" \
-          "$(__dock_item ${pkgs.discord}/Applications/Discord.app)" \
-          "$(__dock_item /Applications/Obsidian.app)" \
-          "$(__dock_item ${pkgs.kitty}/Applications/kitty.app)" \
-          "$(__dock_item /System/Applications/System\ Preferences.app)"
-    '';
-
-  };
-
-}

modules/darwin/user.nix

@@ -1,15 +0,0 @@
-{ config, pkgs, lib, ... }: {
-
-  users.users."${config.user}" = {
-    # macOS user
-    home = config.homePath;
-    shell = pkgs.fish; # Default shell
-
-  };
-
-  # Used for aerc
-  home-manager.users.${config.user} = {
-    home.sessionVariables = { XDG_CONFIG_HOME = "${config.homePath}/.config"; };
-  };
-
-}

modules/default.nix

@@ -1,9 +1,9 @@
 { config, lib, pkgs, ... }: {
 
   imports =
-    [ ../modules/shell ../modules/neovim ../modules/repositories/dotfiles.nix ];
+    [ ./applications ./mail ./neovim ./programming ./repositories ./shell ];
 
-  options = rec {
+  options = {
     user = lib.mkOption {
       type = lib.types.str;
       description = "Primary user of the system";
@@ -36,7 +36,7 @@
       colors = lib.mkOption {
         type = lib.types.attrs;
         description = "Base16 color scheme.";
-        default = (import ../modules/colorscheme/gruvbox).dark;
+        default = (import ../colorscheme/gruvbox).dark;
       };
       dark = lib.mkOption {
         type = lib.types.bool;
@@ -74,7 +74,7 @@
     };
   };
 
-  config = let stateVersion = "22.11";
+  config = let stateVersion = "23.05";
   in {
 
     # Enable features in Nix commands

modules/gaming/default.nix

@@ -1,9 +0,0 @@
-{ config, ... }: {
-
-  config = {
-    hardware.opengl = {
-      enable = true;
-      driSupport32Bit = true;
-    };
-  };
-}

modules/gaming/leagueoflegends.nix

@@ -1,30 +0,0 @@
-{ config, pkgs, lib, ... }: {
-
-  options.gaming.leagueoflegends = lib.mkEnableOption "League of Legends";
-
-  config = lib.mkIf config.gaming.leagueoflegends {
-
-    # League of Legends anti-cheat requirement
-    boot.kernel.sysctl = { "abi.vsyscall32" = 0; };
-
-    environment.systemPackages = with pkgs; [
-
-      # Lutris requirement to install the game
-      lutris
-      amdvlk
-      wineWowPackages.stable
-      # vulkan-tools
-
-      # Required according to https://lutris.net/games/league-of-legends/
-      openssl
-      gnome.zenity
-
-      # Don't remember if this is required
-      dconf
-
-    ];
-
-    environment.sessionVariables = { QT_X11_NO_MITSHM = "1"; };
-
-  };
-}

modules/gaming/minecraft-server.nix

@@ -1,145 +0,0 @@
-{ pkgs, ... }:
-
-let
-
-  localPort = 25564;
-  publicPort = 49732;
-  rconPort = 25575;
-  rconPassword = "thiscanbeanything";
-
-in {
-
-  unfreePackages = [ "minecraft-server" ];
-
-  services.minecraft-server = {
-    enable = true;
-    eula = true;
-    declarative = true;
-    whitelist = { };
-    openFirewall = false;
-    serverProperties = {
-      server-port = localPort;
-      difficulty = "normal";
-      gamemode = "survival";
-      white-list = false;
-      enforce-whitelist = false;
-      level-name = "world";
-      motd = "Welcome!";
-      pvp = true;
-      player-idle-timeout = 30;
-      generate-structures = true;
-      max-players = 20;
-      snooper-enabled = false;
-      spawn-npcs = true;
-      spawn-animals = true;
-      spawn-monsters = true;
-      allow-nether = true;
-      allow-flight = false;
-      enable-rcon = true;
-      "rcon.port" = rconPort;
-      "rcon.password" = rconPassword;
-    };
-  };
-
-  networking.firewall.allowedTCPPorts = [ publicPort ];
-
-  ## Automatically start and stop Minecraft server based on player connections
-
-  # Adapted shamelessly from:
-  # https://dataswamp.org/~solene/2022-08-20-on-demand-minecraft-with-systemd.html
-
-  # Prevent Minecraft from starting by default
-  systemd.services.minecraft-server = { wantedBy = pkgs.lib.mkForce [ ]; };
-
-  # Listen for connections on the public port, to trigger the actual
-  # listen-minecraft service.
-  systemd.sockets.listen-minecraft = {
-    wantedBy = [ "sockets.target" ];
-    requires = [ "network.target" ];
-    listenStreams = [ "${toString publicPort}" ];
-  };
-
-  # Proxy traffic to local port, and trigger hook-minecraft
-  systemd.services.listen-minecraft = {
-    path = [ pkgs.systemd ];
-    requires = [ "hook-minecraft.service" "listen-minecraft.socket" ];
-    after = [ "hook-minecraft.service" "listen-minecraft.socket" ];
-    serviceConfig.ExecStart =
-      "${pkgs.systemd.out}/lib/systemd/systemd-socket-proxyd 127.0.0.1:${
-        toString localPort
-      }";
-  };
-
-  # Start Minecraft if required and wait for it to be available
-  # Then unlock the listen-minecraft.service
-  systemd.services.hook-minecraft = {
-    path = with pkgs; [ systemd libressl busybox ];
-
-    # Start Minecraft and the auto-shutdown timer
-    script = ''
-      systemctl start minecraft-server.service
-      systemctl start stop-minecraft.timer
-    '';
-
-    # Keep checking until the service is available
-    postStart = ''
-      for i in $(seq 60); do
-        if ${pkgs.libressl.nc}/bin/nc -z 127.0.0.1 ${
-          toString localPort
-        } > /dev/null ; then
-          exit 0
-        fi
-        ${pkgs.busybox.out}/bin/sleep 1
-      done
-      exit 1
-    '';
-  };
-
-  # Run a player check on a schedule for auto-shutdown
-  systemd.timers.stop-minecraft = {
-    timerConfig = {
-      OnCalendar = "*-*-* *:*:0/20"; # Every 20 seconds
-      Unit = "stop-minecraft.service";
-    };
-  };
-
-  # If no players are connected, then stop services and prepare to resume again
-  systemd.services.stop-minecraft = {
-    serviceConfig.Type = "oneshot";
-    script = ''
-      # Check when service was launched
-      servicestartsec=$(
-        date -d \
-          "$(systemctl show \
-               --property=ActiveEnterTimestamp \
-               minecraft-server.service \
-               | cut -d= -f2)" \
-        +%s)
-
-      # Calculate elapsed time
-      serviceelapsedsec=$(( $(date +%s) - servicestartsec))
-
-      # Ignore if service just started
-      if [ $serviceelapsedsec -lt 180 ]
-      then
-        echo "Server was just started"
-        exit 0
-      fi
-
-      PLAYERS=$(
-        printf "list\n" \
-          | ${pkgs.rcon.out}/bin/rcon -m \
-          -H 127.0.0.1 -p ${builtins.toString rconPort} -P ${rconPassword} \
-      )
-
-      if echo "$PLAYERS" | grep "are 0 of a"
-      then
-        echo "Stopping server"
-        systemctl stop minecraft-server.service
-        systemctl stop hook-minecraft.service
-        systemctl stop stop-minecraft.timer
-      fi
-    '';
-  };
-
-}

modules/hardware/default.nix

@@ -1,14 +0,0 @@
-{ ... }: {
-
-  imports = [
-    ./audio.nix
-    ./boot.nix
-    ./keyboard.nix
-    ./monitors.nix
-    ./mouse.nix
-    ./networking.nix
-    ./sleep.nix
-    ./wifi.nix
-  ];
-
-}

modules/hardware/monitors.nix

@@ -1,53 +0,0 @@
-{ config, pkgs, lib, ... }: {
-
-  # Timezone required for Redshift schedule
-  imports = [ ../nixos/timezone.nix ];
-
-  config = lib.mkIf config.gui.enable {
-
-    environment.systemPackages = with pkgs;
-      [
-        ddcutil # Monitor brightness control
-      ];
-
-    # Reduce blue light at night
-    services.redshift = {
-      enable = true;
-      brightness = {
-        day = "1.0";
-        night = "1.0";
-      };
-    };
-
-    # Detect monitors (brightness) for ddcutil
-    hardware.i2c.enable = true;
-
-    # Grant main user access to external monitors
-    users.users.${config.user}.extraGroups = [ "i2c" ];
-
-    services.xserver.displayManager = {
-
-      # Put the login screen on the left monitor
-      lightdm.greeters.gtk.extraConfig = ''
-        active-monitor=0
-      '';
-
-      # Set up screen position and rotation
-      setupCommands = ''
-        ${pkgs.xorg.xrandr}/bin/xrandr --output DisplayPort-0 \
-                                            --mode 1920x1200 \
-                                            --pos 1920x0 \
-                                            --rotate left \
-                                        --output HDMI-0 \
-                                            --primary \
-                                            --mode 1920x1080 \
-                                            --pos 0x560 \
-                                            --rotate normal \
-                                        --output DVI-0 --off \
-                                        --output DVI-1 --off \
-      '';
-    };
-
-  };
-
-}

modules/hardware/mouse.nix

@@ -1,21 +0,0 @@
-{ config, pkgs, lib, ... }: {
-
-  config = lib.mkIf config.gui.enable {
-
-    # Mouse customization
-    services.ratbagd.enable = true;
-
-    environment.systemPackages = with pkgs; [
-      libratbag # Mouse adjustments
-      piper # Mouse adjustments GUI
-    ];
-
-    services.xserver.libinput.mouse = {
-      # Disable mouse acceleration
-      accelProfile = "flat";
-      accelSpeed = "1.15";
-    };
-
-  };
-
-}

modules/hardware/networking.nix

@@ -1,10 +0,0 @@
-{ ... }: {
-
-  # The global useDHCP flag is deprecated, therefore explicitly set to false here.
-  # Per-interface useDHCP will be mandatory in the future, so this generated config
-  # replicates the default behaviour.
-  networking.useDHCP = false;
-  networking.interfaces.enp0s31f6.useDHCP = true;
-  networking.interfaces.wlp3s0.useDHCP = true;
-
-}

modules/hardware/server.nix

@@ -1,7 +0,0 @@
-{ config, ... }: {
-
-  # Servers need a bootloader or they won't start
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-}

modules/hardware/sleep.nix

@@ -1,8 +0,0 @@
-{ ... }: {
-
-  # Prevent wake from keyboard
-  powerManagement.powerDownCommands = ''
-    for wakeup in /sys/bus/usb/devices/1-*/power/wakeup; do echo disabled > $wakeup; done
-  '';
-
-}

modules/hardware/wifi.nix

@@ -1,9 +0,0 @@
-{ ... }: {
-
-  # Enables wireless support via wpa_supplicant.
-  networking.wireless.enable = true;
-
-  # Allows the user to control the WiFi settings.
-  networking.wireless.userControlled.enable = true;
-
-}

modules/mail/aerc.nix

@@ -1,6 +1,8 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, lib, ... }: {
 
-  config = {
+  options.mail.aerc.enable = lib.mkEnableOption "Aerc email.";
+
+  config = lib.mkIf config.mail.aerc.enable {
 
     home-manager.users.${config.user} = {
 

modules/mail/default.nix

@@ -3,18 +3,19 @@
   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.mbsync = { enable = true; };
@@ -25,13 +26,13 @@
       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"

modules/mail/himalaya.nix

@@ -1,15 +1,17 @@
-{ config, ... }: {
+{ config, lib, ... }: {
 
-  config = {
+  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 = {
-          backend = "imap";
-          sender = "smtp";
           downloads-dir = config.userDirs.download;
           smtp-insecure = true;
         };

modules/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 })
+  '';
+}

modules/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" },
+        }),
+    })
+  '';
+
+}

modules/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 })

modules/neovim/config/gitsigns.nix

@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  plugins = [ pkgs.vimPlugins.gitsigns-nvim ];
+  setup.gitsigns = { };
+  lua = builtins.readFile ./gitsigns.lua;
+}

modules/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)

modules/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,
+    })
+  '';
+
+}

modules/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 }
+  '';
+}

modules/neovim/config/statusline.nix

@@ -0,0 +1,9 @@
+{ pkgs, ... }: {
+  plugins = [ pkgs.vimPlugins.lualine-nvim ];
+  setup.lualine = {
+    options = {
+      theme = "gruvbox";
+      icons_enabled = true;
+    };
+  };
+}

modules/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";
+        };
+      };
+    };
+  };
+
+}

modules/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)

modules/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;
+
+}

modules/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)

modules/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;
+
+}

modules/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 })
+  '';
+
+}

modules/neovim/default.nix

@@ -1,54 +1,44 @@
-{ config, pkgs, lib, ... }: {
+{ config, pkgs, lib, ... }:
 
-  home-manager.users.${config.user} = {
+let
 
-    home.packages = with pkgs; [
-      neovim
-      gcc # for tree-sitter
-      tree-sitter # for tree-sitter-gitignore parser
-      nodejs # for tree-sitter-gitignore parser
-      shfmt # used everywhere
-      shellcheck # used everywhere
-    ];
+  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" -'';
 
-    xdg.configFile = {
-      "nvim/init.lua".source = ./init.lua;
-      "nvim/lua" = {
-        source = ./lua;
-        recursive = true; # Allows adding more files
       };
-      "nvim/lua/packer/colors.lua".source = config.theme.colors.neovimConfig;
-      "nvim/lua/background.lua".text = ''
-        vim.o.background = "${
-          if config.theme.dark == true then "dark" else "light"
-        }"
-      '';
-    };
 
-    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 "vim -c 'normal! `0' -c 'bdelete 1'";
-        vll = "nvim -c 'Telescope oldfiles'";
-      };
-    };
-
-    # Always run packer.nvim sync
-    home.activation.nvimPackerSync =
-      config.home-manager.users.${config.user}.lib.dag.entryAfter
-      [ "writeBoundary" ] ''
-        $DRY_RUN_CMD ${pkgs.neovim}/bin/nvim --headless -c 'autocmd User PackerComplete quitall' -c 'PackerSync'
-      '';
+    # # Used for icons in Vim
+    # fonts.fonts = with pkgs; [ nerdfonts ];
 
   };
 
-  # Used for icons in Vim
-  fonts.fonts = with pkgs; [ nerdfonts ];
-
 }

modules/neovim/lua/packer/syntax.lua

@@ -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

modules/neovim/lua/settings.lua

@@ -2,94 +2,16 @@
 -- Settings
 -- ===========================================================================
 
-vim.o.termguicolors = true --- Set to truecolor
-vim.o.hidden = true --- Don't unload buffers when leaving them
-vim.wo.number = true --- Show line numbers
-vim.wo.relativenumber = true --- Relative numbers instead of absolute
-vim.o.list = true --- Reveal whitespace with dashes
-vim.o.expandtab = true --- Tabs into spaces
-vim.o.shiftwidth = 4 --- Amount to shift with > key
-vim.o.softtabstop = 4 --- Amount to shift with <TAB> key
-vim.o.ignorecase = true --- Ignore case when searching
-vim.o.smartcase = true --- Check case when using capitals in search
-vim.o.infercase = true --- Don't match cases when completing suggestions
-vim.o.incsearch = true --- Search while typing
-vim.o.visualbell = true --- No sounds
-vim.o.scrolljump = 1 --- Number of lines to scroll
-vim.o.scrolloff = 3 --- Margin of lines to see while scrolling
-vim.o.splitright = true --- Vertical splits on the right side
-vim.o.splitbelow = true --- Horizontal splits on the bottom side
-vim.o.pastetoggle = "<F3>" --- Use F3 to enter raw paste mode
-vim.o.clipboard = "unnamedplus" --- Uses system clipboard for yanking
-vim.o.updatetime = 300 --- Faster diagnostics
-vim.o.mouse = "nv" --- Mouse interaction / scrolling
-
--- Neovim features
-vim.o.inccommand = "split" --- Live preview search and replace
---- Required for nvim-cmp completion
-vim.opt.completeopt = {
-    "menu",
-    "menuone",
-    "noselect",
-}
-
--- Remember last position when reopening file
-vim.api.nvim_exec(
-    [[
-  au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal! g`\"" | endif
-]],
-    false
-)
-
--- 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
-
--- Create backup directories if they don't exist
--- Should be fixed in 0.6 by https://github.com/neovim/neovim/pull/15433
-vim.o.backupdir = vim.fn.stdpath("cache") .. "/backup"
-vim.api.nvim_exec(
-    [[
-    if !isdirectory(&backupdir)
-        call mkdir(&backupdir, "p")
-    endif
-]],
-    false
-)
-
--- LaTeX options
-vim.api.nvim_exec(
-    [[
-    au FileType tex inoremap ;bf \textbf{}<Esc>i
-    au BufWritePost *.tex silent! execute "!pdflatex -output-directory=%:p:h % >/dev/null 2>&1" | redraw!
-]],
-    false
-)
-
--- Highlight when yanking
-vim.api.nvim_exec(
-    [[
-    au TextYankPost * silent! lua vim.highlight.on_yank { timeout = 250 }
-]],
-    false
-)
-
 vim.filetype.add({
     pattern = {
-        [".*%.tfvars"] = "terraform",
+        [".*%.tfvars"] = "hcl",
+        [".*%.tf"] = "hcl",
     },
 })
+
 vim.api.nvim_create_autocmd("FileType", {
     pattern = "*.eml",
     callback = function()
         vim.o.wrapmargin = 79 -- Wrap text automatically
     end,
 })
-
--- Netrw
-vim.g.netrw_liststyle = 3 -- Change style to 'tree' view
-vim.g.netrw_banner = 0 -- Remove useless banner
-vim.g.netrw_winsize = 15 -- Explore window takes % of page
-vim.g.netrw_browse_split = 4 -- Open in previous window
-vim.g.netrw_altv = 1 -- Always split left

modules/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/neovim/plugins/bufferline.nix
+#     ./modules/neovim/plugins/completion.nix
+#     ./modules/neovim/plugins/gitsigns.nix
+#     ./modules/neovim/plugins/lsp.nix
+#     ./modules/neovim/plugins/misc.nix
+#     ./modules/neovim/plugins/statusline.nix
+#     ./modules/neovim/plugins/syntax.nix
+#     ./modules/neovim/plugins/telescope.nix
+#     ./modules/neovim/plugins/toggleterm.nix
+#     ./modules/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
+  ];
+}

modules/nixos/default.nix

@@ -1,9 +0,0 @@
-{ config, ... }: {
-
-  imports = [ ./user.nix ./timezone.nix ./doas.nix ];
-
-  # Pin a state version to prevent warnings
-  system.stateVersion =
-    config.home-manager.users.${config.user}.home.stateVersion;
-
-}

modules/nixos/doas.nix

@@ -1,30 +0,0 @@
-# Replace sudo with doas
-
-{ config, ... }: {
-
-  security = {
-
-    # Remove sudo
-    sudo.enable = false;
-
-    # Add doas
-    doas = {
-      enable = true;
-
-      # No password required
-      wheelNeedsPassword = false;
-
-      # Pass environment variables from user to root
-      # Also requires removing password here
-      extraRules = [{
-        groups = [ "wheel" ];
-        noPass = true;
-        keepEnv = true;
-      }];
-    };
-  };
-
-  home-manager.users.${config.user}.programs.fish.shellAliases = {
-    sudo = "doas";
-  };
-}

modules/nixos/timezone.nix

@@ -1,15 +0,0 @@
-{ ... }: {
-
-  # Service to determine location for time zone
-  services.geoclue2.enable = true;
-  services.geoclue2.enableWifi = false; # Breaks when it can't connect
-  location = { provider = "geoclue2"; };
-
-  # Enable local time based on time zone
-  services.localtimed.enable = true;
-
-  # Required to get localtimed to talk to geoclue2
-  services.geoclue2.appConfig.localtimed.isSystem = true;
-  services.geoclue2.appConfig.localtimed.isAllowed = true;
-
-}

modules/programming/default.nix

@@ -0,0 +1,12 @@
+{ config, pkgs, lib, ... }: {
+
+  imports = [
+    ./haskell.nix
+    ./kubernetes.nix
+    ./lua.nix
+    ./nix.nix
+    ./python.nix
+    ./terraform.nix
+  ];
+
+}

modules/programming/haskell.nix

@@ -1,8 +1,14 @@
-{ ... }: {
+{ config, pkgs, lib, ... }: {
 
-  # 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" ];
+  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" ];
+
+  };
 
 }

modules/programming/kubernetes.nix

@@ -1,22 +1,143 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, lib, ... }: {
 
-  home-manager.users.${config.user} = {
+  options.kubernetes.enable = lib.mkEnableOption "Kubernetes tools.";
 
-    home.packages = with pkgs; [
-      kubectl # Basic Kubernetes queries
-      k9s # Terminal Kubernetes UI
-      kubernetes-helm # Helm CLI
-      fluxcd # Bootstrap clusters with Flux
-      kustomize # Kustomize CLI (for Flux)
-    ];
+  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;
+                };
+              };
+            };
+          };
+        };
+      };
 
-    programs.fish.shellAbbrs = {
-      k = "kubectl";
-      pods = "kubectl get pods -A";
-      nodes = "kubectl get nodes";
-      deploys = "kubectl get deployments -A";
-      dash = "kube-dashboard";
-      ks = "k9s";
     };
 
   };