dev/nixfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Update nixpkgs and home-manager

Browse Source
This commit is contained in:
Jack O'Sullivan 2022-11-20 04:44:22 +00:00
parent c42e836d52
commit 0038d9c987
5 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
flake.lock generated
View File

@ -116,11 +116,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1667677389, "lastModified": 1667907331,
"narHash": "sha256-y9Zdq8vtsn0T5TO1iTvWA7JndYIAGjzCjbYVi/hOSmA=", "narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "87d55517f6f36aa1afbd7a4a064869d5a1d405b8", "rev": "6639e3a837fc5deb6f99554072789724997bc8e5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -137,11 +137,11 @@
"utils": "utils_2" "utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1667708081, "lastModified": 1668900402,
"narHash": "sha256-FChEy05x4ed/pttjfTeKxjPCnHknMYrUtDyBiYbreT4=", "narHash": "sha256-IhVlueHoQNoN0SOHZIceKU3LyEL00g2ei0aUlaNypbQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1ef0da321217c6c19b7a30509631c080a19321e5", "rev": "c0f9cbcf93ca22e4f0ca66843be61a4bdf6f0a44",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -167,11 +167,11 @@
}, },
"nixpkgs-mine": { "nixpkgs-mine": {
"locked": { "locked": {
"lastModified": 1666466514, "lastModified": 1668912601,
"narHash": "sha256-9xglfRPdSBjrgMEBpI4nx2KOw+0ugH43GcJyNCC5lNw=", "narHash": "sha256-3NYOKMIy+9yZ0i79n7/gDOG4larQDyP93yhLvocAhLI=",
"owner": "devplayer0", "owner": "devplayer0",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d104dc81f17093341988f3d93053ceac7a0a698c", "rev": "b72bbaaf21d31f67df455e1584f2dff02d799896",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -183,11 +183,11 @@
}, },
"nixpkgs-mine-stable": { "nixpkgs-mine-stable": {
"locked": { "locked": {
"lastModified": 1666466537, "lastModified": 1668912632,
"narHash": "sha256-W94lIPqOQuFxQcZYrUjgto1f2vjEkarAArqHGs1UxiE=", "narHash": "sha256-Xv+VEgkAxDsj572ggD/KBDzkO6//ltLpH80fy0h2vNI=",
"owner": "devplayer0", "owner": "devplayer0",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "153b432268ffd9e095effa2c969184a9d5a2601a", "rev": "3419fa265d67829f922d0dcbe865bc915f93f885",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -199,11 +199,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1667653703, "lastModified": 1668766498,
"narHash": "sha256-Xow4vx52/g5zkhlgZnMEm/TEXsj+13jTPCc2jIhW1xU=", "narHash": "sha256-UjZlIrbHGlL3H3HZNPTxPSwJfr49jIfbPWCYxk0EQm4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f09ad462c5a121d0239fde645aacb2221553a217", "rev": "f42a45c015f28ac3beeb0df360e50cdbf495d44b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -214,11 +214,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1667629849, "lastModified": 1668765800,
"narHash": "sha256-P+v+nDOFWicM4wziFK9S/ajF2lc0N2Rg9p6Y35uMoZI=", "narHash": "sha256-rC40+/W6Hio7b/RsY8SvQPKNx4WqNcTgfYv8cUMAvJk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3bacde6273b09a21a8ccfba15586fb165078fb62", "rev": "52b2ac8ae18bbad4374ff0dd5aeee0fdf1aea739",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
home-manager/modules/common.nix
View File

@ -46,7 +46,7 @@ in
}; };
nix = { nix = {
package = pkgs.nix; package = mkIf (!(versionAtLeast config.home.stateVersion "22.11")) pkgs.nix;
settings = { settings = {
experimental-features = [ "nix-command" "flakes" "ca-derivations" ]; experimental-features = [ "nix-command" "flakes" "ca-derivations" ];
max-jobs = mkDefault "auto"; max-jobs = mkDefault "auto";
@ -242,6 +242,8 @@ in
ssh.authKeys.files = [ lib.my.sshKeyFiles.me ]; ssh.authKeys.files = [ lib.my.sshKeyFiles.me ];
}; };
nix.package = mkIf (versionAtLeast config.home.stateVersion "22.05") pkgs.nix;
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
home = { home = {

3
nixos/boxes/colony/vms/shill/containers/middleman/vhosts.nix
View File

@ -191,8 +191,9 @@ in
${headers} ${headers}
''; '';
root = pkgs.element-web.override { root = pkgs.element-web.override {
# Currently it seems like single quotes aren't escaped like they should be...
conf = { conf = {
brand = "/dev/player0's Matrix"; brand = "/dev/player0 Matrix";
showLabsSettings = true; showLabsSettings = true;
disable_guests = true; disable_guests = true;
default_server_config = { default_server_config = {

14
nixos/boxes/colony/vms/shill/containers/toot.nix
View File

@ -17,7 +17,7 @@
configuration = { lib, pkgs, config, assignments, allAssignments, ... }: configuration = { lib, pkgs, config, assignments, allAssignments, ... }:
let let
inherit (lib) mkMerge mkIf genAttrs; inherit (lib) mkMerge mkIf genAttrs mkBefore;
inherit (lib.my) networkdAssignment; inherit (lib.my) networkdAssignment;
in in
{ {
@ -61,6 +61,9 @@
mastodon-init-dirs.script = '' mastodon-init-dirs.script = ''
echo "AWS_SECRET_ACCESS_KEY=\""$(< ${config.age.secrets."toot/s3-secret-key.txt".path})"\"" >> /var/lib/mastodon/.secrets_env echo "AWS_SECRET_ACCESS_KEY=\""$(< ${config.age.secrets."toot/s3-secret-key.txt".path})"\"" >> /var/lib/mastodon/.secrets_env
''; '';
mastodon-init-db = {
after = [ "systemd-networkd-wait-online.service" ];
};
# Can't use the extraConfig because these services expect a different format for the both family bind address... # Can't use the extraConfig because these services expect a different format for the both family bind address...
mastodon-streaming.environment.BIND = "::"; mastodon-streaming.environment.BIND = "::";
@ -108,11 +111,10 @@
redis.createLocally = true; redis.createLocally = true;
# TODO: Re-enable when nixpkgs is updated mediaAutoRemove = {
#mediaAutoRemove = { enable = true;
# enable = true; olderThanDays = 30;
# olderThanDays = 30; };
#};
} }
{ {
extraConfig = { extraConfig = {

4
nixos/boxes/colony/vms/shill/default.nix
View File

@ -42,8 +42,8 @@
kernelParams = [ "console=ttyS0,115200n8" ]; kernelParams = [ "console=ttyS0,115200n8" ];
# Stolen from nixos/modules/services/torrent/transmission.nix # Stolen from nixos/modules/services/torrent/transmission.nix
kernel.sysctl = { kernel.sysctl = {
"net.core.rmem_max" = "4194304"; # 4MB "net.core.rmem_max" = 4194304; # 4MB
"net.core.wmem_max" = "1048576"; # 1MB "net.core.wmem_max" = 1048576; # 1MB
"net.ipv4.ip_local_port_range" = "16384 65535"; "net.ipv4.ip_local_port_range" = "16384 65535";
#"net.netfilter.nf_conntrack_generic_timeout" = 60; #"net.netfilter.nf_conntrack_generic_timeout" = 60;
#"net.netfilter.nf_conntrack_tcp_timeout_established" = 600; #"net.netfilter.nf_conntrack_tcp_timeout_established" = 600;