From 9ad147bb5b96352b5bedf95c156133c0bd2fb0e3 Mon Sep 17 00:00:00 2001 From: Alejandro Angulo Date: Sat, 2 Mar 2024 08:23:27 -0800 Subject: [PATCH] Updated and addressed warnings --- flake.lock | 42 ++++++++++---------- modules/nixos/apps/neovim/default.nix | 3 +- modules/nixos/desktop/sway/default.nix | 9 ----- modules/nixos/services/nextcloud/default.nix | 4 +- systems/x86_64-linux/node/default.nix | 17 +++++++- 5 files changed, 40 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index a8ced43..4f9cbab 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1703433843, - "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=", + "lastModified": 1707830867, + "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", "owner": "ryantm", "repo": "agenix", - "rev": "417caa847f9383e111d1397039c9d4337d024bf0", + "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", "type": "github" }, "original": { @@ -34,11 +34,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1704875591, - "narHash": "sha256-eWRLbqRcrILgztU/m/k7CYLzETKNbv0OsT2GjkaNm8A=", + "lastModified": 1708091384, + "narHash": "sha256-dTGGw2y8wvfjr+J9CjQbfdulOq72hUG17HXVNxpH1yE=", "owner": "serokell", "repo": "deploy-rs", - "rev": "1776009f1f3fb2b5d236b84d9815f2edee463a9b", + "rev": "0a0187794ac7f7a1e62cda3dabf8dc041f868790", "type": "github" }, "original": { @@ -122,11 +122,11 @@ ] }, "locked": { - "lastModified": 1707175763, - "narHash": "sha256-0MKHC6tQ4KEuM5rui6DjKZ/VNiSANB4E+DJ/+wPS1PU=", + "lastModified": 1708988456, + "narHash": "sha256-RCz7Xe64tN2zgWk+MVHkzg224znwqknJ1RnB7rVqUWw=", "owner": "nix-community", "repo": "home-manager", - "rev": "f99eace7c167b8a6a0871849493b1c613d0f1b80", + "rev": "1d085ea4444d26aa52297758b333b449b2aa6fca", "type": "github" }, "original": { @@ -138,11 +138,11 @@ }, "nixlib": { "locked": { - "lastModified": 1693701915, - "narHash": "sha256-waHPLdDYUOHSEtMKKabcKIMhlUOHPOOPQ9UyFeEoovs=", + "lastModified": 1708821942, + "narHash": "sha256-jd+E1SD59qty65pwqad2mftzkT6vW5nNFWVuvayh4Zw=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "f5af57d3ef9947a70ac86e42695231ac1ad00c25", + "rev": "479831ed8b3c9c7b80533999f880c7d0bf6a491b", "type": "github" }, "original": { @@ -159,11 +159,11 @@ ] }, "locked": { - "lastModified": 1707405218, - "narHash": "sha256-ZQ366Oo8WJbCqXAZET7N0Sz6RQ3G2IbqVtxQRSa3SXc=", + "lastModified": 1709167897, + "narHash": "sha256-UQVMLPVCo3wcQUYZfHnSoVVgi5RzfnaOm2z+aTlxf4A=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "843e2f04c716092797ffa4ce14c446adce2f09ef", + "rev": "f34ad8b5445d3f0b72370eaae8687125fb736efa", "type": "github" }, "original": { @@ -174,11 +174,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1707211557, - "narHash": "sha256-LTKTzZ6fM5j8XWXf51IMBzDaOaJg9kYWLUZxoIhzRN8=", + "lastModified": 1709147990, + "narHash": "sha256-vpXMWoaCtMYJ7lisJedCRhQG9BSsInEyZnnG5GfY9tQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6e5cc385fc8cf5ca6495d70243074ccdea9f64c7", + "rev": "33a97b5814d36ddd65ad678ad07ce43b1a67f159", "type": "github" }, "original": { @@ -190,11 +190,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1707268954, - "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", + "lastModified": 1708984720, + "narHash": "sha256-gJctErLbXx4QZBBbGp78PxtOOzsDaQ+yw1ylNQBuSUY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", + "rev": "13aff9b34cc32e59d35c62ac9356e4a41198a538", "type": "github" }, "original": { diff --git a/modules/nixos/apps/neovim/default.nix b/modules/nixos/apps/neovim/default.nix index d9cc7ad..a3df941 100644 --- a/modules/nixos/apps/neovim/default.nix +++ b/modules/nixos/apps/neovim/default.nix @@ -49,8 +49,7 @@ in { # Eye candy nvim-web-devicons - # base16-vim - nvim-base16 + base16-nvim markdown-preview-nvim diff --git a/modules/nixos/desktop/sway/default.nix b/modules/nixos/desktop/sway/default.nix index b4049fe..0137d15 100644 --- a/modules/nixos/desktop/sway/default.nix +++ b/modules/nixos/desktop/sway/default.nix @@ -32,14 +32,6 @@ in { Path to wallpaper, relative to config.home-home-manager.users..xdg.dataHome ''; }; - - verticalWallpaperPath = mkOption { - type = str; - default = "sway/skull.png"; - description = '' - Path to vertical wallpaper, relative to config.home-home-manager.users..xdg.dataHome - ''; - }; }; config = mkIf cfg.enable { @@ -79,7 +71,6 @@ in { aa.home.dataFile = { ${cfg.wallpaperPath}.source = ./wallpaper.jpg; - ${cfg.verticalWallpaperPath}.source = ./vertical.png; }; aa.home.extraOptions = { wayland.windowManager.sway = { diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix index 627703e..b2820b2 100644 --- a/modules/nixos/services/nextcloud/default.nix +++ b/modules/nixos/services/nextcloud/default.nix @@ -30,7 +30,7 @@ in { services.nextcloud = { enable = true; - package = pkgs.nextcloud27; + package = pkgs.nextcloud28; hostName = "nextcloud.kilonull.com"; https = true; database.createLocally = true; @@ -38,7 +38,7 @@ in { # Arbitrary large size maxUploadSize = "16G"; configureRedis = true; - logType = "file"; + settings.log_type = "file"; poolSettings = { pm = "dynamic"; "pm.max_children" = "64"; diff --git a/systems/x86_64-linux/node/default.nix b/systems/x86_64-linux/node/default.nix index 47d9360..b0875d2 100644 --- a/systems/x86_64-linux/node/default.nix +++ b/systems/x86_64-linux/node/default.nix @@ -1,6 +1,7 @@ { config, pkgs, + lib, ... }: { imports = [ @@ -84,7 +85,7 @@ apps.yubikey.enable = true; }; - security.pam.enableSSHAgentAuth = true; + security.pam.sshAgentAuth.enable = true; security.pam.services.${config.aa.user.name}.sshAgentAuth = true; boot.loader.systemd-boot.enable = true; @@ -107,6 +108,20 @@ ]; }; + # Running own DNS resolver on same system. This prevents DNS issues with ACME + systemd.services = let + dependency = ["adguardhome.service"]; + in + lib.mapAttrs' + (name: _: + lib.nameValuePair "acme-${name}" { + after = dependency; + preStart = '' + sleep 10 + ''; + }) + config.security.acme.certs; + # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [