diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /modules | |
parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'modules')
-rw-r--r-- | modules/server/bitfolk/default.nix | 1 | ||||
-rw-r--r-- | modules/server/cgit/default.nix | 4 | ||||
-rw-r--r-- | modules/server/spectrum/cgit/default.nix | 2 | ||||
-rw-r--r-- | modules/shell/zsh/default.nix | 12 | ||||
-rw-r--r-- | modules/ssh/default.nix | 2 |
5 files changed, 6 insertions, 15 deletions
diff --git a/modules/server/bitfolk/default.nix b/modules/server/bitfolk/default.nix index 461d232e7add..d5b54109fa05 100644 --- a/modules/server/bitfolk/default.nix +++ b/modules/server/bitfolk/default.nix @@ -8,7 +8,6 @@ # Bitfolk provides its own GRUB, so we need to give it a grub.cfg # but don't need to actually install GRUB anywhere. boot.loader.grub.enable = true; - boot.loader.grub.version = 2; boot.loader.grub.device = "nodev"; networking.dhcpcd.enable = false; diff --git a/modules/server/cgit/default.nix b/modules/server/cgit/default.nix index 2883a9f55c83..a895fe94e80f 100644 --- a/modules/server/cgit/default.nix +++ b/modules/server/cgit/default.nix @@ -5,7 +5,7 @@ let inherit (lib) flip foldr groupBy head literalExpression mapAttrs mapAttrs' mapAttrsToList mkOption nameValuePair optionalAttrs types; - cfg = config.services.cgit; + cfg = config.services.cgit-qyliss; instancesByVhost = groupBy ({ value, ... }: value.vhost) (mapAttrsToList nameValuePair cfg.instances); @@ -35,7 +35,7 @@ let in { - options.services.cgit = { + options.services.cgit-qyliss = { instances = mkOption { type = types.attrsOf (types.submodule { options = { diff --git a/modules/server/spectrum/cgit/default.nix b/modules/server/spectrum/cgit/default.nix index 46542564a143..c44700768270 100644 --- a/modules/server/spectrum/cgit/default.nix +++ b/modules/server/spectrum/cgit/default.nix @@ -29,7 +29,7 @@ in { imports = [ ../../cgit ]; - services.cgit.instances.spectrum = { + services.cgit-qyliss.instances.spectrum = { package = pkgs.cgit-pink; vhost = "spectrum-os.org"; path = "/git"; diff --git a/modules/shell/zsh/default.nix b/modules/shell/zsh/default.nix index 880b6c995402..95d7b38cf6ca 100644 --- a/modules/shell/zsh/default.nix +++ b/modules/shell/zsh/default.nix @@ -1,18 +1,12 @@ { pkgs, config, ... }: { - environment.etc.zshrc.text = '' - unsetopt GLOBAL_RCS - - if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then - . ${config.system.build.setEnvironment} - fi - ''; - environment.extraInit = '' export ZDOTDIR="/etc/xdg/nixos/per-user/$USER/zsh" ''; + programs.zsh.enable = true; + systemd.tmpfiles.rules = [ "d ${config.users.users.qyliss.home}/state/zsh 0700 qyliss qyliss" ]; @@ -21,6 +15,4 @@ users.users.qyliss.xdg.config.paths."zsh/.zshrc" = with pkgs; writeText "zshrc" (callPackage ./zshrc.nix {}); - - environment.systemPackages = with pkgs; [ zsh nix-zsh-completions ]; } diff --git a/modules/ssh/default.nix b/modules/ssh/default.nix index 8443ea0b89a1..29a047357456 100644 --- a/modules/ssh/default.nix +++ b/modules/ssh/default.nix @@ -66,7 +66,7 @@ in ''; services.openssh.authorizedKeysFiles = [ "${./keys}/%u.keys" ]; - services.openssh.strictModes = false; + services.openssh.settings.StrictModes = false; users.users.root.openssh.authorizedKeys.keyFiles = [ ./keys/qyliss.keys ]; |