try to configure using nixosModules

doesn't seem like there's that much benefit?

.gitignore

@@ -3,7 +3,6 @@
 *.db
 **/.direnv/**
 result
-.luarc.json
 private/**
+templates/**/flake.lock
 !private/**.age
-!private/**.sha512

README.md

@@ -1,18 +1,55 @@
+# System Configurations
+
 This repository contains configuration files for my NixOS, macOS, and WSL
 hosts.
 
 They are organized and managed by [Nix](https://nixos.org), so some of the
 configuration may be difficult to translate to a non-Nix system.
 
-However, some of the configurations are easier to lift directly:
+## System Features
 
-- [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)
+| Feature        | Program                                             | Configuration                                 |
+| ---            | ---                                                 | ---                                           |
+| OS             | [NixOS](https://nixos.org)                          | [Link](./modules/nixos)                       |
+| Display Server | [X11](https://www.x.org/wiki/)                      | [Link](./modules/nixos/graphical/xorg.nix)    |
+| Compositor     | [Picom](https://github.com/yshui/picom)             | [Link](./modules/nixos/graphical/picom.nix)   |
+| Window Manager | [i3](https://i3wm.org/)                             | [Link](./modules/nixos/graphical/i3.nix)      |
+| Panel          | [Polybar](https://polybar.github.io/)               | [Link](./modules/nixos/graphical/polybar.nix) |
+| Font           | [Victor Mono](https://rubjo.github.io/victor-mono/) | [Link](./modules/nixos/graphical/fonts.nix)   |
+| Launcher       | [Rofi](https://github.com/davatorium/rofi)          | [Link](./modules/nixos/graphical/rofi.nix)    |
 
-Try out my Neovim config:
+## User Features
+
+| Feature      | Program                                                                          | Configuration                                      |
+| ---          | ---                                                                              | ---                                                |
+| Dotfiles     | [Home-Manager](https://github.com/nix-community/home-manager)                    | [Link](./modules/common)                           |
+| Terminal     | [Kitty](https://sw.kovidgoyal.net/kitty/)                                        | [Link](./modules/common/applications/kitty.nix)    |
+| Shell        | [Fish](https://fishshell.com/)                                                   | [Link](./modules/common/shell/fish)                |
+| Shell Prompt | [Starship](https://starship.rs/)                                                 | [Link](./modules/common/shell/starhip.nix)         |
+| Colorscheme  | [Gruvbox](https://github.com/morhetz/gruvbox)                                    | [Link](./colorscheme/gruvbox/default.nix)          |
+| Wallpaper    | [Road](https://gitlab.com/exorcist365/wallpapers/-/blob/master/gruvbox/road.jpg) | [Link](./hosts/tempest/default.nix)                |
+| Text Editor  | [Neovim](https://neovim.io/)                                                     | [Link](./modules/common/neovim/config)             |
+| Browser      | [Firefox](https://www.mozilla.org/en-US/firefox/new/)                            | [Link](./modules/common/applications/firefox.nix)  |
+| E-Mail       | [Aerc](https://aerc-mail.org/)                                                   | [Link](./modules/common/mail/aerc.nix)             |
+| File Manager | [Nautilus](https://wiki.gnome.org/action/show/Apps/Files)                        | [Link](./modules/common/applications/nautilus.nix) |
+| PDF Reader   | [Zathura](https://pwmt.org/projects/zathura/)                                    | [Link](./modules/common/applications/media.nix)    |
+| Video Player | [mpv](https://mpv.io/)                                                           | [Link](./modules/common/applications/media.nix)    |
+
+## macOS Features
+
+| Feature  | Program                                     | Configuration                        |
+| ---      | ---                                         | ---                                  |
+| Keybinds | [Hammerspoon](https://www.hammerspoon.org/) | [Link](./modules/darwin/hammerspoon) |
+
+---
+
+# Installation
+
+Click [here](./docs/installation.md) for detailed installation instructions.
+
+# Neovim
+
+Try out my Neovim config with nix:
 
 ```bash
 nix run github:nmasur/dotfiles#neovim
@@ -25,86 +62,9 @@ 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
+`~/.config/nvim` or set `XDG_CONFIG_HOME` to another value; otherwise both
 configs might conflict with each other.
 
----
-
-# Installation
-
-## NixOS - From Live Disk
-
-Format drives and build system from any NixOS host, including the live
-installer disk:
-
-**This will erase your drives; use at your own risk!**
-
-```bash
-lsblk # Choose the disk you want to wipe
-nix-shell -p nixVersions.stable
-nix run github:nmasur/dotfiles#installer -- nvme0n1 desktop
-```
-
-## NixOS - From Existing System
-
-If you're already running NixOS, you can switch to this configuration with the
-following command:
-
-```bash
-nix-shell -p nixVersions.stable
-sudo nixos-rebuild switch --flake github:nmasur/dotfiles#desktop
-```
-
-## Windows - From NixOS WSL
-
-After [installing NixOS on
-WSL](https://xeiaso.net/blog/nix-flakes-4-wsl-2022-05-01), you can switch to
-the WSL configuration:
-
-```
-nix-shell -p nixVersions.stable
-sudo nixos-rebuild switch --flake github:nmasur/dotfiles#wsl
-```
-
-You should also download the
-[FiraCode](https://github.com/ryanoasis/nerd-fonts/releases/download/v2.2.2/FiraCode.zip)
-font and install it on Windows. Install [Alacritty](https://alacritty.org/) and
-move the `windows/alacritty.yml` file to
-`C:\Users\<user>\AppData\Roaming\alacritty`.
-
-## macOS
-
-To get started on a bare macOS installation, first install Nix:
-
-```bash
-sh -c "$(curl -L https://nixos.org/nix/install)"
-```
-
-Then use Nix to build nix-darwin:
-
-```bash
-nix-build https://github.com/LnL7/nix-darwin/archive/master.tar.gz -A installer
-./result/bin/darwin-installer
-```
-
-Then switch to the macOS configuration:
-
-```bash
-darwin-rebuild switch --flake github:nmasur/dotfiles#macbook
-```
-
-### 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
-```
-
----
-
 # Flake Templates
 
 You can also use the [templates](./templates/) as flakes for starting new

apps/default.nix

@@ -1,45 +1,19 @@
 { pkgs, ... }: rec {
 
-  default = {
-    type = "app";
-    program = builtins.toString (pkgs.writeShellScript "default" ''
-      ${pkgs.gum}/bin/gum style --margin "1 2" --padding "0 2" --foreground "15" --background "55" "Options"
-      ${pkgs.gum}/bin/gum format --type=template -- '  {{ Italic "Run with" }} {{ Color "15" "69" " nix run github:nmasur/dotfiles#" }}{{ Color "15" "62" "someoption" }}{{ Color "15" "69" " " }}.'
-      echo ""
-      echo ""
-      ${pkgs.gum}/bin/gum format --type=template -- \
-          '  • {{ Color "15" "57" " readme " }} {{ Italic "Documentation for this repository." }}' \
-          '  • {{ Color "15" "57" " rebuild " }} {{ Italic "Switch to this configuration." }}' \
-          '  • {{ Color "15" "57" " installer " }} {{ Italic "Format and install from nothing." }}' \
-          '  • {{ Color "15" "57" " neovim " }} {{ Italic "Test out the Neovim package." }}' \
-          '  • {{ Color "15" "57" " loadkey " }} {{ Italic "Load an ssh key for this machine using melt." }}' \
-          '  • {{ Color "15" "57" " encrypt-secret " }} {{ Italic "Encrypt a secret for all machines." }}' \
-          '  • {{ Color "15" "57" " reencrypt-secrets " }} {{ Italic "Reencrypt all secrets when new machine is added." }}' \
-          '  • {{ Color "15" "57" " netdata " }} {{ Italic "Connect a machine to Netdata cloud." }}'
-      echo ""
-      echo ""
-    '');
-  };
+  # Show quick helper
+  default = import ./help.nix { inherit pkgs; };
 
-  # Format and install from nothing
+  # Format primary disk
+  format-root = import ./format-root.nix { inherit pkgs; };
+
+  # Format and install from nothing (deprecated)
   installer = import ./installer.nix { inherit pkgs; };
 
   # Display the readme for this repository
   readme = import ./readme.nix { inherit pkgs; };
 
   # Rebuild
-  rebuild = {
-    type = "app";
-    program = builtins.toString (pkgs.writeShellScript "rebuild" ''
-      echo ${pkgs.system}
-      SYSTEM=${if pkgs.stdenv.isDarwin then "darwin" else "linux"}
-      if [ "$SYSTEM" == "darwin" ]; then
-          darwin-rebuild switch --flake github:nmasur/dotfiles#macbook
-      else
-          nixos-rebuild switch --flake github:nmasur/dotfiles
-      fi
-    '');
-  };
+  rebuild = import ./rebuild.nix { inherit pkgs; };
 
   # Load the SSH key for this machine
   loadkey = import ./loadkey.nix { inherit pkgs; };
@@ -54,17 +28,7 @@
   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";
-  };
-
+  neovim = import ./neovim.nix { inherit pkgs; };
   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/format-root.nix

@@ -0,0 +1,39 @@
+{ pkgs, ... }: {
+
+  # This script will partition and format drives; use at your own risk!
+
+  type = "app";
+
+  program = builtins.toString (pkgs.writeShellScript "format-root" ''
+    set -e
+
+    DISK=$1
+
+    if [ -z "''${DISK}" ]; then
+        ${pkgs.gum}/bin/gum style --width 50 --margin "1 2" --padding "2 4" \
+            --foreground "#fb4934" \
+            "Missing required parameter." \
+            "Usage: format-root -- <disk>" \
+            "Flake example: nix run github:nmasur/dotfiles#format-root -- nvme0n1"
+        echo "(exiting)"
+        exit 1
+    fi
+
+    ${pkgs.disko-packaged}/bin/disko \
+        --mode create \
+        --dry-run \
+        --flake "path:$(pwd)#root" \
+        --arg disk \""/dev/''${DISK}"\"
+
+    ${pkgs.gum}/bin/gum confirm \
+        "This will ERASE ALL DATA on the disk /dev/''${DISK}. Are you sure you want to continue?" \
+        --default=false
+
+    ${pkgs.disko-packaged}/bin/disko \
+        --mode create \
+        --flake "path:$(pwd)#root" \
+        --arg disk "/dev/''${DISK}"
+
+  '');
+
+}

apps/help.nix

@@ -0,0 +1,23 @@
+{ pkgs, ... }: {
+
+  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 ""
+  '');
+
+}

apps/neovim.nix

@@ -0,0 +1,12 @@
+{ pkgs, ... }: {
+
+  type = "app";
+
+  program = "${
+      (import ../modules/common/neovim/package {
+        inherit pkgs;
+        colors = (import ../colorscheme/nord).dark;
+      })
+    }/bin/nvim";
+
+}

apps/rebuild.nix

@@ -0,0 +1,15 @@
+{ pkgs, ... }: {
+
+  type = "app";
+
+  program = builtins.toString (pkgs.writeShellScript "rebuild" ''
+    echo ${pkgs.system}
+    SYSTEM=${if pkgs.stdenv.isDarwin then "darwin" else "linux"}
+    if [ "$SYSTEM" == "darwin" ]; then
+        sudo darwin-rebuild switch --flake ${builtins.toString ../.}
+    else
+        doas nixos-rebuild switch --flake ${builtins.toString ../.}
+    fi
+  '');
+
+}

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/everforest/default.nix

@@ -1,20 +1,24 @@
 {
   name = "everforest"; # dark, hard
   author = "Sainnhe Park";
-  base00 = "#2b3339"; # Default Background
-  base01 = "#323c41"; # Lighter Background
-  base02 = "#503946"; # Selection Background
-  base03 = "#868d80"; # Comments, Invisibles, Line Highlighting
-  base04 = "#d3c6aa"; # Dark Foreground (Used for status bars)
-  base05 = "#d3c6aa"; # Default Foreground, Caret, Delimiters, Operators
-  base06 = "#e9e8d2"; # Light Foreground (Not often used)
-  base07 = "#fff9e8"; # Light Background (Not often used)
-  base08 = "#7fbbb3"; # Variables, XML Tags, Markup Link Text, ...
-  base09 = "#d699b6"; # Integers, Boolean, Constants, ...
-  base0A = "#83c092"; # Classes, Markup Bold, Search Text Background
-  base0B = "#dbbc7f"; # Strings, Inherited Class, Markup Code, Diff Inserted
-  base0C = "#e69875"; # Support, Regular Expressions, Escape Characters, ...
-  base0D = "#a7c080"; # Functions, Methods, Attribute IDs, Headings
-  base0E = "#e67e80"; # Keywords, Storage, Selector, Markup Italic, Diff Changed
-  base0F = "#d699b6"; # Deprecated, Opening/Closing Embedded Language Tags, ...
+  dark = {
+    base00 = "#2b3339"; # Default Background
+    base01 = "#323c41"; # Lighter Background
+    base02 = "#503946"; # Selection Background
+    base03 = "#868d80"; # Comments, Invisibles, Line Highlighting
+    base04 = "#d3c6aa"; # Dark Foreground (Used for status bars)
+    base05 = "#d3c6aa"; # Default Foreground, Caret, Delimiters, Operators
+    base06 = "#e9e8d2"; # Light Foreground (Not often used)
+    base07 = "#fff9e8"; # Light Background (Not often used)
+    base08 = "#7fbbb3"; # Variables, XML Tags, Markup Link Text, ...
+    base09 = "#d699b6"; # Integers, Boolean, Constants, ...
+    base0A = "#83c092"; # Classes, Markup Bold, Search Text Background
+    base0B = "#dbbc7f"; # Strings, Inherited Class, Markup Code, Diff Inserted
+    base0C = "#e69875"; # Support, Regular Expressions, Escape Characters, ...
+    base0D = "#a7c080"; # Functions, Methods, Attribute IDs, Headings
+    base0E =
+      "#e67e80"; # Keywords, Storage, Selector, Markup Italic, Diff Changed
+    base0F =
+      "#d699b6"; # Deprecated, Opening/Closing Embedded Language Tags, ...
+  };
 }

colorscheme/gruvbox-dark/default.nix

@@ -0,0 +1,45 @@
+# Gruvbox with a darker background for greater contrast
+
+{
+  name = "gruvbox-dark"; # Dark, Medium
+  author =
+    "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox), ElRastaOk (https://www.reddit.com/user/ElRastaOk)";
+  dark = {
+    base00 = "#1D2122"; # ---- This is the change from normal gruvbox
+    base01 = "#3c3836"; # ---
+    base02 = "#504945"; # --
+    base03 = "#665c54"; # -
+    base04 = "#bdae93"; # +
+    base05 = "#d5c4a1"; # ++
+    base06 = "#ebdbb2"; # +++
+    base07 = "#fbf1c7"; # ++++
+    base08 = "#fb4934"; # red
+    base09 = "#fe8019"; # orange
+    base0A = "#fabd2f"; # yellow
+    base0B = "#b8bb26"; # green
+    base0C = "#8ec07c"; # aqua/cyan
+    base0D = "#83a598"; # blue
+    base0E = "#d3869b"; # purple
+    base0F = "#d65d0e"; # brown
+    batTheme = "gruvbox-dark";
+  };
+  light = {
+    base00 = "#fbf1c7"; # ----
+    base01 = "#ebdbb2"; # ---
+    base02 = "#d5c4a1"; # --
+    base03 = "#bdae93"; # -
+    base04 = "#665c54"; # +
+    base05 = "#504945"; # ++
+    base06 = "#3c3836"; # +++
+    base07 = "#1D2122"; # ++++ Adjusted darker here
+    base08 = "#9d0006"; # red
+    base09 = "#af3a03"; # orange
+    base0A = "#b57614"; # yellow
+    base0B = "#79740e"; # green
+    base0C = "#427b58"; # aqua/cyan
+    base0D = "#076678"; # blue
+    base0E = "#8f3f71"; # purple
+    base0F = "#d65d0e"; # brown
+    batTheme = "gruvbox-light";
+  };
+}

colorscheme/gruvbox/default.nix

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

colorscheme/gruvbox/neovim-gruvbox.nix

@@ -1,12 +0,0 @@
-{ 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
-  '';
-
-}

colorscheme/nord/default.nix

@@ -1,21 +1,23 @@
 {
   name = "nord";
   author = "arcticicestudio";
-  base00 = "#2E3440";
-  base01 = "#3B4252";
-  base02 = "#434C5E";
-  base03 = "#4C566A";
-  base04 = "#D8DEE9";
-  base05 = "#E5E9F0";
-  base06 = "#ECEFF4";
-  base07 = "#8FBCBB";
-  base08 = "#88C0D0";
-  base09 = "#81A1C1";
-  base0A = "#5E81AC";
-  base0B = "#BF616A";
-  base0C = "#D08770";
-  base0D = "#EBCB8B";
-  base0E = "#A3BE8C";
-  base0F = "#B48EAD";
-  neovimConfig = ./neovim.lua;
+  dark = {
+    base00 = "#2E3440";
+    base01 = "#3B4252";
+    base02 = "#434C5E";
+    base03 = "#4C566A";
+    base04 = "#D8DEE9";
+    base05 = "#E5E9F0";
+    base06 = "#ECEFF4";
+    base07 = "#8FBCBB";
+    base08 = "#88C0D0";
+    base09 = "#81A1C1";
+    base0A = "#5E81AC";
+    base0B = "#BF616A";
+    base0C = "#D08770";
+    base0D = "#EBCB8B";
+    base0E = "#A3BE8C";
+    base0F = "#B48EAD";
+    batTheme = "nord";
+  };
 }

colorscheme/nord/neovim.lua

@@ -1,13 +0,0 @@
-local M = {}
-
-M.packer = function(use)
-    use({
-        "shaunsingh/nord.nvim",
-        config = function()
-            vim.g.nord_italic = true
-            vim.cmd("colorscheme nord")
-        end,
-    })
-end
-
-return M

disks/root.nix

@@ -0,0 +1,42 @@
+{ disk, ... }: {
+  disk = {
+    boot = {
+      type = "disk";
+      device = disk;
+      content = {
+        type = "table";
+        format = "gpt";
+        partitions = [
+          # Boot partition
+          {
+            name = "ESP";
+            start = "0";
+            end = "512MiB";
+            fs-type = "fat32";
+            bootable = true;
+            content = {
+              type = "filesystem";
+              format = "vfat";
+              mountpoint = "/boot";
+              extraArgs = [ "-n boot" ];
+            };
+          }
+          # Root partition ext4
+          {
+            name = "root";
+            start = "512MiB";
+            end = "100%";
+            part-type = "primary";
+            bootable = true;
+            content = {
+              type = "filesystem";
+              format = "ext4";
+              mountpoint = "/";
+              extraArgs = [ "-L nixos" ];
+            };
+          }
+        ];
+      };
+    };
+  };
+}

disks/zfs.nix

@@ -0,0 +1,95 @@
+{ pool, disks, ... }: {
+  disk = lib.genAttrs disks (disk: {
+    "${disk}" = {
+      type = "disk";
+      device = "/dev/${disk}";
+      content = {
+        type = "table";
+        format = "gpt";
+        partitions = [{
+          type = "partition";
+          name = "zfs";
+          start = "128MiB";
+          end = "100%";
+          content = {
+            type = "zfs";
+            pool = pool;
+          };
+        }];
+      };
+    };
+  });
+  zpool = {
+    "${pool}" = {
+      type = "zpool";
+      mode = "raidz1";
+      rootFsOptions = {
+        compression = "on"; # lz4 by default
+        "com.sun:auto-snapshot" = "false";
+        ashift = "12";
+      };
+      # mountpoint = "/";
+
+      datasets = {
+        root = {
+          zfs_type = "filesystem";
+          mountpoint = null;
+          options."com.sun:auto-snapshot" = "false";
+        };
+        # "media/movies" = {
+        #   zfs_type = "filesystem";
+        #   mountpoint = "/media/movies";
+        #   options.recordsize = "1M";
+        # };
+        # "media/tv" = {
+        #   zfs_type = "filesystem";
+        #   mountpoint = "/media/tv";
+        #   options.recordsize = "1M";
+        # };
+        # "media/books" = {
+        #   zfs_type = "filesystem";
+        #   mountpoint = "/media/books";
+        # };
+        # archive = {
+        #   zfs_type = "filesystem";
+        #   mountpoint = "/archive";
+        #   options.compression = "zstd";
+        #   options."com.sun:auto-snapshot" = "true";
+        # };
+        # zfs_unmounted_fs = {
+        #   zfs_type = "filesystem";
+        #   options.mountpoint = "none";
+        # };
+        # zfs_legacy_fs = {
+        #   zfs_type = "filesystem";
+        #   options.mountpoint = "legacy";
+        #   mountpoint = "/zfs_legacy_fs";
+        # };
+        # zfs_testvolume = {
+        #   zfs_type = "volume";
+        #   size = "10M";
+        #   content = {
+        #     type = "filesystem";
+        #     format = "ext4";
+        #     mountpoint = "/ext4onzfs";
+        #   };
+        # };
+        # encrypted = {
+        #   zfs_type = "filesystem";
+        #   size = "20M";
+        #   options = {
+        #     mountpoint = "none";
+        #     encryption = "aes-256-gcm";
+        #     keyformat = "passphrase";
+        #     keylocation = "file:///tmp/secret.key";
+        #   };
+        # };
+        # "encrypted/test" = {
+        #   zfs_type = "filesystem";
+        #   size = "2M";
+        #   mountpoint = "/zfs_crypted";
+        # };
+      };
+    };
+  };
+}

docs/installation.md

@@ -0,0 +1,67 @@
+[Back to README](../README.md)
+
+---
+
+# Installation
+
+## NixOS - From Live Disk
+
+Format drives and build system from any NixOS host, including the live
+installer disk:
+
+**This will erase your drives; use at your own risk!**
+
+```bash
+lsblk # Choose the disk you want to wipe
+nix-shell -p nixVersions.stable
+nix run github:nmasur/dotfiles#installer -- nvme0n1 tempest
+```
+
+## NixOS - From Existing System
+
+If you're already running NixOS, you can switch to this configuration with the
+following command:
+
+```bash
+nix-shell -p nixVersions.stable
+sudo nixos-rebuild switch --flake github:nmasur/dotfiles#tempest
+```
+
+## Windows - From NixOS WSL
+
+After [installing NixOS on
+WSL](https://xeiaso.net/blog/nix-flakes-4-wsl-2022-05-01), you can switch to
+the WSL configuration:
+
+```
+nix-shell -p nixVersions.stable
+sudo nixos-rebuild switch --flake github:nmasur/dotfiles#hydra
+```
+
+You should also download the
+[FiraCode](https://github.com/ryanoasis/nerd-fonts/releases/download/v2.2.2/FiraCode.zip)
+font and install it on Windows. Install [Alacritty](https://alacritty.org/) and
+move the `windows/alacritty.yml` file to
+`C:\Users\<user>\AppData\Roaming\alacritty`.
+
+## macOS
+
+To get started on a bare macOS installation, first install Nix:
+
+```bash
+sh -c "$(curl -L https://nixos.org/nix/install)"
+```
+
+Then use Nix to build nix-darwin:
+
+```bash
+nix-build https://github.com/LnL7/nix-darwin/archive/master.tar.gz -A installer
+./result/bin/darwin-installer
+```
+
+Then switch to the macOS configuration:
+
+```bash
+darwin-rebuild switch --flake github:nmasur/dotfiles#lookingglass
+```
+

docs/restore-calibre.md

@@ -0,0 +1,23 @@
+# Restoring Calibre From Backup
+
+The `metadata.db` holds the library and `app.db` and `gdrive.db` contain the
+web/account information.
+
+Place books directories in `/data/books/`.
+
+Place `metadata.db` in `/var/lib/calibre-web-db/`.
+
+Symlink `metadata.db` to the library:
+
+```
+sudo ln -s /var/lib/calibre-web-db/metadata.db /data/books/metadata.db
+```
+
+Place `app.db` and `gdrive.db` in `/var/lib/calibre-web/`.
+
+Restart Calibre:
+
+```
+sudo systemctl restart calibre-web.service
+```
+

docs/restore-nextcloud.md

@@ -0,0 +1,43 @@
+# Restoring Nextcloud From Backup
+
+Install the `litestream` package.
+
+```
+nix-shell --run fish -p litestream
+```
+
+Set the S3 credentials:
+
+```
+set -x AWS_ACCESS_KEY_ID (read)
+set -x AWS_SECRET_ACCESS_KEY (read)
+```
+
+Restore from S3:
+
+```
+litestream restore -o nextcloud.db s3://noahmasur-backup.s3.us-west-002.backblazeb2.com/nextcloud
+```
+
+Install Nextcloud. Then copy DB:
+
+```
+sudo rm /data/nextcloud/data/nextcloud.db*
+sudo mv nextcloud.db /data/nextcloud/data/
+sudo chown nextcloud:nextcloud /data/nextcloud/data/nextcloud.db
+sudo chmod 770 /data/nextcloud/data/nextcloud.db
+```
+
+Restart Nextcloud:
+
+```
+sudo systemctl restart phpfpm-nextcloud.service
+```
+
+Adjust Permissions and Directories:
+
+```
+sudo mkdir /data/nextcloud/data/noah/files
+sudo chown nextcloud:nextcloud /data/nextcloud/data/noah/files
+```
+

flake.lock

@@ -3,15 +3,16 @@
     "Comment-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1668781964,
-        "narHash": "sha256-po1MyuuOH3e8yJTAtkxnusFSJuNpQnjpe+zfWPoO62E=",
+        "lastModified": 1681214440,
+        "narHash": "sha256-48hy+hiaDJLlgWqC7IeZI3dT+VwWkRo4atQbyPxu/ys=",
         "owner": "numToStr",
         "repo": "Comment.nvim",
-        "rev": "5f01c1a89adafc52bf34e3bf690f80d9d726715d",
+        "rev": "e51f2b142d88bb666dcaa77d93a07f4b419aca70",
         "type": "github"
       },
       "original": {
         "owner": "numToStr",
+        "ref": "v0.8.0",
         "repo": "Comment.nvim",
         "type": "github"
       }
@@ -19,15 +20,16 @@
     "bufferline-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1668632062,
-        "narHash": "sha256-qGl1jwBaMFWsrth7F20KrfJpyVENF8GEOJsVBBcSTVA=",
+        "lastModified": 1687763763,
+        "narHash": "sha256-wbOeylzjjScQXkrDbBU2HtrOZrp2YUK+wQ2aOkgxmRQ=",
         "owner": "akinsho",
         "repo": "bufferline.nvim",
-        "rev": "4ecfa81e470a589e74adcde3d5bb1727dd407363",
+        "rev": "bf2f6b7edd0abf6b0732f5e5c0a8f30e51611c75",
         "type": "github"
       },
       "original": {
         "owner": "akinsho",
+        "ref": "v4.2.0",
         "repo": "bufferline.nvim",
         "type": "github"
       }
@@ -35,11 +37,11 @@
     "cmp-nvim-lsp-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1668566979,
-        "narHash": "sha256-Mqkp8IH/laUx0cK7S0BjusTT+OtOOJOamZM4+93RHdU=",
+        "lastModified": 1687494203,
+        "narHash": "sha256-mU0soCz79erJXMMqD/FyrJZ0mu2n6fE0deymPzQlxts=",
         "owner": "hrsh7th",
         "repo": "cmp-nvim-lsp",
-        "rev": "59224771f91b86d1de12570b4070fe4ad7cd1eeb",
+        "rev": "44b16d11215dce86f253ce0c30949813c0a90765",
         "type": "github"
       },
       "original": {
@@ -55,11 +57,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1671196037,
-        "narHash": "sha256-2+J98SeczFWonbqFLMEAQC7vZEe6I2gM17XYvEmG52I=",
+        "lastModified": 1687517837,
+        "narHash": "sha256-Ea+JTy6NSf+wWIFrgC8gnOnyt01xwmtDEn2KecvaBkg=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "adb8ac0453c8b2c40f5bffb578453dbaee838952",
+        "rev": "6460468e7a3e1290f132fee4170ebeaa127f6f32",
         "type": "github"
       },
       "original": {
@@ -69,16 +71,38 @@
         "type": "github"
       }
     },
-    "firefox-darwin": {
+    "disko": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1671410692,
-        "narHash": "sha256-azBs+c7zMnjNXntsnFM67AKsTdlUhU4eFzZwtTEGScs=",
+        "lastModified": 1687598357,
+        "narHash": "sha256-70ciIe8415oQnQypawaqocEaLJcI1XtkqRNmle8vsrg=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "1e7098ee0448dc5d33df394d040f454cd42a809c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
+    "firefox-darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1688605308,
+        "narHash": "sha256-B9suu7dcdX4a18loO5ul237gqIJ5/+TRuheLj8fJjwM=",
         "owner": "bandithedoge",
         "repo": "nixpkgs-firefox-darwin",
-        "rev": "ce6bde60382284ca3044b4010143fec0c44a3cf5",
+        "rev": "78d28acf685e19d353b2ecb6c38eeb3fc624fc68",
         "type": "github"
       },
       "original": {
@@ -90,11 +114,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1668681692,
-        "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "009399224d5e398d03b22badca40a37ac85412a1",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
         "type": "github"
       },
       "original": {
@@ -105,11 +129,11 @@
     },
     "flake-utils": {
       "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "lastModified": 1678901627,
+        "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
         "type": "github"
       },
       "original": {
@@ -119,12 +143,15 @@
       }
     },
     "flake-utils_2": {
+      "inputs": {
+        "systems": "systems"
+      },
       "locked": {
-        "lastModified": 1659877975,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "lastModified": 1685518550,
+        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
         "type": "github"
       },
       "original": {
@@ -134,12 +161,15 @@
       }
     },
     "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_2"
+      },
       "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "lastModified": 1685518550,
+        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
         "type": "github"
       },
       "original": {
@@ -152,15 +182,14 @@
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
-        ],
-        "utils": "utils"
+        ]
       },
       "locked": {
-        "lastModified": 1671459164,
-        "narHash": "sha256-RbkDnvLV7WjbiF4Dpiezrf8kXxwieQXAVtY8ciRQj6Q=",
+        "lastModified": 1687627695,
+        "narHash": "sha256-6Pu7nWb52PRtUmihwuDNShDmsZiXgtXR0OARtH4DSik=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e7eba9cc46547ae86642ad3c6a9a4fb22c07bc26",
+        "rev": "172d46d4b2677b32277d903bdf4cff77c2cc6477",
         "type": "github"
       },
       "original": {
@@ -173,19 +202,22 @@
     "nil": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1670595719,
-        "narHash": "sha256-9jvA0QdcZtGWImiRZ8KRhXNsy5NxgZBm0TXtNLmFbyM=",
+        "lastModified": 1680544266,
+        "narHash": "sha256-d/TusDXmIo8IT5DNRA21lN+nOVSER8atIx9TJteR6LQ=",
         "owner": "oxalica",
         "repo": "nil",
-        "rev": "1c122ae707c6365ea731565daf307844df03e95e",
+        "rev": "56a1fa87b98a9508920f4b0ab8fe36d5b54b2362",
         "type": "github"
       },
       "original": {
         "owner": "oxalica",
+        "ref": "2023-04-03",
         "repo": "nil",
         "type": "github"
       }
@@ -198,11 +230,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1671522211,
-        "narHash": "sha256-i5BLrj3wlIC1VMQTfBSYIasEmv3D4as0Mu2K3rdJrSU=",
+        "lastModified": 1685980282,
+        "narHash": "sha256-uQyVaoqkiocA8bXKMfrgizuKmz0hUzHye5owFoUd2AQ=",
         "owner": "gytis-ivaskevicius",
         "repo": "nix2vim",
-        "rev": "3cc95ef557b6e2f97f5ff14ae89997a564d3a130",
+        "rev": "3836a348503ae27340c7f83f0bc7bcb907f3781d",
         "type": "github"
       },
       "original": {
@@ -213,11 +245,11 @@
     },
     "nixlib": {
       "locked": {
-        "lastModified": 1636849918,
-        "narHash": "sha256-nzUK6dPcTmNVrgTAC1EOybSMsrcx+QrVPyqRdyKLkjA=",
+        "lastModified": 1687049841,
+        "narHash": "sha256-FBNZQfWtA7bb/rwk92mfiWc85x4hXta2OAouDqO5W8w=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "28a5b0557f14124608db68d3ee1f77e9329e9dd5",
+        "rev": "908af6d1fa3643c5818ea45aa92b21d6385fbbe5",
         "type": "github"
       },
       "original": {
@@ -234,11 +266,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1671355134,
-        "narHash": "sha256-ZtnUWTDDyFog+NQBjZpnhgPdj3gHp5ImxFVWy+ObNno=",
+        "lastModified": 1687398392,
+        "narHash": "sha256-T6kc3NMTpGJk1/dve8PGupeVcxboEb78xtTKhe3LL/A=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "64a96ca8621d03cb3889daf0d3ff58d8209e3e0c",
+        "rev": "649171f56a45af13ba693c156207eafbbbf7edfe",
         "type": "github"
       },
       "original": {
@@ -249,43 +281,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1639237670,
-        "narHash": "sha256-RTdL4rEQcgaZGpvtDgkp3oK/V+1LM3I53n0ACPSroAQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "edfb969386ebe6c3cf8f878775a7975cd88f926d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "master",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1670559856,
-        "narHash": "sha256-xUkgQRFqE6HIFQXs9SIXMZiXcLaH2415UR6w/FnsgcY=",
+        "lastModified": 1687502512,
+        "narHash": "sha256-dBL/01TayOSZYxtY4cMXuNCBk8UMLoqRZA+94xiFpJA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6bc6f77cb171a74001033d94f17f49043a9f1804",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1671359686,
-        "narHash": "sha256-3MpC6yZo+Xn9cPordGz2/ii6IJpP2n8LE8e/ebUXLrs=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "04f574a1c0fde90b51bf68198e2297ca4e7cccf4",
+        "rev": "3ae20aa58a6c0d1ca95c9b11f59a2d12eebc511f",
         "type": "github"
       },
       "original": {
@@ -295,13 +295,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_2": {
       "locked": {
-        "lastModified": 1671313200,
-        "narHash": "sha256-itZTrtHeDJjV696+ur0/TzkTqb5y3Eb57WRLRPK3rwA=",
+        "lastModified": 1686929285,
+        "narHash": "sha256-WGtVzn+vGMPTXDO0DMNKVFtf+zUSqeW+KKk4Y/Ae99I=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0938d73bb143f4ae037143572f11f4338c7b2d1c",
+        "rev": "93fddcf640ceca0be331210ba3101cee9d91c13d",
         "type": "github"
       },
       "original": {
@@ -314,11 +314,11 @@
     "null-ls-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1671458255,
-        "narHash": "sha256-YQaWKSW9D1HEBva9GeivQkylFeYfTrFUiTkXYF4V8SA=",
+        "lastModified": 1686871437,
+        "narHash": "sha256-MxIZqyRW8jStiDNXt7Bsw8peDLKpqxKEaUuIJsXkGMI=",
         "owner": "jose-elias-alvarez",
         "repo": "null-ls.nvim",
-        "rev": "db1c7cb5f6d6f6036b7f8433bb3cfcbe985cb3d1",
+        "rev": "bbaf5a96913aa92281f154b08732be2f57021c45",
         "type": "github"
       },
       "original": {
@@ -329,11 +329,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1671547500,
-        "narHash": "sha256-97hzIBBNDbva9eRj1WomM+pimxt7hVrH/yNjUfJSMJc=",
+        "lastModified": 1687625402,
+        "narHash": "sha256-V+vSWypmm/tGbwNXGhqzmiV7vTjV2gNCEh9N7OhNnyA=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "4103fbdf825891b4dc54a6bda72ef1757081444c",
+        "rev": "aeaf37c7538965e45700d39e6b5dc9c9a0e0749c",
         "type": "github"
       },
       "original": {
@@ -345,15 +345,16 @@
     "nvim-lspconfig-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1671517641,
-        "narHash": "sha256-RWXc/nCVNPv0BQN99QQMfeplQFpEsNJdmyoC/TQuIYQ=",
+        "lastModified": 1675639052,
+        "narHash": "sha256-B8IgpypxzCACZ5VcqM6KiWyClaN+KrmemtkwMznmj5Y=",
         "owner": "neovim",
         "repo": "nvim-lspconfig",
-        "rev": "d597b0f3605f43526f1b6948c6d7ca2919ea32ac",
+        "rev": "255e07ce2a05627d482d2de77308bba51b90470c",
         "type": "github"
       },
       "original": {
         "owner": "neovim",
+        "ref": "v0.1.6",
         "repo": "nvim-lspconfig",
         "type": "github"
       }
@@ -361,11 +362,11 @@
     "nvim-tree-lua-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1671430707,
-        "narHash": "sha256-SdQ7nCgrtSN96XeaPjDoGnc++jllYy/up/jDc5LunRM=",
+        "lastModified": 1687132855,
+        "narHash": "sha256-ZRUoCDBv8rO8ZUBUMLgo33EBbqD9+ZOSET9rkFsA++E=",
         "owner": "kyazdani42",
         "repo": "nvim-tree.lua",
-        "rev": "e14c2895b4f36a22001f7773244041c173dcf867",
+        "rev": "c3c6544ee00333b0f1d6a13735d0dd302dba4f70",
         "type": "github"
       },
       "original": {
@@ -377,15 +378,16 @@
     "nvim-treesitter-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1671521720,
-        "narHash": "sha256-GeuRomX3cFXK/zqWf1SJ3WXbTSLLy3FT99lIyhVnefo=",
+        "lastModified": 1681121236,
+        "narHash": "sha256-iPsPDLhVKJ14iP1/2cCgcY9SCKK/DQz9Y0mQB1DqNiM=",
         "owner": "nvim-treesitter",
         "repo": "nvim-treesitter",
-        "rev": "eedb7b9c69b13afe86461b0742266bb62b811ece",
+        "rev": "cc360a9beb1b30d172438f640e2c3450358c4086",
         "type": "github"
       },
       "original": {
         "owner": "nvim-treesitter",
+        "ref": "v0.9.0",
         "repo": "nvim-treesitter",
         "type": "github"
       }
@@ -396,12 +398,13 @@
         "bufferline-nvim-src": "bufferline-nvim-src",
         "cmp-nvim-lsp-src": "cmp-nvim-lsp-src",
         "darwin": "darwin",
+        "disko": "disko",
         "firefox-darwin": "firefox-darwin",
         "home-manager": "home-manager",
         "nil": "nil",
         "nix2vim": "nix2vim",
         "nixos-generators": "nixos-generators",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs",
         "null-ls-nvim-src": "null-ls-nvim-src",
         "nur": "nur",
         "nvim-lspconfig-src": "nvim-lspconfig-src",
@@ -410,6 +413,7 @@
         "telescope-nvim-src": "telescope-nvim-src",
         "telescope-project-nvim-src": "telescope-project-nvim-src",
         "toggleterm-nvim-src": "toggleterm-nvim-src",
+        "vscode-terraform-snippets": "vscode-terraform-snippets",
         "wallpapers": "wallpapers",
         "wsl": "wsl"
       }
@@ -426,11 +430,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1670552927,
-        "narHash": "sha256-lCE51eAGrAFS4k9W5aDGFpVtOAwQQ/rFMN80PCDh0vo=",
+        "lastModified": 1680488274,
+        "narHash": "sha256-0vYMrZDdokVmPQQXtFpnqA2wEgCCUXf5a3dDuDVshn0=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "a0fdafd18c9cf599fde17fbaf07dbb20fa57eecb",
+        "rev": "7ec2ff598a172c6e8584457167575b3a1a5d80d8",
         "type": "github"
       },
       "original": {
@@ -439,18 +443,49 @@
         "type": "github"
       }
     },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "telescope-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1669979094,
-        "narHash": "sha256-5UgCqnDs4iubnq7gER1wC8Mk9UZuo8cWqDB8ZbyGCRI=",
+        "lastModified": 1686302912,
+        "narHash": "sha256-fV3LLRwAPykVGc4ImOnUSP+WTrPp9Ad9OTfBJ6wqTMk=",
         "owner": "nvim-telescope",
         "repo": "telescope.nvim",
-        "rev": "cabf991b1d3996fa6f3232327fc649bbdf676496",
+        "rev": "776b509f80dd49d8205b9b0d94485568236d1192",
         "type": "github"
       },
       "original": {
         "owner": "nvim-telescope",
+        "ref": "0.1.2",
         "repo": "telescope.nvim",
         "type": "github"
       }
@@ -458,11 +493,11 @@
     "telescope-project-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1665406281,
-        "narHash": "sha256-ZBFgUlW+h7vndazZ0lZux8i7yQHKJNDPQPZ2z96Rfpk=",
+        "lastModified": 1682606566,
+        "narHash": "sha256-H6lrPjpOUVleKHB0ziI+6dthg9ymitHhEWtcgYJTrKo=",
         "owner": "nvim-telescope",
         "repo": "telescope-project.nvim",
-        "rev": "ff4d3cea905383a67d1a47b9dd210c4907d858c2",
+        "rev": "7c64b181dd4e72deddcf6f319e3bf1e95b2a2f30",
         "type": "github"
       },
       "original": {
@@ -474,31 +509,33 @@
     "toggleterm-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1670593071,
-        "narHash": "sha256-0n3WbUM3rYyR2BXgeyYuyTZIbIs5dzuIu8imsSvAc8U=",
+        "lastModified": 1685434104,
+        "narHash": "sha256-oiCnBrvft6XxiQtQH8E4F842xhh348SaTpHzaeb+iDY=",
         "owner": "akinsho",
         "repo": "toggleterm.nvim",
-        "rev": "b02a1674bd0010d7982b056fd3df4f717ff8a57a",
+        "rev": "95204ece0f2a54c89c4395295432f9aeedca7b5f",
         "type": "github"
       },
       "original": {
         "owner": "akinsho",
+        "ref": "v2.7.0",
         "repo": "toggleterm.nvim",
         "type": "github"
       }
     },
-    "utils": {
+    "vscode-terraform-snippets": {
+      "flake": false,
       "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "lastModified": 1614849738,
+        "narHash": "sha256-v392tyzXV+zyBNt5OCB2NBCK7JcByrTa5Ne/nFtSCJI=",
+        "owner": "run-at-scale",
+        "repo": "vscode-terraform-doc-snippets",
+        "rev": "6ab3e44b566e660f38922cf908e6e547eaa5d4b4",
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
+        "owner": "run-at-scale",
+        "repo": "vscode-terraform-doc-snippets",
         "type": "github"
       }
     },
@@ -522,14 +559,14 @@
       "inputs": {
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1671480147,
-        "narHash": "sha256-IzWdZL8jMNtyKsXXJjn2L4MsBeR52WBdhciPw4latHU=",
+        "lastModified": 1687279045,
+        "narHash": "sha256-LR0dsXd/A07M61jclyBUW0wRojEQteWReKM35zoJXp0=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "577d7919e4380e6905e69d4a5f8f48a41ca37187",
+        "rev": "a8486b5d191f11d571f15d80b6e265d1712d01cf",
         "type": "github"
       },
       "original": {

flake.nix

@@ -16,18 +16,27 @@
     # Used for Windows Subsystem for Linux compatibility
     wsl.url = "github:nix-community/NixOS-WSL";
 
-    # Used for user packages
+    # Used for user packages and dotfiles
     home-manager = {
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows =
-        "nixpkgs"; # Use system packages list where available
+        "nixpkgs"; # Use system packages list for their inputs
     };
 
     # Community packages; used for Firefox extensions
     nur.url = "github:nix-community/nur";
 
     # Use official Firefox binary for macOS
-    firefox-darwin.url = "github:bandithedoge/nixpkgs-firefox-darwin";
+    firefox-darwin = {
+      url = "github:bandithedoge/nixpkgs-firefox-darwin";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    # Manage disk format and partitioning
+    disko = {
+      url = "github:nix-community/disko";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     # Wallpapers
     wallpapers = {
@@ -48,11 +57,14 @@
     };
 
     # Nix language server
-    nil.url = "github:oxalica/nil";
+    nil = {
+      url = "github:oxalica/nil/2023-04-03";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     # Neovim plugins
     nvim-lspconfig-src = {
-      url = "github:neovim/nvim-lspconfig";
+      url = "github:neovim/nvim-lspconfig/v0.1.6";
       flake = false;
     };
     cmp-nvim-lsp-src = {
@@ -64,15 +76,15 @@
       flake = false;
     };
     Comment-nvim-src = {
-      url = "github:numToStr/Comment.nvim";
+      url = "github:numToStr/Comment.nvim/v0.8.0";
       flake = false;
     };
     nvim-treesitter-src = {
-      url = "github:nvim-treesitter/nvim-treesitter";
+      url = "github:nvim-treesitter/nvim-treesitter/v0.9.0";
       flake = false;
     };
     telescope-nvim-src = {
-      url = "github:nvim-telescope/telescope.nvim";
+      url = "github:nvim-telescope/telescope.nvim/0.1.2";
       flake = false;
     };
     telescope-project-nvim-src = {
@@ -80,17 +92,21 @@
       flake = false;
     };
     toggleterm-nvim-src = {
-      url = "github:akinsho/toggleterm.nvim";
+      url = "github:akinsho/toggleterm.nvim/v2.7.0";
       flake = false;
     };
     bufferline-nvim-src = {
-      url = "github:akinsho/bufferline.nvim";
+      url = "github:akinsho/bufferline.nvim/v4.2.0";
       flake = false;
     };
     nvim-tree-lua-src = {
       url = "github:kyazdani42/nvim-tree.lua";
       flake = false;
     };
+    vscode-terraform-snippets = {
+      url = "github:run-at-scale/vscode-terraform-doc-snippets";
+      flake = false;
+    };
 
   };
 
@@ -98,23 +114,40 @@
 
     let
 
+      # Common overlays to always use
+      overlays = [
+        inputs.nur.overlay
+        inputs.nix2vim.overlay
+        (import ./overlays/neovim-plugins.nix inputs)
+        (import ./overlays/calibre-web.nix)
+        (import ./overlays/disko.nix inputs)
+        (import ./overlays/tree-sitter.nix inputs)
+      ];
+
       # Global configuration for my systems
-      globals = rec {
+      globals = let baseName = "masu.rs";
+      in rec {
         user = "noah";
         fullName = "Noah Masur";
         gitName = fullName;
         gitEmail = "7386960+nmasur@users.noreply.github.com";
         mail.server = "noahmasur.com";
+        mail.imapHost = "imap.purelymail.com";
+        mail.smtpHost = "smtp.purelymail.com";
         dotfilesRepo = "git@github.com:nmasur/dotfiles";
+        nixpkgs.overlays = overlays;
+        hostnames = {
+          git = "git.${baseName}";
+          metrics = "metrics.${baseName}";
+          prometheus = "prom.${baseName}";
+          secrets = "vault.${baseName}";
+          stream = "stream.${baseName}";
+          content = "cloud.${baseName}";
+          books = "books.${baseName}";
+          download = "download.${baseName}";
+        };
       };
 
-      # Common overlays to always use
-      overlays = [
-        inputs.nur.overlay
-        inputs.nix2vim.overlay
-        (import ./modules/neovim/plugins-overlay.nix inputs)
-      ];
-
       # System types to support.
       supportedSystems =
         [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
@@ -124,46 +157,66 @@
 
     in rec {
 
+      nixosModules = {
+        globals = { config }: { config = globals; };
+        common = import ./modules/common;
+        nixos = import ./modules/nixos;
+        darwin = import ./modules/darwin;
+      };
+
+      # Contains my full system builds, including home-manager
+      # nixos-rebuild switch --flake .#tempest
       nixosConfigurations = {
-        desktop = import ./hosts/desktop { inherit inputs globals overlays; };
-        wsl = import ./hosts/wsl { inherit inputs globals overlays; };
-        oracle = import ./hosts/oracle { inherit inputs globals overlays; };
+        tempest = import ./hosts/tempest { inherit self; };
+        hydra = import ./hosts/hydra { inherit self; };
+        flame = import ./hosts/flame { inherit self; };
+        swan = import ./hosts/swan { inherit self; };
       };
 
+      # Contains my full Mac system builds, including home-manager
+      # darwin-rebuild switch --flake .#lookingglass
       darwinConfigurations = {
-        macbook = import ./hosts/macbook { inherit inputs globals overlays; };
+        lookingglass = import ./hosts/lookingglass { inherit self; };
       };
 
-      # For quickly applying local settings with:
-      # home-manager switch --flake .#desktop
+      # For quickly applying home-manager settings with:
+      # 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 = forAllSystems (system: {
+      # Disk formatting, only used once
+      diskoConfigurations = { root = import ./disks/root.nix; };
 
-        aws = {
-          "${system}" =
-            import ./hosts/aws { inherit inputs globals system overlays; };
-        };
+      packages = let
+        aws = system: import ./hosts/aws { inherit self system; };
+        staff = system: import ./hosts/staff { inherit self system; };
+        neovim = system:
+          let pkgs = import nixpkgs { inherit system overlays; };
+          in import ./modules/common/neovim/package {
+            inherit pkgs;
+            colors = (import ./colorscheme/gruvbox-dark).dark;
+          };
+      in {
+        x86_64-linux.aws = aws "x86_64-linux";
+        x86_64-linux.staff = staff "x86_64-linux";
 
-        neovim = let pkgs = import nixpkgs { inherit system overlays; };
-        in import ./modules/neovim/package {
-          inherit pkgs;
-          colors =
-            import ./colorscheme/gruvbox/neovim-gruvbox.nix { inherit pkgs; };
-        };
-
-      });
+        # Package Neovim config into standalone package
+        x86_64-linux.neovim = neovim "x86_64-linux";
+        x86_64-darwin.neovim = neovim "x86_64-darwin";
+        aarch64-linux.neovim = neovim "aarch64-linux";
+        aarch64-darwin.neovim = neovim "aarch64-darwin";
+      };
 
+      # Programs that can be run by calling this flake
       apps = forAllSystems (system:
         let pkgs = import nixpkgs { inherit system overlays; };
         in import ./apps { inherit pkgs; });
 
+      # Development environments
       devShells = forAllSystems (system:
         let pkgs = import nixpkgs { inherit system overlays; };
         in {
@@ -173,23 +226,6 @@
             buildInputs = with pkgs; [ git stylua nixfmt shfmt shellcheck ];
           };
 
-          # Used for cloud and systems development and administration
-          devops = pkgs.mkShell {
-            buildInputs = with pkgs; [
-              git
-              terraform
-              consul
-              vault
-              awscli2
-              google-cloud-sdk
-              ansible
-              kubectl
-              kubernetes-helm
-              kustomize
-              fluxcd
-            ];
-          };
-
         });
 
       # Templates for starting other projects quickly

hosts/README.md

@@ -0,0 +1,12 @@
+# Hosts
+
+| Host                                       | Purpose             |
+| ---                                        | ---                 |
+| [aws](./aws/default.nix)                   | AWS AMI             |
+| [staff](./staff/default.nix)               | Live USB stick      |
+| [flame](./flame/default.nix)               | Oracle cloud server |
+| [hydra](./hydra/default.nix)               | WSL config          |
+| [lookingglass](./lookingglass/default.nix) | Work MacBook        |
+| [swan](./swan/default.nix)                 | Home server         |
+| [tempest](./tempest/default.nix)           | Linux desktop       |
+

hosts/aws/default.nix

@@ -1,30 +1,23 @@
-{ inputs, globals, ... }:
+{ self, system, ... }:
 
-with inputs;
-
-nixos-generators.nixosGenerate {
+self.inputs.nixos-generators.nixosGenerate {
   inherit system;
   format = "amazon";
   modules = [
-    home-manager.nixosModules.home-manager
+    self.inputs.home-manager.nixosModules.home-manager
+    self.nixosModules.globals
+    self.nixosModules.common
+    self.nixosModules.nixos
     {
-      user = globals.user;
-      fullName = globals.fullName;
-      dotfilesRepo = globals.dotfilesRepo;
-      gitName = globals.gitName;
-      gitEmail = globals.gitEmail;
       networking.hostName = "sheep";
       gui.enable = false;
-      colorscheme = (import ../modules/colorscheme/gruvbox);
+      theme.colors = (import ../../colorscheme/gruvbox).dark;
       passwordHash = null;
       publicKey =
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s";
       # AWS settings require this
       permitRootLogin = "prohibit-password";
     }
-    ../../hosts/common.nix
-    ../../modules/nixos
-    ../../modules/services/sshd.nix
   ] ++ [
     # Required to fix diskSize errors during build
     ({ ... }: { amazonImage.sizeMB = 16 * 1024; })

hosts/aws/workflow.yml

@@ -1,7 +1,6 @@
 name: 'Terraform'
 env:
 
-
   AWS_ACCOUNT_NUMBER: ''
   AWS_PLAN_ROLE_NAME: github_actions_plan
   AWS_APPLY_ROLE_NAME: github_actions_admin
@@ -82,15 +81,14 @@ jobs:
 
       # Downloads the current repo code to the runner.
       - name: Checkout Repo Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
-      # Install Nix
-      - name: Install Nix
-        uses: cachix/install-nix-action@v17
-
-      # Build the image
-      - name: Build Image
-        run: nix build .#aws
+      # Enable access to KVM, required to build an image
+      - name: Enable KVM group perms
+        run: |
+            echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+            sudo udevadm control --reload-rules
+            sudo udevadm trigger --name-match=kvm
 
       # Login to AWS
       - name: AWS Assume Role
@@ -99,6 +97,28 @@ jobs:
           role-to-assume: ${{ env.AWS_ROLE_ARN }}
           aws-region: ${{ env.AWS_REGION }}
 
+      # Install Nix
+      - name: Install Nix
+        uses: cachix/install-nix-action@v17
+        with:
+          extra_nix_config: |
+            substituters = s3://insert-cache-bucket https://cache.nixos.org/
+            trusted-public-keys = insert-cache-bucket:M6PsZjHXcLvbQyPUBLICKEYGVoNwI84g1FBQzouRU= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
+
+      # Build the image
+      - name: Build Image
+        run: nix build .#aws
+
+      # Copy the image to S3
+      - name: Upload Image to Cache
+        env:
+          NIX_CACHE_PRIVATE_KEY: ${{ secrets.NIX_CACHE_PRIVATE_KEY }}
+        run: |
+          echo "$NIX_CACHE_PRIVATE_KEY" > cache.key
+          nix store sign --key-file cache.key $(readlink result)
+          nix copy --to s3://t2-aws-nixos-test $(readlink result)
+          rm cache.key
+
       # Exports all GitHub Secrets as environment variables prefixed by
       # "TF_VAR_", which exposes them to Terraform. The name of each GitHub
       # Secret must match its Terraform variable name exactly.

hosts/desktop/default.nix

@@ -1,52 +0,0 @@
-{ inputs, globals, ... }:
-
-with inputs;
-
-# System configuration for my desktop
-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 = "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 ../../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;
-
-      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;
-      gaming.enable = true;
-      gaming.steam.enable = true;
-      gaming.legendary.enable = true;
-      keybase.enable = true;
-      mullvad.enable = true;
-      nixlang.enable = true;
-      dotfiles.enable = true;
-    }
-  ];
-}

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

@@ -0,0 +1,107 @@
+# 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/
+
+{ self, ... }:
+
+self.inputs.nixpkgs.lib.nixosSystem {
+  system = "aarch64-linux";
+  specialArgs = { };
+  modules = [
+    self.inputs.home-manager.nixosModules.home-manager
+    self.nixosModules.globals
+    self.nixosModules.common
+    self.nixosModules.nixos
+    {
+      # Hardware
+      server = true;
+      networking.hostName = "flame";
+
+      imports =
+        [ (self.inputs.nixpkgs + "/nixos/modules/profiles/qemu-guest.nix") ];
+      boot.initrd.availableKernelModules = [ "xhci_pci" "virtio_pci" "usbhid" ];
+
+      fileSystems."/" = {
+        device = "/dev/disk/by-uuid/e1b6bd50-306d-429a-9f45-78f57bc597c3";
+        fsType = "ext4";
+      };
+
+      fileSystems."/boot" = {
+        device = "/dev/disk/by-uuid/D5CA-237A";
+        fsType = "vfat";
+      };
+
+      # Theming
+      gui.enable = false;
+      theme = { colors = (import ../../colorscheme/gruvbox).dark; };
+
+      # Disable passwords, only use SSH key
+      publicKey =
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s";
+
+      # Programs and services
+      cloudflare.enable = true; # Proxy traffic with Cloudflare
+      dotfiles.enable = true; # Clone dotfiles
+      neovim.enable = true;
+
+      services.caddy.enable = true;
+      services.grafana.enable = true;
+      services.prometheus.enable = true;
+      services.gitea.enable = true;
+      services.vaultwarden.enable = true;
+      services.minecraft-server.enable = true; # Setup Minecraft server
+
+      cloudflareTunnel = {
+        enable = true;
+        id = "bd250ee1-ed2e-42d2-b627-039f1eb5a4d2";
+        credentialsFile = ../../private/cloudflared-flame.age;
+        ca =
+          "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK/6oyVqjFGX3Uvrc3VS8J9sphxzAnRzKC85xgkHfYgR3TK6qBGXzHrknEj21xeZrr3G2y1UsGzphWJd9ZfIcdA= open-ssh-ca@cloudflareaccess.org";
+      };
+
+      giteaRunner.enable = true;
+
+      # Nextcloud backup config
+      backup.s3 = {
+        endpoint = "s3.us-west-002.backblazeb2.com";
+        bucket = "noahmasur-backup";
+        accessKeyId = "0026b0e73b2e2c80000000005";
+      };
+
+      # # Wireguard config for Transmission
+      # wireguard.enable = true;
+      # networking.wireguard.interfaces.wg0 = {
+      #
+      #   # The local IPs for this machine within the Wireguard network
+      #   # Any inbound traffic bound for these IPs should be kept on localhost
+      #   ips = [ "10.66.13.200/32" "fc00:bbbb:bbbb:bb01::3:dc7/128" ];
+      #
+      #   peers = [{
+      #
+      #     # Identity of Wireguard target peer (VPN)
+      #     publicKey = "bOOP5lIjqCdDx5t+mP/kEcSbHS4cZqE0rMlBI178lyY=";
+      #
+      #     # The public internet address of the target peer
+      #     endpoint = "86.106.143.132:51820";
+      #
+      #     # Which outgoing IP ranges should be sent through Wireguard
+      #     allowedIPs = [ "0.0.0.0/0" "::0/0" ];
+      #
+      #     # Send heartbeat signal within the network
+      #     persistentKeepalive = 25;
+      #
+      #   }];
+      #
+      # };
+
+      # # VPN port forwarding
+      # services.transmission.settings.peer-port = 57599;
+
+      # # Grant access to Transmission directories from Jellyfin
+      # users.users.jellyfin.extraGroups = [ "transmission" ];
+
+    }
+  ];
+}

hosts/hydra/default.nix

@@ -1,38 +1,39 @@
-{ inputs, globals, ... }:
-
-with inputs;
-
+# The Hydra
 # System configuration for WSL
-nixpkgs.lib.nixosSystem {
+
+{ self, ... }:
+
+self.inputs.nixpkgs.lib.nixosSystem {
   system = "x86_64-linux";
   specialArgs = { };
   modules = [
-    ../../modules
-    ../../nixos
-    globals
-    wsl.nixosModules.wsl
-    home-manager.nixosModules.home-manager
+    self.inputs.wsl.nixosModules.wsl
+    self.inputs.home-manager.nixosModules.home-manager
+    self.nixosModules.globals
+    self.nixosModules.common
+    self.nixosModules.nixos
+    self.nixosModules.wsl
     {
-      networking.hostName = "wsl";
-      # Set registry to flake packages, used for nix X commands
-      nix.registry.nixpkgs.flake = nixpkgs;
+      networking.hostName = "hydra";
       identityFile = "/home/${globals.user}/.ssh/id_ed25519";
       gui.enable = false;
       theme = {
         colors = (import ../../colorscheme/gruvbox).dark;
         dark = true;
       };
-      passwordHash = nixpkgs.lib.fileContents ../../private/password.sha512;
+      passwordHash = inputs.nixpkgs.lib.fileContents ../../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;

hosts/lookingglass/default.nix

@@ -0,0 +1,46 @@
+# The Looking Glass
+# System configuration for my work Macbook
+
+{ self, ... }:
+
+self.inputs.darwin.lib.darwinSystem {
+  system = "x86_64-darwin";
+  specialArgs = { };
+  modules = [
+    self.inputs.home-manager.darwinModules.home-manager
+    self.nixosModules.common
+    self.nixosModules.darwin
+    ({ config, lib, ... }: {
+      config = rec {
+        user = lib.mkForce "Noah.Masur";
+        gitName = lib.mkForce "Noah-Masur_1701";
+        gitEmail = lib.mkForce "${user}@take2games.com";
+        nixpkgs.overlays = [ self.inputs.firefox-darwin.overlay ];
+        networking.hostName = "lookingglass";
+        identityFile = "/Users/${user}/.ssh/id_ed25519";
+        gui.enable = true;
+        theme = {
+          colors = (import ../../colorscheme/gruvbox-dark).dark;
+          dark = true;
+        };
+        mail.user = globals.user;
+        charm.enable = true;
+        neovim.enable = true;
+        mail.enable = true;
+        mail.aerc.enable = true;
+        mail.himalaya.enable = false;
+        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;
+        slack.enable = true;
+      };
+    })
+  ];
+}

hosts/macbook/default.nix

@@ -1,46 +0,0 @@
-{ inputs, globals, overlays, ... }:
-
-with inputs;
-
-# System configuration for my work MacBook
-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/oracle/default.nix

@@ -1,97 +0,0 @@
-{ inputs, globals, overlays, ... }:
-
-with inputs;
-
-# 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/
-
-nixpkgs.lib.nixosSystem {
-  system = "aarch64-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;
-
-      # FQDNs for various services
-      networking.hostName = "oracle";
-      bookServer = "books.masu.rs";
-      streamServer = "stream.masu.rs";
-      nextcloudServer = "cloud.masu.rs";
-      transmissionServer = "download.masu.rs";
-      metricsServer = "metrics.masu.rs";
-      vaultwardenServer = "vault.masu.rs";
-      giteaServer = "git.masu.rs";
-
-      # Disable passwords, only use SSH key
-      publicKey =
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s";
-
-      # Nextcloud backup config
-      backup.s3 = {
-        endpoint = "s3.us-west-002.backblazeb2.com";
-        bucket = "noahmasur-backup";
-        accessKeyId = "0026b0e73b2e2c80000000005";
-      };
-
-      # Grant access to Jellyfin directories from Nextcloud
-      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
-        # Any inbound traffic bound for these IPs should be kept on localhost
-        ips = [ "10.66.13.200/32" "fc00:bbbb:bbbb:bb01::3:dc7/128" ];
-
-        peers = [{
-
-          # Identity of Wireguard target peer (VPN)
-          publicKey = "bOOP5lIjqCdDx5t+mP/kEcSbHS4cZqE0rMlBI178lyY=";
-
-          # The public internet address of the target peer
-          endpoint = "86.106.143.132:51820";
-
-          # Which outgoing IP ranges should be sent through Wireguard
-          allowedIPs = [ "0.0.0.0/0" "::0/0" ];
-
-          # Send heartbeat signal within the network
-          persistentKeepalive = 25;
-
-        }];
-
-      };
-
-      # VPN port forwarding
-      services.transmission.settings.peer-port = 57599;
-
-      # 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;
-
-    }
-  ];
-}

hosts/oracle/hardware-configuration.nix

@@ -1,34 +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 + "/profiles/qemu-guest.nix") ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "virtio_pci" "usbhid" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/e1b6bd50-306d-429a-9f45-78f57bc597c3";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/D5CA-237A";
-    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.eth0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
-}

hosts/staff/default.nix

@@ -0,0 +1,45 @@
+# The Staff
+# ISO configuration for my USB drive
+
+{ self, system, ... }:
+
+self.inputs.nixos-generators.nixosGenerate {
+  inherit system;
+  format = "install-iso";
+  modules = [
+    self.nixosModules.global
+    self.nixosModules.common
+    self.nixosModules.nixos
+    ({ config, pkgs, ... }: {
+      networking.hostName = "staff";
+      users.extraUsers.root.openssh.authorizedKeys.keys = [
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s"
+      ];
+      services.openssh = {
+        enable = true;
+        ports = [ 22 ];
+        allowSFTP = true;
+        settings = {
+          GatewayPorts = "no";
+          X11Forwarding = false;
+          PasswordAuthentication = false;
+          PermitRootLogin = "yes";
+        };
+      };
+      environment.systemPackages = with pkgs; [
+        git
+        vim
+        wget
+        curl
+        (import ../../modules/common/neovim/package {
+          inherit pkgs;
+          colors = (import ../../colorscheme/gruvbox).dark;
+        })
+      ];
+      nix.extraOptions = ''
+        experimental-features = nix-command flakes
+        warn-dirty = false
+      '';
+    })
+  ];
+}

hosts/swan/default.nix

@@ -0,0 +1,80 @@
+# The Swan
+# System configuration for my home NAS server
+
+{ self, ... }:
+
+self.inputs.nixpkgs.lib.nixosSystem {
+  system = "x86_64-linux";
+  specialArgs = { };
+  modules = [
+    self.inputs.home-manager.nixosModules.home-manager
+    self.inputs.disko.nixosModules.disko
+    self.nixosModules.globals
+    self.nixosModules.common
+    self.nixosModules.nixos
+    {
+      # Hardware
+      server = true;
+      networking.hostName = "swan";
+
+      boot.initrd.availableKernelModules =
+        [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ];
+
+      # Required for transcoding
+      boot.initrd.kernelModules = [ "amdgpu" ];
+      boot.kernelParams = [
+        "radeon.si_support=0"
+        "amdgpu.si_support=1"
+        "radeon.cik_support=0"
+        "amdgpu.cik_support=1"
+        "amdgpu.dc=1"
+      ];
+      hardware.enableRedistributableFirmware = true;
+
+      powerManagement.cpuFreqGovernor = "powersave";
+      hardware.cpu.intel.updateMicrocode = true;
+
+      # ZFS
+      zfs.enable = true;
+      # Generated with: head -c 8 /etc/machine-id
+      networking.hostId = "600279f4"; # Random ID required for ZFS
+      disko = {
+        enableConfig = true;
+        devices = (import ../../disks/root.nix { disk = "/dev/nvme0n1"; });
+      };
+      boot.zfs.extraPools = [ "tank" ];
+
+      gui.enable = false;
+      theme = { colors = (import ../../colorscheme/gruvbox).dark; };
+      neovim.enable = true;
+      cloudflare.enable = true;
+      dotfiles.enable = true;
+      arrs.enable = true;
+
+      services.caddy.enable = true;
+      services.jellyfin.enable = true;
+      services.nextcloud.enable = true;
+      services.calibre-web.enable = true;
+      services.prometheus.enable = true;
+      services.samba.enable = true;
+
+      cloudflareTunnel = {
+        enable = true;
+        id = "646754ac-2149-4a58-b51a-e1d0a1f3ade2";
+        credentialsFile = ../../private/cloudflared-swan.age;
+        ca =
+          "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCHF/UMtJqPFrf6f6GRY0ZFnkCW7b6sYgUTjTtNfRj1RdmNic1NoJZql7y6BrqQinZvy7nsr1UFDNWoHn6ah3tg= open-ssh-ca@cloudflareaccess.org";
+      };
+
+      backup.s3 = {
+        endpoint = "s3.us-west-002.backblazeb2.com";
+        bucket = "noahmasur-backup";
+        accessKeyId = "0026b0e73b2e2c80000000005";
+      };
+
+      # Disable passwords, only use SSH key
+      publicKey =
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s";
+    }
+  ];
+}

hosts/tempest/default.nix

@@ -0,0 +1,103 @@
+# The Tempest
+# System configuration for my desktop
+
+{ self, ... }:
+
+self.inputs.nixpkgs.lib.nixosSystem {
+  system = "x86_64-linux";
+  modules = [
+    self.inputs.home-manager.nixosModules.home-manager
+    self.nixosModules.globals
+    self.nixosModules.common
+    self.nixosModules.nixos
+    {
+      # Hardware
+      physical = true;
+      networking.hostName = "tempest";
+
+      boot.initrd.availableKernelModules =
+        [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
+      boot.initrd.kernelModules = [ "amdgpu" ];
+      boot.kernelModules = [ "kvm-amd" ];
+      services.xserver.videoDrivers = [ "amdgpu" ];
+      hardware.enableRedistributableFirmware = true;
+      powerManagement.cpuFreqGovernor = "performance";
+      hardware.cpu.amd.updateMicrocode = true;
+      hardware.fancontrol.enable = true;
+      hardware.fancontrol.config = ''
+        # Configuration file generated by pwmconfig, changes will be lost
+        INTERVAL=10
+        DEVPATH=hwmon0=devices/pci0000:00/0000:00:03.1/0000:06:00.0/0000:07:00.0/0000:08:00.0
+        DEVNAME=hwmon0=amdgpu
+        FCTEMPS=hwmon0/pwm1=hwmon0/temp1_input
+        FCFANS= hwmon0/pwm1=hwmon0/fan1_input
+        MINTEMP=hwmon0/pwm1=50
+        MAXTEMP=hwmon0/pwm1=70
+        MINSTART=hwmon0/pwm1=100
+        MINSTOP=hwmon0/pwm1=10
+        MINPWM=hwmon0/pwm1=10
+        MAXPWM=hwmon0/pwm1=240
+      '';
+
+      fileSystems."/" = {
+        device = "/dev/disk/by-label/nixos";
+        fsType = "ext4";
+      };
+
+      fileSystems."/boot" = {
+        device = "/dev/disk/by-label/boot";
+        fsType = "vfat";
+      };
+
+      # Must be prepared ahead
+      identityFile = "/home/${globals.user}/.ssh/id_ed25519";
+      passwordHash = self.inputs.nixpkgs.lib.fileContents ../../password.sha512;
+
+      # Theming
+      gui.enable = true;
+      theme = {
+        colors = (import ../../colorscheme/gruvbox-dark).dark;
+        dark = true;
+      };
+      wallpaper = "${self.inputs.wallpapers}/gruvbox/road.jpg";
+      gtk.theme.name = self.inputs.nixpkgs.lib.mkDefault "Adwaita-dark";
+
+      # Programs and services
+      charm.enable = true;
+      neovim.enable = true;
+      media.enable = true;
+      dotfiles.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 = false;
+      nixlang.enable = true;
+      yt-dlp.enable = true;
+      gaming = {
+        dwarf-fortress.enable = true;
+        enable = true;
+        steam.enable = true;
+        legendary.enable = true;
+        lutris.enable = true;
+        leagueoflegends.enable = true;
+        ryujinx.enable = true;
+      };
+
+      cloudflareTunnel = {
+        enable = true;
+        id = "ac133a82-31fb-480c-942a-cdbcd4c58173";
+        credentialsFile = ../../private/cloudflared-tempest.age;
+        ca =
+          "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPY6C0HmdFCaxYtJxFr3qV4/1X4Q8KrYQ1hlme3u1hJXK+xW+lc9Y9glWHrhiTKilB7carYTB80US0O47gI5yU4= open-ssh-ca@cloudflareaccess.org";
+      };
+
+    }
+  ];
+}

legacy/bin/biggest

@@ -1,4 +0,0 @@
-#!/usr/local/bin/nu
-
-ls | sort-by size | reverse | keep 10
-

legacy/bin/biggest-files

@@ -1,3 +0,0 @@
-#!/usr/local/bin/nu
-
-ls **/* | where type == File | sort-by size | reverse | keep 10

legacy/bin/docker_cleanup

@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# Stop all containers
-if [ "$(docker ps -a -q)" ]; then
-    echo "Stopping docker containers..."
-    docker stop "$(docker ps -a -q)"
-else
-    echo "No running docker containers."
-fi
-
-# Remove all stopped containers
-if [ "$(docker ps -a -q)" ]; then
-    echo "Removing docker containers..."
-    docker rm "$(docker ps -a -q)"
-else
-    echo "No stopped docker containers."
-fi
-
-# Remove all untagged images
-if [[ $(docker images | grep "^<none>") ]]; then
-    docker rmi "$(docker images | grep "^<none>" | awk '{print $3}')"
-else
-    echo "No untagged docker images."
-fi
-
-echo "Cleaned up docker."

legacy/bin/jira-checkout

@@ -1,37 +0,0 @@
-#!/bin/sh
-
-# Adapted from: https://seb.jambor.dev/posts/improving-shell-workflows-with-fzf/
-# Requires the following variables to be set:
-# - ATLASSIAN_EMAIL
-# - ATLASSIAN_API_TOKEN
-# - JIRA_HOSTNAME
-# - JIRA_PROJECT
-
-choose_issue() {
-    jq_template='"\(.key): \(.fields.summary)"'
-    query="project=$JIRA_PROJECT AND status not in (\"Done\") AND assignee=currentUser()"
-
-    branch_name=$(
-    curl \
-      --data-urlencode "jql=$query" \
-      --get \
-      --user "$ATLASSIAN_EMAIL:$ATLASSIAN_API_TOKEN" \
-      --silent \
-      --compressed \
-      "https://$JIRA_HOSTNAME/rest/api/2/search" |
-      jq ".issues[] | $jq_template" |
-      sed -e 's/"\(.*\)"/\1/' |
-    fzf \
-      --preview='jira-details {1}' \
-      --preview-window=top:wrap |
-    sed -e 's/: /:/' -e 's/[^a-zA-Z0-9:]/-/g' |
-    awk -F ":" '{printf "%s/%s", $1, tolower($2)}'
-    )
-
-    echo "$branch_name"
-}
-
-issue_branch=$(choose_issue)
-if [ -n "$issue_branch" ]; then
-    echo "git checkout -b \"$issue_branch\""
-fi

legacy/bin/jira-details

@@ -1,38 +0,0 @@
-#!/bin/sh
-
-# Adapted from: https://seb.jambor.dev/posts/improving-shell-workflows-with-fzf/
-# Requires the following variables to be set:
-# - ATLASSIAN_EMAIL
-# - ATLASSIAN_API_TOKEN
-# - JIRA_HOSTNAME
-# - JIRA_PROJECT (for other script)
-
-issue_details() {
-    jira_key=$(echo "$1" | cut -d":" -f1)
-    jq_template='"'\
-'# \(.key): \(.fields.summary)\n'\
-'\n'\
-'*Created*: \(.fields.created)\n'\
-'*Status*: \(.fields.status.statusCategory.name)\n'\
-'*Reporter*: \(.fields.reporter.displayName)\n'\
-'*Priority*: \(.fields.priority.name)\n'\
-"*Epic*: https://$JIRA_HOSTNAME/browse/\(.fields.customfield_10014)\n"\
-'\n'\
-'## Link\n\n'\
-"https://$JIRA_HOSTNAME/browse/\(.key)\n"\
-'\n'\
-'## Description\n\n'\
-'\(.fields.description)'\
-'"'
-    curl \
-      --get \
-      --user "$ATLASSIAN_EMAIL:$ATLASSIAN_API_TOKEN" \
-      --silent \
-      --compressed \
-      "https://$JIRA_HOSTNAME/rest/api/2/issue/$jira_key" |
-    jq "$jq_template" |
-    xargs printf |
-    bat -l md --color always --style plain
-}
-
-issue_details "$1"

legacy/bin/kube-dashboard

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-kubectl -n kube-system get secret "$(
-    kubectl -n kube-system get secret |
-        grep dashboard-admin |
-        awk '{print $1}'
-)" -o json |
-    jq -j --raw-output '.data.token' |
-    base64 --decode |
-    pbcopy
-
-open http://localhost:8001/api/v1/namespaces/default/services/https:kubernetes-dashboard:https/proxy/#!/login
-
-kubectl proxy

legacy/bin/newest

@@ -1,3 +0,0 @@
-#!/usr/local/bin/nu
-
-ls | sort-by modified | reverse | keep 5

legacy/bin/oldest

@@ -1,3 +0,0 @@
-#!/usr/local/bin/nu
-
-ls | sort-by modified | keep 5

legacy/bin/pod

@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-# Credit: https://github.com/junegunn/fzf/blob/master/ADVANCED.md
-
-read -ra tokens < <(
-  kubectl get pods --all-namespaces |
-    fzf --info=inline --layout=reverse --header-lines=1 --border \
-        --prompt "$(kubectl config current-context | sed 's/-context$//')> " \
-        --header $'Press CTRL-O to open log in editor\n\n' \
-        --bind ctrl-/:toggle-preview \
-        --bind "ctrl-o:execute:${EDITOR:-vim} <(kubectl logs --namespace {1} {2}) > /dev/tty" \
-        --preview-window up,follow \
-        --preview 'kubectl logs --follow --tail=100000 --namespace {1} {2}' "$@"
-)
-[ ${#tokens} -gt 1 ] &&
-  kubectl exec -it --namespace "${tokens[0]}" "${tokens[1]}" -- /bin/sh

legacy/bin/symlinks

@@ -1,3 +0,0 @@
-#!/usr/local/bin/nu
-
-ls -al | where type == Symlink | select name target

legacy/bin/url-decode

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-function urldecode() { : "${*//+/ }"; echo -e "${_//%/\\x}"; }
-
-urldecode "$@"

legacy/newsboat/com.noah.newsboat.plist

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>Label</key>
-  <string>com.noah.newsboat</string>
-
-  <key>ProgramArguments</key>
-  <array>
-    <string>/usr/local/bin/newsboat -x reload</string>
-  </array>
-
-  <key>Nice</key>
-  <integer>1</integer>
-
-  <key>StartInterval</key>
-  <integer>1800</integer>
-
-  <key>RunAtLoad</key>
-  <false/>
-
-  <key>StandardErrorPath</key>
-  <string>/tmp/newsboat.err</string>
-
-  <key>StandardOutPath</key>
-  <string>/tmp/newsboat.out</string>
-</dict>
-</plist>

legacy/newsboat/config

@@ -1,40 +0,0 @@
-browser "$BROWSER %u"
-prepopulate-query-feeds yes
-feed-sort-order lastupdated
-reload-only-visible-feeds yes
-text-width 72
-
-bind-key j down
-bind-key k up
-bind-key j next articlelist
-bind-key k prev articlelist
-bind-key G end
-bind-key g home
-bind-key d pagedown
-bind-key u pageup
-bind-key n next-unread
-bind-key p prev-unread
-bind-key ; macro-prefix
-bind-key B bookmark
-bind-key f edit-flags
-
-macro v set browser "mpv %u"; open-in-browser; set browser "$BROWSER %u"
-macro p set browser "echo %u"; one; set browser "$BROWSER %u"
-macro H set browser "clx view $(echo %u | cut -d '=' -f2)"; one; set browser "$BROWSER %u"
-macro h set browser "clx view $(echo %u | cut -d '=' -f2)"; two; set browser "$BROWSER %u"
-macro w set browser "w3m -o confirm_qq=false %u"; open-in-browser; set browser "$BROWSER %u"
-macro r set browser "url-markdown %u | glow -p -w 72 -"; open-in-browser; set browser "$BROWSER %u"
-macro d set browser "youtube-dl -o ~/Downloads/%(title)s.%(ext)s %u &"; open-in-browser-noninteractively; set browser "$BROWSER %u"
-macro n set-tag News; reload-all
-macro a set-tag All
-macro e set-tag Reddit; reload-all
-macro y set-tag YouTube; reload-all
-
-bookmark-cmd "bookmark"
-
-highlight article "^(Feed|Title|Author|Link|Date):.*" color243 default
-highlight article "^(Links):.*" color243 default
-highlight article "^(\\[[0-9]+\\]):.*" color243 default
-highlight article "^(\\[[0-9]+\\])" color243 default
-highlight article "^\\[.*\\]$" color243 default
-highlight article "^(Title:).*" color249 default

legacy/nix-env.fish

@@ -1,137 +0,0 @@
-# Setup Nix
-
-# We need to distinguish between single-user and multi-user installs.
-# This is difficult because there's no official way to do this.
-# We could look for the presence of /nix/var/nix/daemon-socket/socket but this will fail if the
-# daemon hasn't started yet. /nix/var/nix/daemon-socket will exist if the daemon has ever run, but
-# I don't think there's any protection against accidentally running `nix-daemon` as a user.
-# We also can't just look for /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh because
-# older single-user installs used the default profile instead of a per-user profile.
-# We can still check for it first, because all multi-user installs should have it, and so if it's
-# not present that's a pretty big indicator that this is a single-user install. If it does exist,
-# we still need to verify the install type. To that end we'll look for a root owner and sticky bit
-# on /nix/store. Multi-user installs set both, single-user installs don't. It's certainly possible
-# someone could do a single-user install as root and then manually set the sticky bit but that
-# would be extremely unusual.
-
-set -l nix_profile_path /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
-set -l single_user_profile_path ~/.nix-profile/etc/profile.d/nix.sh
-if test -e $nix_profile_path
-    # The path exists. Double-check that this is a multi-user install.
-    # We can't just check for ~/.nix-profile/… because this may be a single-user install running as
-    # the wrong user.
-
-    # stat is not portable. Splitting the output of ls -nd is reliable on most platforms.
-    set -l owner (string split -n ' ' (command ls -nd /nix/store 2>/dev/null))[3]
-    if not test -k /nix/store -a $owner -eq 0
-        # /nix/store is either not owned by root or not sticky. Assume single-user.
-        set nix_profile_path $single_user_profile_path
-    end
-else
-    # The path doesn't exist. Assume single-user
-    set nix_profile_path $single_user_profile_path
-end
-
-if test -e $nix_profile_path
-    # Source the nix setup script
-    # We're going to run the regular Nix profile under bash and then print out a few variables
-    for line in (command env -u BASH_ENV bash -c '. "$0"; for name in PATH "${!NIX_@}"; do printf "%s=%s\0" "$name" "${!name}"; done' $nix_profile_path | string split0)
-        set -xg (string split -m 1 = $line)
-    end
-
-    # Insert Nix's fish share directories into fish's special variables.
-    # nixpkgs-installed fish tries to set these up already if NIX_PROFILES is defined, which won't
-    # be the case when sourcing $__fish_data_dir/share/config.fish normally, but might be for a
-    # recursive invocation. To guard against that, we'll only insert paths that don't already exit.
-    # Furthermore, for the vendor_conf.d sourcing, we'll use the pre-existing presence of a path in
-    # $fish_function_path to determine whether we want to source the relevant vendor_conf.d folder.
-
-    # To start, let's locally define NIX_PROFILES if it doesn't already exist.
-    set -al NIX_PROFILES
-    if test (count $NIX_PROFILES) -eq 0
-        set -a NIX_PROFILES $HOME/.nix-profile
-    end
-    # Replicate the logic from nixpkgs version of $__fish_data_dir/__fish_build_paths.fish.
-    set -l __nix_profile_paths (string split ' ' -- $NIX_PROFILES)[-1..1]
-    set -l __extra_completionsdir \
-        $__nix_profile_paths/etc/fish/completions \
-        $__nix_profile_paths/share/fish/vendor_completions.d
-    set -l __extra_functionsdir \
-        $__nix_profile_paths/etc/fish/functions \
-        $__nix_profile_paths/share/fish/vendor_functions.d
-    set -l __extra_confdir \
-        $__nix_profile_paths/etc/fish/conf.d \
-        $__nix_profile_paths/share/fish/vendor_conf.d
-    ### Configure fish_function_path ###
-    # Remove any of our extra paths that may already exist.
-    # Record the equivalent __extra_confdir path for any function path that exists.
-    set -l existing_conf_paths
-    for path in $__extra_functionsdir
-        if set -l idx (contains --index -- $path $fish_function_path)
-            set -e fish_function_path[$idx]
-            set -a existing_conf_paths $__extra_confdir[(contains --index -- $path $__extra_functionsdir)]
-        end
-    end
-    # Insert the paths before $__fish_data_dir.
-    if set -l idx (contains --index -- $__fish_data_dir/functions $fish_function_path)
-        # Fish has no way to simply insert into the middle of an array.
-        set -l new_path $fish_function_path[1..$idx]
-        set -e new_path[$idx]
-        set -a new_path $__extra_functionsdir
-        set fish_function_path $new_path $fish_function_path[$idx..-1]
-    else
-        set -a fish_function_path $__extra_functionsdir
-    end
-
-    ### Configure fish_complete_path ###
-    # Remove any of our extra paths that may already exist.
-    for path in $__extra_completionsdir
-        if set -l idx (contains --index -- $path $fish_complete_path)
-            set -e fish_complete_path[$idx]
-        end
-    end
-    # Insert the paths before $__fish_data_dir.
-    if set -l idx (contains --index -- $__fish_data_dir/completions $fish_complete_path)
-        set -l new_path $fish_complete_path[1..$idx]
-        set -e new_path[$idx]
-        set -a new_path $__extra_completionsdir
-        set fish_complete_path $new_path $fish_complete_path[$idx..-1]
-    else
-        set -a fish_complete_path $__extra_completionsdir
-    end
-
-    ### Source conf directories ###
-    # The built-in directories were already sourced during shell initialization.
-    # Any __extra_confdir that came from $__fish_data_dir/__fish_build_paths.fish was also sourced.
-    # As explained above, we're using the presence of pre-existing paths in $fish_function_path as a
-    # signal that the corresponding conf dir has also already been sourced.
-    # In order to simulate this, we'll run through the same algorithm as found in
-    # $__fish_data_dir/config.fish except we'll avoid sourcing the file if it comes from an
-    # already-sourced location.
-    # Caveats:
-    # * Files will be sourced in a different order than we'd ideally do (because we're coming in
-    #   after the fact to source them).
-    # * If there are existing extra conf paths, files in them may have been sourced that should have
-    #   been suppressed by paths we're inserting in front.
-    # * Similarly any files in $__fish_data_dir/vendor_conf.d that should have been suppressed won't
-    #   have been.
-    set -l sourcelist
-    for file in $__fish_config_dir/conf.d/*.fish $__fish_sysconf_dir/conf.d/*.fish
-        # We know these paths were sourced already. Just record them.
-        set -l basename (string replace -r '^.*/' '' -- $file)
-        contains -- $basename $sourcelist
-        or set -a sourcelist $basename
-    end
-    for root in $__extra_confdir
-        for file in $root/*.fish
-            set -l basename (string replace -r '^.*/' '' -- $file)
-            contains -- $basename $sourcelist
-            and continue
-            set -a sourcelist $basename
-            contains -- $root $existing_conf_paths
-            and continue # this is a pre-existing path, it will have been sourced already
-            [ -f $file -a -r $file ]
-            and source $file
-        end
-    end
-end

legacy/scripts/configure_macos

@@ -1,168 +0,0 @@
-#!/bin/sh
-
-echo "Enable full keyboard access for all controls (e.g. enable Tab in modal dialogs)"
-defaults write NSGlobalDomain AppleKeyboardUIMode -int 3
-
-echo "Automatically show and hide the dock"
-defaults write com.apple.dock autohide -bool true
-
-echo "Automatically show and hide the menu bar"
-defaults write NSGlobalDomain _HIHideMenuBar -bool true
-
-echo "Make Dock icons of hidden applications translucent"
-defaults write com.apple.dock showhidden -bool true
-
-echo "Use current directory as default search scope in Finder"
-defaults write com.apple.finder FXDefaultSearchScope -string "SCcf"
-
-echo "Expand save panel by default"
-defaults write NSGlobalDomain NSNavPanelExpandedStateForSaveMode -bool true
-
-echo "Expand print panel by default"
-defaults write NSGlobalDomain PMPrintingExpandedStateForPrint -bool true
-
-echo "Disable the \"Are you sure you want to open this application?\" dialog"
-defaults write com.apple.LaunchServices LSQuarantine -bool false
-
-echo "Enable highlight hover effect for the grid view of a stack (Dock)"
-defaults write com.apple.dock mouse-over-hilte-stack -bool true
-
-echo "Enable spring loading for all Dock items"
-defaults write enable-spring-load-actions-on-all-items -bool true
-
-echo "Disable press-and-hold for keys in favor of key repeat"
-defaults write NSGlobalDomain ApplePressAndHoldEnabled -bool false
-defaults write -g ApplePressAndHoldEnabled -bool false
-
-echo "Set a blazingly fast keyboard repeat rate"
-defaults write NSGlobalDomain KeyRepeat -int 2
-
-echo "Set a shorter Delay until key repeat"
-defaults write NSGlobalDomain InitialKeyRepeat -int 12
-
-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 when changing a file extension"
-defaults write com.apple.finder FXEnableExtensionChangeWarning -bool false
-
-# echo "Enable snap-to-grid for desktop icons"
-# /usr/libexec/PlistBuddy -c "Set :DesktopViewSettings:IconViewSettings:arrangeBy grid" ~/Library/Preferences/com.apple.finder.plist
-
-echo "Disable the warning before emptying the Trash"
-defaults write com.apple.finder WarnOnEmptyTrash -bool false
-
-echo "Disable tap to click (Trackpad)"
-defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad Clicking -bool false
-
-echo "Enable Safari’s debug menu"
-defaults write com.apple.Safari IncludeInternalDebugMenu -bool true
-
-echo "Make Safari’s search banners default to Contains instead of Starts With"
-defaults write com.apple.Safari FindOnPageMatchesWordStartsOnly -bool false
-
-echo "Add a context menu item for showing the Web Inspector in web views"
-defaults write NSGlobalDomain WebKitDeveloperExtras -bool true
-
-echo "Save to disk (not to iCloud) by default"
-defaults write NSGlobalDomain NSDocumentSaveNewDocumentsToCloud -bool false
-
-echo "Disable automatic capitalization as it’s annoying when typing code"
-defaults write NSGlobalDomain NSAutomaticCapitalizationEnabled -bool false
-
-echo "Disable smart dashes as they’re annoying when typing code"
-defaults write NSGlobalDomain NSAutomaticDashSubstitutionEnabled -bool false
-
-echo "Disable automatic period substitution as it’s annoying when typing code"
-defaults write NSGlobalDomain NSAutomaticPeriodSubstitutionEnabled -bool false
-
-echo "Disable smart quotes as they’re annoying when typing code"
-defaults write NSGlobalDomain NSAutomaticQuoteSubstitutionEnabled -bool false
-
-echo "Disable auto-correct"
-defaults write NSGlobalDomain NSAutomaticSpellingCorrectionEnabled -bool false
-
-echo "Use scroll gesture with the Ctrl (^) modifier key to zoom"
-defaults write com.apple.universalaccess closeViewScrollWheelToggle -bool true
-defaults write com.apple.universalaccess HIDScrollZoomModifierMask -int 262144
-echo "Follow the keyboard focus while zoomed in"
-defaults write com.apple.universalaccess closeViewZoomFollowsFocus -bool true
-
-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 "Save screenshots to downloads"
-defaults write com.apple.screencapture location -string "${HOME}/Downloads"
-
-echo "Finder: allow quitting via ⌘ + Q; doing so will also hide desktop icons"
-defaults write com.apple.finder QuitMenuItem -bool true
-
-echo "Show the ~/Library folder"
-chflags nohidden ~/Library && xattr -d com.apple.FinderInfo ~/Library
-
-# Noah Prefs
-echo "Enable dock magnification"
-defaults write com.apple.dock magnification -bool true
-
-echo "Set dock size"
-defaults write com.apple.dock largesize -int 48
-defaults write com.apple.dock tilesize -int 44
-
-echo "Choose and order dock icons"
-__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>'
-}
-
-defaults write com.apple.dock persistent-apps -array \
-    "$(__dock_item /Applications/1Password\ 7.app)" \
-    "$(__dock_item /Applications/Slack.app)" \
-    "$(__dock_item /System/Applications/Calendar.app)" \
-    "$(__dock_item /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 /Applications/Obsidian.app)" \
-    "$(__dock_item /Applications/Alacritty.app)" \
-    "$(__dock_item /System/Applications/System\ Preferences.app)"
-
-echo "No recent items in dock"
-defaults write com.apple.dock show-recents -bool FALSE
-
-echo "Switch to dark mode"
-defaults write "Apple Global Domain" "AppleInterfaceStyle" "Dark"
-
-echo "Turn on Scroll Reverser"
-open /Applications/Scroll\ Reverser.app
-osascript -e 'tell application "System Events" to make login item at end with properties {path:"/Applications/Scroll Reverser.app", hidden:false}'
-
-echo "Allow apps from anywhere"
-SPCTL=$(spctl --status)
-if ! [ "$SPCTL" = "assessments disabled" ]
-then
-    sudo spctl --master-disable
-fi
-
-# ---
-
-echo "Reset Launchpad"
-# [ -e ~/Library/Application\ Support/Dock/*.db ] && rm ~/Library/Application\ Support/Dock/*.db
-rm ~/Library/Application\ Support/Dock/*.db
-
-echo "Show the ~/Library folder"
-chflags nohidden ~/Library
-
-# Clean up
-echo "Kill affected applications"
-for app in Safari Finder Dock Mail SystemUIServer; do killall "$app" >/dev/null 2>&1; done

legacy/scripts/npm

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-npm update -g
-npm install -g pyright
-npm install -g diagnostic-languageserver

legacy/scripts/rust

@@ -1,48 +0,0 @@
-#!/bin/sh
-
-install_rust() {
-    if ! (which ~/.cargo/bin/rustup > /dev/null)
-    then
-        echo "installing rustup"
-        curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-    fi
-
-    echo "rustup ✓"
-}
-
-update_rust() {
-    ~/.cargo/bin/rustup update > /dev/null 2>&1
-    rust_version=$(~/.cargo/bin/rustc --version | awk '{print $2}')
-
-    echo "latest rust: $rust_version ✓"
-}
-
-download_rust_analyzer() {
-    if ! (which rust-analyzer > /dev/null)
-    then
-        echo "downloading rust analyzer"
-        rust_analyzer_bin=/usr/local/bin/rust-analyzer
-        curl -s -L https://github.com/rust-analyzer/rust-analyzer/releases/latest/download/rust-analyzer-mac -o $rust_analyzer_bin
-        chmod +x $rust_analyzer_bin
-    fi
-
-    echo "rust-analyzer ✓"
-}
-
-# cargo-edit: quickly add and remove packages
-# whatfeatures: see optional features for a package
-install_cargos() {
-    set -- \
-        'cargo-edit' \
-        'cargo-whatfeatures'
-    for program do
-        cargo install "$program"
-    done
-
-    echo "cargos ✓"
-}
-
-install_rust
-update_rust
-download_rust_analyzer
-install_cargos

legacy/scripts/setup_cheatsheet

@@ -1,6 +0,0 @@
-#!/bin/sh
-
-echo "downloading cheatsheet"
-curl https://cht.sh/:cht.sh > ~/.local/bin/cheat
-chmod 755 ~/.local/bin/cheat
-echo "cheatsheet ✓"

legacy/scripts/setup_fish

@@ -1,46 +0,0 @@
-#!/usr/bin/env fish
-
-set -U FISH_DIR (readlink ~/.config/fish) # Used for getting to this repo
-set -Ux DOTS (dirname $FISH_DIR) # Directory of this config repo
-set -U CDPATH . $HOME # Directories available for immediate cd
-set -Ux EDITOR nvim # Preferred text editor
-set -U PROJ $HOME/dev/work # Projects directory
-set -Ux NOTES_PATH "$HOME/dev/personal/notes" # Notes directory
-set -Ux MANPAGER "nvim +Man!" # Used for reading man pages
-set -Ux DIRENV_LOG_FORMAT "" # Disable direnv output
-set -Ux BROWSER "/Applications/Firefox.app/Contents/MacOS/firefox"
-
-# Load abbreviations
-abbrs
-
-# Turn off greeting
-set -U fish_greeting ""
-
-# Set colors (Base16 Eighties)
-set -U fish_color_normal normal
-set -U fish_color_command 99cc99
-set -U fish_color_quote ffcc66
-set -U fish_color_redirection d3d0c8
-set -U fish_color_end cc99cc
-set -U fish_color_error f2777a
-set -U fish_color_selection white --bold --background=brblack
-set -U fish_color_search_match bryellow --background=brblack
-set -U fish_color_history_current --bold
-set -U fish_color_operator 6699cc
-set -U fish_color_escape 66cccc
-set -U fish_color_cwd green
-set -U fish_color_cwd_root red
-set -U fish_color_valid_path --underline
-set -U fish_color_autosuggestion 747369
-set -U fish_color_user brgreen
-set -U fish_color_host normal
-set -U fish_color_cancel -r
-set -U fish_pager_color_completion normal
-set -U fish_pager_color_description B3A06D yellow
-set -U fish_pager_color_prefix white --bold --underline
-set -U fish_pager_color_progress brwhite --background=cyan
-set -U fish_color_comment ffcc66
-set -U fish_color_param d3d0c8
-set -U fish_color_match 6699cc
-
-echo "fish setup ✓"

legacy/scripts/setup_ytfzf

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo "downloading ytfzf"
-mkdir -p ~/.local/bin
-curl -sL "https://raw.githubusercontent.com/pystardust/ytfzf/master/ytfzf" >~/.local/bin/ytfzf
-chmod 755 ~/.local/bin/ytfzf
-echo "ytfzf ✓"

legacy/templates/kubernetes/clusterrole.yaml

@@ -1,8 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name:
-rules:
-  - apiGroups: [""]
-    resources:
-    verbs: []

legacy/templates/kubernetes/clusterrolebinding.yaml

@@ -1,12 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name:
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name:
-subjects:
-- kind: ServiceAccount
-  name:
-  namespace: default

legacy/templates/kubernetes/configmap.yaml

@@ -1,8 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name:
-  namespace: default
-  annotations:
-    replicator.v1.mittwald.de/replicate-to: ".*"
-data:

legacy/templates/kubernetes/deployment.yaml

@@ -1,33 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name:
-  namespace: default
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app:
-  template:
-    metadata:
-      labels:
-        app:
-    spec:
-      serviceAccountName:
-      containers:
-      - name:
-        image:
-        imagePullPolicy: Always
-        envFrom:
-        - configMapRef:
-            name:
-        - secretRef:
-            name:
-        ports:
-        - containerPort:
-          protocol: TCP
-        resources:
-          limits:
-            cpu:
-          requests:
-            cpu:

legacy/templates/kubernetes/ingress.yaml

@@ -1,21 +0,0 @@
-apiVersion: networking.k8s.io/v1beta1 # must be beta until k8s 1.19
-kind: Ingress
-metadata:
-  annotations:
-    kubernetes.io/ingress.class: alb
-    alb.ingress.kubernetes.io/group.name:
-    alb.ingress.kubernetes.io/listen-ports: '[{"HTTPS":443}]'
-    alb.ingress.kubernetes.io/scheme: internet-facing
-    alb.ingress.kubernetes.io/security-groups:
-    alb.ingress.kubernetes.io/tags: Project=
-    alb.ingress.kubernetes.io/target-type: instance
-  name:
-  namespace:
-spec:
-  rules:
-  - host:
-    http:
-      paths:
-      - backend:
-          serviceName:
-          servicePort:

legacy/templates/kubernetes/role.yaml

@@ -1,10 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name:
-  namespace: default
-rules:
-- apiGroups: [""]
-  resourceNames:
-  resources:
-  verbs:

legacy/templates/kubernetes/rolebinding.yaml

@@ -1,13 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name:
-  namespace: default
-roleRef:
-  kind:
-  name:
-  apiGroup: rbac.authorization.k8s.io
-subjects:
-- kind:
-  name:
-  apiGroup: rbac.authorization.k8s.io

legacy/templates/kubernetes/secret.yaml

@@ -1,8 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name:
-  namespace: default
-  annotations:
-    replicator.v1.mittwald.de/replicate-to: ".*"
-data:

legacy/templates/kubernetes/service.yaml

@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    alb.ingress.kubernetes.io/healthcheck-path:
-  name:
-  namespace: default
-spec:
-  ports:
-  - port: 443
-    protocol: TCP
-    targetPort: 80
-  selector:
-    app:
-  type: NodePort

legacy/templates/kubernetes/serviceaccount.yaml

@@ -1,5 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name:
-  namespace: default

legacy/templates/programs/skeleton.py

@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-
-"""
-Program
-"""
-
-def main():
-    """Run the program"""
-    pass
-
-if __name__ == "__main__":
-    main()

legacy/templates/programs/skeleton.sh

@@ -1,8 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "--help" ] || [ "$1" = "-h" ]; then
-  cat <<EOH
-Help text
-EOH
-  exit
-fi

modules/README.md

@@ -0,0 +1,8 @@
+# Modules
+
+| Module                         | Purpose                                     |
+| ---                            | ---                                         |
+| [common](./common/default.nix) | User programs and OS-agnostic configuration |
+| [darwin](./darwin/default.nix) | macOS-specific configuration                |
+| [nixos](./nixos/default.nix)   | NixOS-specific configuration                |
+

modules/applications/media.nix

@@ -1,21 +0,0 @@
-{ config, pkgs, lib, ... }: {
-
-  options = {
-    media = {
-      enable = lib.mkEnableOption {
-        description = "Enable media programs.";
-        default = false;
-      };
-    };
-  };
-
-  config = lib.mkIf (config.gui.enable && config.media.enable) {
-    home-manager.users.${config.user}.home.packages = with pkgs; [
-      mpv # Video viewer
-      sxiv # Image viewer
-      mupdf # PDF viewer
-      zathura # PDF viewer
-    ];
-  };
-
-}

modules/applications/nautilus.nix

@@ -1,29 +0,0 @@
-{ config, pkgs, lib, ... }: {
-
-  options = {
-    nautilus = {
-      enable = lib.mkEnableOption {
-        description = "Enable Nautilus file manager.";
-        default = false;
-      };
-    };
-  };
-
-  # Install Nautilus file manager
-  config = lib.mkIf (config.gui.enable && config.nautilus.enable) {
-    home-manager.users.${config.user} = {
-      home.packages = with pkgs; [
-        gnome.nautilus
-        gnome.sushi # Quick preview with spacebar
-      ];
-
-      programs.fish.functions = {
-        qr = {
-          body =
-            "${pkgs.qrencode}/bin/qrencode $argv[1] -o /tmp/qr.png | ${pkgs.gnome.sushi}/bin/sushi /tmp/qr.png";
-        };
-      };
-    };
-  };
-
-}

modules/common/applications/1password.nix

@@ -1,7 +1,7 @@
 { config, pkgs, lib, ... }: {
 
   options = {
-    "1password" = {
+    _1password = {
       enable = lib.mkEnableOption {
         description = "Enable 1Password.";
         default = false;
@@ -10,7 +10,7 @@
   };
 
   config = lib.mkIf
-    (config.gui.enable && config."1password".enable && pkgs.stdenv.isLinux) {
+    (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/common/applications/default.nix

@@ -9,7 +9,8 @@
     ./media.nix
     ./obsidian.nix
     ./qbittorrent.nix
-    ./nautilus.nix
+    ./slack.nix
+    ./yt-dlp.nix
   ];
 
 }

modules/common/applications/firefox.nix

@@ -14,7 +14,7 @@
   config = lib.mkIf (config.gui.enable && config.firefox.enable) {
 
     unfreePackages = [
-      (lib.mkIf config."1password".enable "onepassword-password-manager")
+      (lib.mkIf config._1password.enable "onepassword-password-manager")
       "okta-browser-plugin"
     ];
 
@@ -24,29 +24,27 @@
         enable = true;
         package =
           if pkgs.stdenv.isDarwin then pkgs.firefox-bin else pkgs.firefox;
-        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
-          bypass-paywalls-clean
-          markdownload
-          darkreader
-          snowflake
-          don-t-fuck-with-paste
-          i-dont-care-about-cookies
-          wappalyzer
-        ];
         profiles.default = {
           id = 0;
           name = "default";
           isDefault = true;
+          extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+            ublock-origin
+            vimium
+            multi-account-containers
+            facebook-container
+            (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;
@@ -54,7 +52,7 @@
             "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" =
@@ -72,6 +70,9 @@
             "layout.css.color-mix.enabled" = true;
             "ui.systemUsesDarkTheme" =
               if config.theme.dark == true then 1 else 0;
+            "media.ffmpeg.vaapi.enabled" =
+              true; # Enable hardware video acceleration
+            "cookiebanners.ui.desktop.enabled" = true; # Reject cookie popups
           };
           userChrome = ''
             :root {
@@ -158,6 +159,24 @@
         };
 
       };
+
+      xsession.windowManager.i3.config.keybindings =
+        lib.mkIf pkgs.stdenv.isLinux {
+          "${
+            config.home-manager.users.${config.user}.xsession.windowManager.i3.config.modifier
+          }+Shift+b" = "exec ${
+            # Don't name the script `firefox` or it will affect grep
+              builtins.toString (pkgs.writeShellScript "focus-ff.sh" ''
+                count=$(ps aux | grep -c firefox)
+                if [ "$count" -eq 1 ]; then
+                    i3-msg "exec --no-startup-id firefox"
+                    sleep 0.5
+                fi
+                i3-msg "[class=firefox] focus"
+              '')
+            }";
+        };
+
     };
 
   };

modules/common/applications/kitty.nix

@@ -10,9 +10,24 @@
   };
 
   config = lib.mkIf (config.gui.enable && config.kitty.enable) {
+
+    # Set the Rofi-Systemd terminal for viewing logs
+    # Using optionalAttrs because only available in NixOS
+    environment = { } // lib.attrsets.optionalAttrs
+      (builtins.hasAttr "sessionVariables" config.environment) {
+        sessionVariables.ROFI_SYSTEMD_TERM = "${pkgs.kitty}/bin/kitty";
+      };
+
     home-manager.users.${config.user} = {
-      # xsession.windowManager.i3.config.terminal = "kitty";
-      # programs.rofi.terminal = "${pkgs.kitty}/bin/kitty";
+
+      # Set the i3 terminal
+      xsession.windowManager.i3.config.terminal =
+        lib.mkIf pkgs.stdenv.isLinux "kitty";
+
+      # Set the Rofi terminal for running programs
+      programs.rofi.terminal =
+        lib.mkIf pkgs.stdenv.isLinux "${pkgs.kitty}/bin/kitty";
+
       programs.kitty = {
         enable = true;
         environment = { };
@@ -70,8 +85,7 @@
           # Scrollback
           scrolling_lines = 10000;
           scrollback_pager_history_size = 10; # MB
-          scrollback_pager = ''
-            ${pkgs.neovim}/bin/nvim -c 'setlocal nonumber nolist showtabline=0 foldcolumn=0|Man!' -c "autocmd VimEnter * normal G" -'';
+          scrollback_pager = "${pkgs.neovim}/bin/nvim -c 'normal G'";
 
           # Window
           window_padding_width = 6;

modules/common/applications/media.nix

@@ -0,0 +1,73 @@
+{ config, pkgs, lib, ... }: {
+
+  options = {
+    media = {
+      enable = lib.mkEnableOption {
+        description = "Enable media programs.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.gui.enable && config.media.enable) {
+    home-manager.users.${config.user} = {
+      home.packages = with pkgs; [
+        nsxiv # Image viewer
+        mupdf # PDF viewer
+        zathura # PDF viewer
+      ];
+
+      # Video player
+      programs.mpv = {
+        enable = true;
+        bindings = { };
+        config = {
+          image-display-duration = 2;
+          hwdec = "auto-safe";
+        };
+        scripts = [
+
+          # Automatically load playlist entries before and after current file
+          pkgs.mpvScripts.autoload
+
+          # Delete current file after quitting
+          (pkgs.stdenv.mkDerivation rec {
+            pname = "mpv-delete-file";
+            version = "0.1"; # made-up
+            src = pkgs.fetchFromGitHub {
+              owner = "zenyd";
+              repo = "mpv-scripts";
+              rev = "19ea069abcb794d1bf8fac2f59b50d71ab992130";
+              sha256 = "sha256-OBCuzCtgfSwj0i/rBNranuu4LRc47jObwQIJgQQoerg=";
+            } + "/delete_file.lua";
+            dontBuild = true;
+            dontUnpack = true;
+            installPhase =
+              "install -Dm644 ${src} $out/share/mpv/scripts/delete_file.lua";
+            passthru.scriptName = "delete_file.lua";
+          })
+        ];
+      };
+
+      # Set default for opening PDFs
+      xdg.mimeApps = {
+        associations.added = {
+          "application/pdf" = [ "pwmt.zathura-cb.desktop" ];
+          "image/jpeg" = [ "nsxiv.desktop" ];
+          "image/*" = [ "nsxiv.desktop" ];
+        };
+        associations.removed = {
+          "application/pdf" = [ "mupdf.desktop" "wine-extension-pdf.desktop" ];
+        };
+        defaultApplications = {
+          "application/pdf" = [ "pwmt.zathura-cb.desktop" ];
+          "image/jpeg" = [ "nsxiv.desktop" ];
+          "image/*" = [ "nsxiv.desktop" ];
+        };
+      };
+
+    };
+
+  };
+
+}

modules/common/applications/obsidian.nix

@@ -14,6 +14,10 @@
     home-manager.users.${config.user} = {
       home.packages = with pkgs; [ obsidian ];
     };
+
+    # Broken on 2023-04-16
+    nixpkgs.config.permittedInsecurePackages = [ "electron-21.4.0" ];
+
   };
 
 }

modules/common/applications/slack.nix

@@ -0,0 +1,19 @@
+{ config, pkgs, lib, ... }: {
+
+  options = {
+    slack = {
+      enable = lib.mkEnableOption {
+        description = "Enable Slack.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.gui.enable && config.slack.enable) {
+    unfreePackages = [ "slack" ];
+    home-manager.users.${config.user} = {
+      home.packages = with pkgs; [ slack ];
+    };
+  };
+
+}

modules/common/applications/yt-dlp.nix

@@ -0,0 +1,35 @@
+{ config, pkgs, lib, ... }: {
+
+  options = {
+    yt-dlp = {
+      enable = lib.mkEnableOption {
+        description = "Enable YouTube downloader.";
+        default = false;
+      };
+    };
+  };
+
+  config = lib.mkIf (config.yt-dlp.enable) {
+    home-manager.users.${config.user} = {
+      programs.yt-dlp = {
+        enable = true;
+        extraConfig = "";
+        settings = {
+          no-continue = true; # Always re-download each fragment
+          no-overwrites = true; # Don't overwrite existing files
+          download-archive = "archive.log"; # Log of archives
+          embed-metadata = true;
+          embed-thumbnail = true;
+          embed-subs = true;
+          sub-langs = "en.*";
+          concurrent-fragments = 4; # Parallel download chunks
+        };
+      };
+
+      programs.fish.shellAbbrs.yt = "yt-dlp";
+
+    };
+
+  };
+
+}

modules/common/default.nix

@@ -44,11 +44,6 @@
         default = true;
       };
     };
-
-    # colorscheme = lib.mkOption {
-    #   type = types.attrs;
-    #   description = "Base16 color scheme";
-    # };
     homePath = lib.mkOption {
       type = lib.types.path;
       description = "Path of user's home directory.";
@@ -57,7 +52,6 @@
       else
         "/home/${config.user}");
     };
-
     dotfilesPath = lib.mkOption {
       type = lib.types.path;
       description = "Path of dotfiles repository.";
@@ -72,16 +66,76 @@
       description = "List of unfree packages to allow.";
       default = [ ];
     };
+    hostnames = {
+      git = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for git server (Gitea).";
+      };
+      metrics = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for metrics server.";
+      };
+      prometheus = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for Prometheus server.";
+      };
+      secrets = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for passwords and secrets (Vaultwarden).";
+      };
+      stream = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for video/media library (Jellyfin).";
+      };
+      content = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for personal content system (Nextcloud).";
+      };
+      books = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for books library (Calibre-Web).";
+      };
+      download = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for download services.";
+      };
+    };
   };
 
   config = let stateVersion = "23.05";
   in {
 
-    # Enable features in Nix commands
-    nix.extraOptions = ''
-      experimental-features = nix-command flakes
-      warn-dirty = false
-    '';
+    nix = {
+
+      # Enable features in Nix commands
+      extraOptions = ''
+        experimental-features = nix-command flakes
+        warn-dirty = false
+      '';
+
+      gc = {
+        automatic = true;
+        options = "--delete-older-than 7d";
+      };
+
+      settings = {
+
+        # Add community Cachix to binary cache
+        # Don't use with macOS because blocked by corporate firewall
+        builders-use-substitutes = true;
+        substituters = lib.mkIf (!pkgs.stdenv.isDarwin)
+          [ "https://nix-community.cachix.org" ];
+        trusted-public-keys = lib.mkIf (!pkgs.stdenv.isDarwin) [
+          "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        ];
+
+        # Scans and hard links identical files in the store
+        # Not working with macOS: https://github.com/NixOS/nix/issues/7273
+        auto-optimise-store = lib.mkIf (!pkgs.stdenv.isDarwin) true;
+
+      };
+
+    };
 
     # Basic common system packages for all devices
     environment.systemPackages = with pkgs; [ git vim wget curl ];

modules/common/mail/aerc.nix

@@ -154,22 +154,20 @@
           general.unsafe-accounts-conf = true;
           viewer = { pager = "${pkgs.less}/bin/less -R"; };
           filters = {
-            "text/plain" =
-              "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/colorize";
+            "text/plain" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
             "text/calendar" =
-              "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/calendar";
+              "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/libexec/aerc/filters/calendar";
             "text/html" =
-              "${pkgs.aerc}/share/aerc/filters/html"; # Requires w3m, dante
-            # "text/html" =
-            #   "${pkgs.aerc}/share/aerc/filters/html | ${pkgs.aerc}/share/aerc/filters/colorize";
+              "${pkgs.aerc}/libexec/aerc/filters/html | ${pkgs.aerc}/libexec/aerc/filters/colorize"; # Requires w3m, dante
             # "text/*" =
             #   ''${pkgs.bat}/bin/bat -fP --file-name="$AERC_FILENAME "'';
             "message/delivery-status" =
-              "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/colorize";
-            "message/rfc822" =
-              "${pkgs.gawk}/bin/awk -f ${pkgs.aerc}/share/aerc/filters/colorize";
+              "${pkgs.aerc}/libexec/aerc/filters/colorize";
+            "message/rfc822" = "${pkgs.aerc}/libexec/aerc/filters/colorize";
             "application/x-sh" = "${pkgs.bat}/bin/bat -fP -l sh";
             "application/pdf" = "${pkgs.zathura}/bin/zathura -";
+            "audio/*" = "${pkgs.mpv}/bin/mpv -";
+            "image/*" = "${pkgs.feh}/bin/feh -";
           };
         };
       };
@@ -181,6 +179,27 @@
         };
       };
 
+      xdg.desktopEntries.aerc = lib.mkIf pkgs.stdenv.isLinux {
+        name = "aerc";
+        exec = "kitty aerc %u";
+      };
+      xsession.windowManager.i3.config.keybindings =
+        lib.mkIf pkgs.stdenv.isLinux {
+          "${
+            config.home-manager.users.${config.user}.xsession.windowManager.i3.config.modifier
+          }+Shift+e" = "exec ${
+            # Don't name the script `aerc` or it will affect grep
+              builtins.toString (pkgs.writeShellScript "focus-mail.sh" ''
+                count=$(ps aux | grep -c aerc)
+                if [ "$count" -eq 1 ]; then
+                    i3-msg "exec --no-startup-id kitty --class aerc aerc"
+                    sleep 0.25
+                fi
+                i3-msg "[class=aerc] focus"
+              '')
+            }";
+        };
+
       programs.fish.shellAbbrs = { ae = "aerc"; };
 
     };

modules/common/mail/default.nix

@@ -10,9 +10,17 @@
       default = config.user;
     };
     mail.server = lib.mkOption {
-      type = lib.types.str;
+      type = lib.types.nullOr lib.types.str;
       description = "Server name for the email address.";
     };
+    mail.imapHost = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      description = "Server host for IMAP (reading mail).";
+    };
+    mail.smtpHost = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      description = "Server host for SMTP (sending mail).";
+    };
   };
 
   config = lib.mkIf config.mail.enable {
@@ -22,7 +30,10 @@
       services.mbsync = lib.mkIf pkgs.stdenv.isLinux {
         enable = true;
         frequency = "*:0/5";
+        postExec = "${pkgs.notmuch}/bin/notmuch new";
       };
+      services.imapnotify.enable = pkgs.stdenv.isLinux;
+      programs.notmuch.enable = true;
       accounts.email = {
         maildirBasePath = "${config.homePath}/mail";
         accounts = {
@@ -39,38 +50,38 @@
             ];
             alot = { };
             flavor = "plain";
-            folders = { };
-            getmail = { };
             imap = {
-              host = "imap.purelymail.com";
+              host = config.mail.imapHost;
               port = 993;
               tls.enable = true;
             };
             imapnotify = {
-              enable = false;
-              boxes = [ ];
-              onNotify = "";
-              onNotifyPost = "";
+              enable = true;
+              boxes = [ "Inbox" ];
+              onNotify = "${pkgs.isync}/bin/mbsync -a";
+              onNotifyPost = lib.mkIf
+                config.home-manager.users.${config.user}.services.dunst.enable
+                "${pkgs.libnotify}/bin/notify-send 'New mail arrived'";
             };
             maildir = { path = "main"; };
             mbsync = {
               enable = true;
-              create = "maildir";
-              expunge = "none";
-              remove = "none";
+              create = "both";
+              expunge = "both";
+              remove = "both";
               patterns = [ "*" ];
               extraConfig.channel = {
                 CopyArrivalDate = "yes"; # Sync time of original message
               };
             };
-            mu.enable = false;
-            notmuch.enable = false;
+            notmuch.enable = true;
             passwordCommand =
               "${pkgs.age}/bin/age --decrypt --identity ${config.identityFile} ${
-                builtins.toString ../../private/mailpass.age
+                pkgs.writeText "mailpass.age"
+                (builtins.readFile ../../../private/mailpass.age)
               }";
             smtp = {
-              host = "smtp.purelymail.com";
+              host = config.mail.smtpHost;
               port = 465;
               tls.enable = true;
             };

modules/common/neovim/config/align.nix

@@ -0,0 +1,9 @@
+{ pkgs, ... }: {
+  plugins = [ pkgs.vimPlugins.tabular ];
+  lua = ''
+    -- Align
+    vim.keymap.set("", "<Leader>ta", ":Tabularize /")
+    vim.keymap.set("", "<Leader>t#", ":Tabularize /#<CR>")
+    vim.keymap.set("", "<Leader>tl", ":Tabularize /---<CR>")
+  '';
+}

modules/common/neovim/config/colors.nix

@@ -0,0 +1,20 @@
+{ pkgs, lib, config, ... }: {
+
+  options.colors = lib.mkOption {
+    type = lib.types.attrsOf lib.types.str;
+    description = "Attrset of base16 colorscheme key value pairs.";
+  };
+
+  config = {
+    plugins = [ pkgs.vimPlugins.nvim-base16 ];
+    setup.base16-colorscheme = config.colors;
+
+    # Telescope isn't working, shut off for now
+    lua = ''
+      require('base16-colorscheme').with_config {
+          telescope = false,
+      }
+    '';
+  };
+
+}

modules/common/neovim/config/completion.nix

@@ -135,6 +135,13 @@
   };
 
   lua = ''
+    -- Load snippets
+    -- Check status: :lua require("luasnip").log.open()
+    require("luasnip.loaders.from_vscode").lazy_load()
+    require("luasnip.loaders.from_vscode").lazy_load({ paths = { "${
+      builtins.toString pkgs.vscode-terraform-snippets
+    }" } })
+
     -- Use buffer source for `/`
     require('cmp').setup.cmdline("/", {
         sources = {

modules/common/neovim/config/lsp.nix

@@ -6,10 +6,10 @@
     pkgs.vimPlugins.null-ls-nvim
   ];
 
-  use.lspconfig.sumneko_lua.setup = dsl.callWith {
+  use.lspconfig.lua_ls.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" ];
+    cmd = [ "${pkgs.lua-language-server}/bin/lua-language-server" ];
   };
 
   use.lspconfig.nil_ls.setup = dsl.callWith {
@@ -29,11 +29,14 @@
   lua = ''
     ${builtins.readFile ./lsp.lua}
 
+    -- Prevent infinite log size (change this when debugging)
+    vim.lsp.set_log_level("off")
+
     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.diagnostics.ruff.with({ command = "${pkgs.ruff}/bin/ruff" }),
             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" }),
@@ -42,11 +45,15 @@
                 command = "${pkgs.shfmt}/bin/shfmt",
                 extra_args = { "-i", "4", "-ci" },
             }),
-            require("null-ls").builtins.formatting.terraform_fmt.with({ command = "${pkgs.terraform}/bin/terraform" }),
+            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
+                -- Auto-format on save
                 vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
                 vim.api.nvim_create_autocmd("BufWritePre", {
                     group = augroup,
@@ -55,6 +62,12 @@
                         vim.lsp.buf.format({ bufnr = bufnr })
                     end,
                 })
+                -- Use internal formatting for bindings like gq.
+                vim.api.nvim_create_autocmd("LspAttach", {
+                    callback = function(args)
+                        vim.bo[args.buf].formatexpr = nil
+                    end,
+                })
             end
         end,
     })

modules/common/neovim/config/misc.nix

@@ -5,13 +5,13 @@
     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 = { };
+  setup.glow = { };
 
   vim.o = {
     termguicolors = true; # Set to truecolor
@@ -51,7 +51,7 @@
   vim.opt.completeopt = [ "menu" "menuone" "noselect" ];
 
   lua = lib.mkBefore ''
-    require("impatient")
+    vim.loader.enable()
     ${builtins.readFile ../lua/keybinds.lua};
     ${builtins.readFile ../lua/settings.lua};
   '';

modules/common/neovim/config/statusline.nix

@@ -2,7 +2,7 @@
   plugins = [ pkgs.vimPlugins.lualine-nvim ];
   setup.lualine = {
     options = {
-      theme = "gruvbox";
+      theme = "base16";
       icons_enabled = true;
     };
   };

modules/common/neovim/config/syntax.nix

@@ -1,26 +1,38 @@
-{ pkgs, ... }: {
+{ pkgs, lib, ... }: {
 
   plugins = [
-    (pkgs.vimPlugins.nvim-treesitter.withPlugins (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-bash
         tree-sitter-fish
+        tree-sitter-hcl
+        tree-sitter-ini
+        tree-sitter-json
+        tree-sitter-lua
+        tree-sitter-markdown
+        tree-sitter-markdown-inline
+        tree-sitter-nix
+        tree-sitter-puppet
+        tree-sitter-python
+        tree-sitter-rasi
         tree-sitter-toml
         tree-sitter-yaml
-        tree-sitter-json
       ]))
     pkgs.vimPlugins.vim-matchup # Better % jumping in languages
+    pkgs.vimPlugins.playground # Tree-sitter experimenting
     pkgs.vimPlugins.nginx-vim
     pkgs.vimPlugins.vim-helm
-    pkgs.vimPlugins.vim-puppet
+    (pkgs.vimUtils.buildVimPluginFrom2Nix {
+      pname = "nmasur";
+      version = "0.1";
+      src = ../plugin;
+    })
   ];
 
   setup."nvim-treesitter.configs" = {
     highlight = { enable = true; };
     indent = { enable = true; };
+    matchup = { enable = true; }; # Uses vim-matchup
 
     textobjects = {
       select = {
@@ -49,4 +61,10 @@
     };
   };
 
+  # Use mkAfter to ensure tree-sitter is already loaded
+  lua = lib.mkAfter ''
+    -- Use HCL parser with .tf files
+    vim.treesitter.language.register('hcl', 'terraform')
+  '';
+
 }

modules/common/neovim/config/telescope.lua

@@ -13,6 +13,7 @@ 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>rr", telescope.resume)
 
 vim.keymap.set("n", "<Leader>N", function()
     local opts = {
@@ -45,7 +46,7 @@ end)
 vim.keymap.set("n", "<Leader>fz", require("telescope").extensions.zoxide.list)
 
 -- Project
-require("telescope").load_extension("project")
+require("telescope").load_extension("projects")
 vim.keymap.set("n", "<C-p>", function()
     local opts = require("telescope.themes").get_ivy({
         layout_config = {
@@ -54,7 +55,7 @@ vim.keymap.set("n", "<C-p>", function()
             },
         },
     })
-    require("telescope").extensions.project.project(opts)
+    require("telescope").extensions.projects.projects(opts)
 end)
 
 -- File browser

modules/common/neovim/config/telescope.nix

@@ -2,7 +2,7 @@
 
   plugins = [
     pkgs.vimPlugins.telescope-nvim
-    pkgs.vimPlugins.telescope-project-nvim
+    pkgs.vimPlugins.project-nvim
     pkgs.vimPlugins.telescope-fzy-native-nvim
     pkgs.vimPlugins.telescope-file-browser-nvim
     pkgs.vimPlugins.telescope-zoxide
@@ -25,10 +25,11 @@
     extensions = {
       fzy_native = { };
       zoxide = { };
-      project = { base_dirs = [ "~/dev" ]; };
     };
   };
 
+  setup.project_nvim = { };
+
   lua = builtins.readFile ./telescope.lua;
 
 }