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 /sys | |
| 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 'sys')
| -rw-r--r-- | sys/atuin.nix | 2 | ||||
| -rw-r--r-- | sys/eve.nix | 2 | ||||
| -rw-r--r-- | sys/x220.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/atuin.nix b/sys/atuin.nix index 00e137b04433..bb276c690020 100644 --- a/sys/atuin.nix +++ b/sys/atuin.nix @@ -220,7 +220,7 @@ in users.groups.acme.members = [ "nginx" ]; - services.cgit.instances.qyliss = { + services.cgit-qyliss.instances.qyliss = { package = pkgs.cgit-pink; vhost = "git.qyliss.net"; config = pkgs.writeText "cgit.conf" '' diff --git a/sys/eve.nix b/sys/eve.nix index b56ea7db46dc..2c0cb44d5a4a 100644 --- a/sys/eve.nix +++ b/sys/eve.nix @@ -27,7 +27,7 @@ }; # TODO: do this with ZFS - boot.cleanTmpDir = true; + boot.tmp.cleanOnBoot = true; networking.hostName = "eve"; networking.hostId = "c00b7876"; diff --git a/sys/x220.nix b/sys/x220.nix index 1abcd9a57b90..4eac8dda4045 100644 --- a/sys/x220.nix +++ b/sys/x220.nix @@ -74,7 +74,7 @@ system.stateVersion = "22.05"; - users.users.qyliss.hashedPassword = "$5$rounds=1000000$tySRQ3rdqbPOduux$NcW7CoffEScpmOyS0Ga9gE5ZNLt8PT6.2Gvwn91vQn7"; + users.users.qyliss.hashedPassword = "$y$j9T$Q5bSnSDsY.PkqBX9AA3Gp0$cMl0jK1Cug/7vu8n4ShmQouZTbyPMkUO3NMBVpWn353"; hardware.opengl.enable = true; hardware.opengl.extraPackages = with pkgs; [ libGL ]; |