Merge branch 'main' into teutat3s

.drone.yml

@@ -125,7 +125,7 @@ steps:
         from_secret: iso_web_ssh_port
       key:
         from_secret: iso_web_ssh_key
-      target: /srv/www/os/download
+      target: /data/srv/www/os/download
       source:
         - /var/nix/iso-cache/*.iso
         - /var/nix/iso-cache/*.iso.sha256
@@ -147,6 +147,6 @@ volumes:
 
 ---
 kind: signature
-hmac: d6187b243c1939eaf2803830e784aa89dd20edda9ba205940cf6caa2c615b6c6
+hmac: 6aee0ffe22111bb629c0a79940bfbc3fa75f68c5ed5c4bba68abf6797b87a7ab
 
 ...

flake.lock

@@ -461,18 +461,6 @@
         "type": "github"
       }
     },
-    "nur": {
-      "locked": {
-        "lastModified": 0,
-        "narHash": "sha256-koC6DBYmLCrgXA+AMHVaODf1uHYPmvcFygHfy3eg6vI=",
-        "path": "/nix/store/6mfkswqi67m35qwv0vh7kpk8rypbl2rq-source",
-        "type": "path"
-      },
-      "original": {
-        "id": "nur",
-        "type": "indirect"
-      }
-    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -487,7 +475,6 @@
         "nixos": "nixos",
         "nixos-22-05": "nixos-22-05",
         "nixos-hardware": "nixos-hardware",
-        "nur": "nur",
         "triton-vmtools": "triton-vmtools",
         "tritonshell": "tritonshell"
       }

flake.nix

@@ -56,7 +56,6 @@
     nixos,
     home,
     nixos-hardware,
-    nur,
     agenix,
     deploy,
     tritonshell,
@@ -92,7 +91,6 @@
             our = self.lib;
           });
         })
-        nur.overlay
         agenix.overlays.default
 
         (import ./pkgs)

modules/core/boot.nix

@@ -33,10 +33,10 @@ in {
         };
       };
 
-      loader.systemd-boot.enable = true;
+      loader.systemd-boot.enable = lib.mkDefault true;
 
-      # Use latest LTS linux kernel by default
+      # Use latest linux kernel by default
-      kernelPackages = pkgs.linuxPackages_6_2;
+      kernelPackages = lib.mkDefault pkgs.linuxPackages_6_2;
 
       # Support ntfs drives
       supportedFilesystems = ["ntfs"];

modules/core/hibernation.nix

@@ -15,8 +15,8 @@ in {
     };
 
     resumeDevice = mkOption {
-      type = types.str;
+      type = types.nullOr types.str;
-      default = "/dev/sda1";
+      default = null;
       description = "The location of the hibernation resume swap file.";
     };
 
@@ -29,7 +29,7 @@ in {
 
   config = {
     boot = mkIf cfg.enable {
-      resumeDevice = cfg.resumeDevice;
+      resumeDevice = mkIf (cfg.resumeDevice != null) cfg.resumeDevice;
       kernelParams = mkIf (cfg.resumeOffset != null) ["resume_offset=${builtins.toString cfg.resumeOffset}"];
     };
   };

modules/core/services.nix

@@ -10,7 +10,7 @@
     # If you don't want the host to have SSH actually opened up to the net,
     # set `services.openssh.openFirewall` to false in your config.
     openFirewall = lib.mkDefault true;
-    passwordAuthentication = false;
+    passwordAuthentication = lib.mkDefault false;
   };
 
   # Service that makes Out of Memory Killer more effective

modules/terminal-life/default.nix

@@ -72,6 +72,7 @@ in {
         programs.neovim = import ./nvim {
           inherit config;
           inherit pkgs;
+          inherit lib;
         };
       };
   };

modules/terminal-life/nvim/default.nix

@@ -1,6 +1,7 @@
 {
   config,
   pkgs,
+  lib,
   ...
 }: let
   psCfg = config.pub-solar;
@@ -42,64 +43,66 @@ in {
       universal-ctags
     ];
 
-  plugins = with pkgs.vimPlugins; [
+  plugins = with pkgs.vimPlugins;
-    nvim-cmp
+    []
-    cmp-nvim-lsp
+    ++ lib.optionals (!cfg.lite) [
-    cmp_luasnip
+      nvim-cmp
-    luasnip
+      cmp-nvim-lsp
+      cmp_luasnip
+      luasnip
 
-    lsp_extensions-nvim
+      lsp_extensions-nvim
-    nvim-lspconfig
+      nvim-lspconfig
 
-    instant-nvim-nvfetcher
+      instant-nvim-nvfetcher
 
-    ack-vim
+      ack-vim
-    vim-airline
+      vim-airline
-    editorconfig-vim
+      editorconfig-vim
-    nnn-vim
+      nnn-vim
-    quick-scope
+      quick-scope
-    suda-vim
+      suda-vim
-    syntastic
+      syntastic
-    vim-gutentags
+      vim-gutentags
-    vim-vinegar
+      vim-vinegar
-    vim-workspace-nvfetcher
+      vim-workspace-nvfetcher
 
-    sonokai
+      sonokai
-    vim-hybrid-material
+      vim-hybrid-material
-    vim-airline-themes
+      vim-airline-themes
-    vim-apprentice-nvfetcher
+      vim-apprentice-nvfetcher
 
-    fugitive
+      fugitive
-    vim-gitgutter
+      vim-gitgutter
-    vim-rhubarb
+      vim-rhubarb
-    vimagit-nvfetcher
+      vimagit-nvfetcher
 
-    fzf-vim
+      fzf-vim
-    fzfWrapper
+      fzfWrapper
-    vim-highlightedyank
+      vim-highlightedyank
 
-    vim-beautify-nvfetcher
+      vim-beautify-nvfetcher
-    vim-surround
+      vim-surround
 
-    vim-bufkill
+      vim-bufkill
-    vim-sensible
+      vim-sensible
 
-    ansible-vim
+      ansible-vim
-    emmet-vim
+      emmet-vim
-    rust-vim
+      rust-vim
-    vim-caddyfile-nvfetcher
+      vim-caddyfile-nvfetcher
-    vim-go
+      vim-go
-    vim-javascript
+      vim-javascript
-    vim-json
+      vim-json
-    SchemaStore-nvim
+      SchemaStore-nvim
-    vim-markdown
+      vim-markdown
-    vim-nix
+      vim-nix
-    vim-nixhash
+      vim-nixhash
-    vim-ruby
+      vim-ruby
-    vim-toml
+      vim-toml
-    vim-vue
+      vim-vue
-    yats-vim
+      yats-vim
-  ];
+    ];
 
   extraConfig = builtins.concatStringsSep "\n" [
     ''