flora-6: merge main branch #178

Merged
teutat3s merged 12 commits from flora-6/merge-main into infra 2023-03-08 17:32:29 +00:00
5 changed files with 10 additions and 7 deletions
Showing only changes of commit 55d85cc757 - Show all commits

View file

@ -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"];

View file

@ -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}"];
};
};

View file

@ -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

View file

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

View file

@ -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