Merge branch 'b12f' into feature/ben-droppie

hosts/droppie/droppie.nix

@@ -10,7 +10,8 @@ in
   ];
 
   config = {
-
     hardware.cpu.intel.updateMicrocode = true;
+
+    pub-solar.x-os.disk-encryption-active = false;
   };
 }

modules/terminal-life/nvim/default.nix

@@ -5,6 +5,16 @@ let
 
   preview-file = pkgs.writeShellScriptBin "preview-file" (import ./preview-file.nix pkgs);
 
+  vimagit-master = pkgs.vimUtils.buildVimPlugin {
+    name = "vimagit-master";
+    src = pkgs.fetchFromGitHub {
+      owner = "jreybert";
+      repo = "vimagit";
+      rev = "308650ddc1e9a94e49fae0ea04bbc1c45f23d4c4";
+      sha256 = "sha256-fhazQQqyFaO0fdoeNI9nBshwTDhKNHH262H/QThtuO0=";
+    };
+  };
+
   instant-nvim = pkgs.vimUtils.buildVimPlugin {
     name = "instant";
     src = pkgs.fetchFromGitHub {
@@ -15,6 +25,16 @@ let
     };
   };
 
+  vim-caddyfile = pkgs.vimUtils.buildVimPlugin {
+    name = "vim-caddyfile";
+    src = pkgs.fetchFromGitHub {
+      owner = "isobit";
+      repo = "vim-caddyfile";
+      rev = "24fe0720551883e407cb70ae1d7c03f162d1d5a0";
+      sha256 = "sha256-rRYv3vnt31g7hNTxttTD6BWdv5JJ+ko3rPNyDUEOZ9o=";
+    };
+  };
+
   workspace = pkgs.vimUtils.buildVimPlugin {
     name = "vim-workspace";
     src = pkgs.fetchFromGitHub {
@@ -117,7 +137,7 @@ in
     fugitive
     vim-gitgutter
     vim-rhubarb
-    vimagit
+    vimagit-master
 
     fzf-vim
     fzfWrapper
@@ -132,12 +152,14 @@ in
     ansible-vim
     emmet-vim
     rust-vim
+    vim-caddyfile
     vim-go
     vim-javascript
     vim-json
     SchemaStore-nvim
     vim-markdown
     vim-nix
+    vim-nixhash
     vim-ruby
     vim-toml
     vim-vue

modules/terminal-life/nvim/lsp.vim

@@ -108,7 +108,18 @@ lua <<EOF
         ['jsonls'] = { -------------------------- JSON
             ['settings'] = {
                 ['json'] = {
-                    ['schemas' ] = require('schemastore').json.schemas()
+                    ['schemas' ] = vim.list_extend(
+                      {
+                        {
+                          ['description'] = 'JSON schema for Caddy v2',
+                          ['fileMatch'] = { '*caddy*.json' },
+                          ['name'] = 'caddy_schema.json',
+                          ['url'] = vim.fn.stdpath('data')..'/json-schemas/caddy_schema.json',
+                        },
+                      },
+                      require('schemastore').json.schemas()
+                    ),
+                    ['validate'] = { ['enable'] = true }
                 }
             }
         },
@@ -118,10 +129,10 @@ lua <<EOF
         'solargraph', --------------------------- Ruby
         'rust_analyzer', ------------------------ Rust
         ['sqlls'] = {
-            ['cmd'] = {"$XDG_DATA_HOME/nvm/versions/node/v12.19.0/bin/sql-language-server", "up", "--method", "stdio"}
+            ['cmd'] = {vim.fn.stdpath('data')..'/nvm/versions/node/v12.19.0/bin/sql-language-server', 'up', '--method', 'stdio'}
         },
         ['terraformls'] = { --------------------- Terraform
-            ['filetypes'] = { "terraform", "hcl", "tf" }
+            ['filetypes'] = { 'terraform', 'hcl', 'tf' }
         },
 
         -- The TS/JS server is chosen depending on an environment variable,

modules/terminal-life/nvim/plugins.vim

@@ -17,6 +17,9 @@ autocmd FileType go nmap gD :GoDecls<CR>
 " Go formatting
 autocmd FileType go setlocal noexpandtab shiftwidth=4 tabstop=4 softtabstop=4 nolist
 
+" Caddyfile indentation
+autocmd FileType caddyfile setlocal noexpandtab shiftwidth=8 tabstop=8 softtabstop=8 nolist
+
 " vim-go disable text-objects
 let g:go_textobj_enabled = 0
 

modules/x-os/boot.nix

@@ -9,6 +9,13 @@ with lib;
     default = false;
     description = "Feature flag for iso builds";
   };
+
+  options.pub-solar.x-os.disk-encryption-active = mkOption {
+    type = types.bool;
+    default = true;
+    description = "Whether it should be assumed that there is a cryptroot device";
+  };
+
   config = {
     # Enable plymouth for better experience of booting
     boot.plymouth.enable = true;
@@ -16,11 +23,11 @@ with lib;
     # Mount / luks device in initrd
     # Allow fstrim to work on it.
     # The ! makes this enabled by default
-    #boot.initrd = mkIf (!cfg.iso-options.enable) {
-    #  luks.devices."cryptroot" = {
-    #    allowDiscards = true;
-    #  };
-    #};
+    boot.initrd = mkIf (!cfg.iso-options.enable && cfg.disk-encryption-active) {
+      luks.devices."cryptroot" = {
+        allowDiscards = true;
+      };
+    };
 
     boot.loader.systemd-boot.enable = true;
   };

profiles/base-user/home.nix

@@ -55,6 +55,10 @@ in
     # Ensure nvim backup directory gets created
     # Workaround for E510: Can't make backup file (add ! to override)
     xdg.dataFile."nvim/backup/.keep".text = "";
+    xdg.dataFile."nvim/json-schemas/.keep".text = "";
+    # Generated with:
+    # docker run -it --name caddy-json-schema registry.greenbaum.cloud/gc/caddy-l4:2.5.2 caddy json-schema -output /srv/caddy_schema.json
+    xdg.dataFile."nvim/json-schemas/caddy_schema.json".source = .local/share/nvim/json-schemas/caddy_schema.json;
     xdg.dataFile."nvim/templates/.keep".text = "";
     xdg.dataFile."shell.nix.tmpl" = {
       text = ''