From 858fd257a4d36769289849c98f6805076c2304c2 Mon Sep 17 00:00:00 2001 From: Hendrik Sokolowski Date: Mon, 26 Dec 2022 15:08:02 +0100 Subject: [PATCH 1/3] define settings as defaults --- modules/core/boot.nix | 4 ++-- modules/core/services.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/core/boot.nix b/modules/core/boot.nix index 0a7fc41..4f82a4b 100644 --- a/modules/core/boot.nix +++ b/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 - kernelPackages = pkgs.linuxPackages_5_15; + kernelPackages = lib.mkDefault pkgs.linuxPackages_5_15; # Support ntfs drives supportedFilesystems = ["ntfs"]; diff --git a/modules/core/services.nix b/modules/core/services.nix index 7a825bc..2d53dd7 100644 --- a/modules/core/services.nix +++ b/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 From 1c6a726d0123a9f80aa8afcc24da9b5b857532ed Mon Sep 17 00:00:00 2001 From: Hendrik Sokolowski Date: Mon, 26 Dec 2022 15:06:47 +0100 Subject: [PATCH 2/3] remove packages from lite mode --- modules/terminal-life/default.nix | 1 + modules/terminal-life/nvim/default.nix | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/terminal-life/default.nix b/modules/terminal-life/default.nix index 3b58243..083f05e 100644 --- a/modules/terminal-life/default.nix +++ b/modules/terminal-life/default.nix @@ -55,6 +55,7 @@ in { programs.neovim = import ./nvim { inherit config; inherit pkgs; + inherit lib; }; programs.fzf = import ./fzf { inherit config; diff --git a/modules/terminal-life/nvim/default.nix b/modules/terminal-life/nvim/default.nix index 93c8b15..e1bfd4e 100644 --- a/modules/terminal-life/nvim/default.nix +++ b/modules/terminal-life/nvim/default.nix @@ -1,6 +1,7 @@ { config, pkgs, + lib, ... }: let psCfg = config.pub-solar; @@ -42,7 +43,8 @@ in { universal-ctags ]; - plugins = with pkgs.vimPlugins; [ + plugins = with pkgs.vimPlugins; [ ] + ++ lib.optionals (!cfg.lite) [ nvim-cmp cmp-nvim-lsp cmp_luasnip From 25126fd8cacaf0b83eca6d56e30a1994bb9a874e Mon Sep 17 00:00:00 2001 From: Hendrik Sokolowski Date: Wed, 2 Nov 2022 20:55:05 +0100 Subject: [PATCH 3/3] Make resumeDevice optional --- modules/core/hibernation.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/core/hibernation.nix b/modules/core/hibernation.nix index c0dd97b..74befd7 100644 --- a/modules/core/hibernation.nix +++ b/modules/core/hibernation.nix @@ -15,8 +15,8 @@ in { }; resumeDevice = mkOption { - type = types.str; - default = "/dev/sda1"; + type = types.nullOr types.str; + 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}"]; }; };