palo/nixos-config
palo/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

21.05 -> 21.11 robi

Browse source
This commit is contained in:
Ingolf Wagner 2022-01-09 19:22:12 +01:00
parent 708616b7b2
commit e8492a17bb
No known key found for this signature in database
GPG key ID: 76BF5F1928B9618B
8 changed files with 344 additions and 363 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock
View file

@ -38,11 +38,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1635070614, "lastModified": 1641229786,
"narHash": "sha256-eRup9WsvSIhsRrSlNugPcQ7gfGOsbk3d4izufwVlz1Q=", "narHash": "sha256-WPPcLNbVu6ryj772GooUpF285LOvRHdOo/UNJgPnFYI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3b1789322fcbcb5cf51228d732752714f1bf77da", "rev": "88579effa7e88c25087faf6de6388d0cd1738dc0",
"type": "github" "type": "github"
}, },
"original": { "original": {

19
nixos/configs/robi/nextcloud.nix
View file

@ -98,7 +98,9 @@ in
users.users.nextcloud = { users.users.nextcloud = {
isSystemUser = true; isSystemUser = true;
uid = nextcloudUid; uid = nextcloudUid;
group = "nextcloud";
}; };
users.groups.nextcloud = { };
# Container Setup # Container Setup
@ -135,23 +137,23 @@ in
isReadOnly = false; isReadOnly = false;
}; };
samples = { samples = {
mountPoint = toString config.services.syncthing.declarative.folders.samples.path; mountPoint = toString config.services.syncthing.folders.samples.path;
hostPath = toString config.services.syncthing.declarative.folders.samples.path; hostPath = toString config.services.syncthing.folders.samples.path;
isReadOnly = true; isReadOnly = true;
}; };
movies = { movies = {
mountPoint = toString config.services.syncthing.declarative.folders.movies.path; mountPoint = toString config.services.syncthing.folders.movies.path;
hostPath = toString config.services.syncthing.declarative.folders.movies.path; hostPath = toString config.services.syncthing.folders.movies.path;
isReadOnly = true; isReadOnly = true;
}; };
music = { music = {
mountPoint = toString config.services.syncthing.declarative.folders.music-library.path; mountPoint = toString config.services.syncthing.folders.music-library.path;
hostPath = toString config.services.syncthing.declarative.folders.music-library.path; hostPath = toString config.services.syncthing.folders.music-library.path;
isReadOnly = true; isReadOnly = true;
}; };
series = { series = {
mountPoint = toString config.services.syncthing.declarative.folders.series.path; mountPoint = toString config.services.syncthing.folders.series.path;
hostPath = toString config.services.syncthing.declarative.folders.series.path; hostPath = toString config.services.syncthing.folders.series.path;
isReadOnly = true; isReadOnly = true;
}; };
}; };
@ -214,6 +216,7 @@ in
innodb_large_prefix = true; innodb_large_prefix = true;
innodb_file_format = "barracuda"; innodb_file_format = "barracuda";
innodb_file_per_table = 1; innodb_file_per_table = 1;
innodb_read_only_compressed = 0;
}; };
}; };

2
nixos/configs/robi/syncthing.nix
View file

@ -13,7 +13,6 @@
openDefaultPorts = false; openDefaultPorts = false;
dataDir = "/media/syncthing"; dataDir = "/media/syncthing";
configDir = "/media/syncthing"; configDir = "/media/syncthing";
declarative = {
overrideDevices = true; overrideDevices = true;
overrideFolders = true; overrideFolders = true;
cert = toString config.sops.secrets.syncthing_cert.path; cert = toString config.sops.secrets.syncthing_cert.path;
@ -103,7 +102,6 @@
}; };
}; };
};
system.permown."/media/syncthing" = { system.permown."/media/syncthing" = {
owner = "syncthing"; owner = "syncthing";

2
nixos/configs/robi/transmission.nix
View file

@ -115,7 +115,7 @@ in
incomplete-dir = "/media/torrent/incomplete"; incomplete-dir = "/media/torrent/incomplete";
incomplete-dir-enabled = true; incomplete-dir-enabled = true;
message-level = 1; message-level = 1;
umask = "002"; umask = 2;
rpc-whitelist-enabled = false; rpc-whitelist-enabled = false;
rpc-host-whitelist-enabled = false; rpc-host-whitelist-enabled = false;
rpc-port = uiPort; rpc-port = uiPort;

80
nixos/flake.lock
View file

@ -210,11 +210,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1631067971, "lastModified": 1637475807,
"narHash": "sha256-z+qlJaCaw/OAoFGdzm0nDKkjRdCwstHzduF74nMn3bY=", "narHash": "sha256-E3nzOvlzZXwyo8Stp5upKsTCDcqUTYAFj4EC060A31c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "0771140f0a6a6622c509fb2d6d2c87f0bfda703d", "rev": "960e7fef45692a4fffc6df6d6b613b0399bbdfd5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -255,11 +255,11 @@
}, },
"flake-utils_3": { "flake-utils_3": {
"locked": { "locked": {
"lastModified": 1629481132, "lastModified": 1637014545,
"narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "997f7efcb746a9c140ce1f13c72263189225f482", "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -311,16 +311,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1637019201, "lastModified": 1639871969,
"narHash": "sha256-lq4gz51fx4m5FXfx1SCB444aEBeaYtLMVm3P18Wi9ls=", "narHash": "sha256-6feWUnMygRzA9tzkrfAzpA5/NBYg75bkFxnqb1DtD7E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "bcf03fa16a1f06b8a0abb27bf49afa8d6fffe8f1", "rev": "697cc8c68ed6a606296efbbe9614c32537078756",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-21.05", "ref": "release-21.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -345,27 +345,6 @@
"type": "github" "type": "github"
} }
}, },
"naersk": {
"inputs": {
"nixpkgs": [
"nixpkgs-fmt",
"nixpkgs"
]
},
"locked": {
"lastModified": 1631004250,
"narHash": "sha256-LGh0CjAZwh13AVkTi9w9lITEC7x6bwSQyFViOZ6HyNo=",
"owner": "nmattia",
"repo": "naersk",
"rev": "08afb3d1dbfe016108b72e05b02ba0f6ecb3c8e1",
"type": "github"
},
"original": {
"owner": "nmattia",
"repo": "naersk",
"type": "github"
}
},
"nix-straight": { "nix-straight": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -402,17 +381,16 @@
"inputs": { "inputs": {
"fenix": "fenix", "fenix": "fenix",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
"naersk": "naersk",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1637014534, "lastModified": 1639739626,
"narHash": "sha256-bWwWZi6KIJuHgR/VvrYqUF8iTb7b8Jewgf4pSB45hJs=", "narHash": "sha256-HQHHONvnRQNbXaiWRzkFdV1uTmO2AUZ5JpErjCvEhVs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-fmt", "repo": "nixpkgs-fmt",
"rev": "0f8e19fc8806747da1fd898d64dc989da10bcdba", "rev": "7a67b35f6afcf92aab23681522ea5fda2fd47231",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -423,11 +401,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1636976544, "lastModified": 1641528457,
"narHash": "sha256-9ZmdyoRz4Qu8bP5BKR1T10YbzcB9nvCeQjOEw2cRKR0=", "narHash": "sha256-FyU9E63n1W7Ql4pMnhW2/rO9OftWZ37pLppn/c1aisY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "931ab058daa7e4cd539533963f95e2bb0dbd41e6", "rev": "ff377a78794d412a35245e05428c8f95fef3951f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -439,16 +417,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1636944046, "lastModified": 1641593416,
"narHash": "sha256-74KLDsiWSBsYXKj/ql9EGbw1TbIJRE7clFkhl30HV/c=", "narHash": "sha256-Vn/vqQtYnVuZlbGGO0gSzLjmtFwb6OPvakwyoG1D/MY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "46251a79f752ae1d46ef733e8e9760b6d3429da4", "rev": "36480448d470bf41bb21267cf9062a1542c4a95f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-21.05", "ref": "nixos-21.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -469,11 +447,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1636228094, "lastModified": 1638097282,
"narHash": "sha256-CpOcIwHAn3yS0PeVmUICFrJ+gde2PiZp3XsnDP3LE9w=", "narHash": "sha256-EXCzj9b8X/lqDPJapxZThIOKL5ASbpsJZ+8L1LnY1ig=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2606cb0fc24e65f489b7d9fdcbf219756e45db35", "rev": "78cb77b29d37a9663e05b61abb4fa09465da4b70",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -647,11 +625,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1630943734, "lastModified": 1637439871,
"narHash": "sha256-jqgAKhvrVDEkv8HB56hVIgvMDuuQ7X4D2zE9ATV+baI=", "narHash": "sha256-2awQ/obzl7zqYgLwbQL0zT58gN8Xq7n+81GcMiS595I=",
"owner": "rust-analyzer", "owner": "rust-analyzer",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "3dae94bf2b3e496adb049da589c7efef272a39b8", "rev": "4566414789310acb2617543f4b50beab4bb48e06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -666,11 +644,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1637050424, "lastModified": 1641374494,
"narHash": "sha256-8IaY0/Y5g3jJiQzPN0PflKFcFEE1C29DZZ0dF1NIJ6s=", "narHash": "sha256-a56G6Um43+0+n+yNYhRCh/mSvDdRVzQHSKcFaDEB9/8=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "3c53d012ac77d4bd8428f9c847709e287c897ad9", "rev": "7edb4b080023ef12f39262a3aa7aab31015a7a0e",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
nixos/flake.nix
View file

@ -2,7 +2,7 @@
description = "system flake.nix"; description = "system flake.nix";
inputs = { inputs = {
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
nixpkgs.url = "github:nixos/nixpkgs/nixos-21.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-21.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
polygon-art = { polygon-art = {
url = "git+ssh://gitlab@gitlab.ingolf-wagner.de/palo/polygon-art"; url = "git+ssh://gitlab@gitlab.ingolf-wagner.de/palo/polygon-art";
@ -14,7 +14,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-21.05"; url = "github:nix-community/home-manager/release-21.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
home-manager-utils = { home-manager-utils = {

2
nixos/system/all/syncthing.nix
View file

@ -3,7 +3,6 @@ with lib; {
services.syncthing = { services.syncthing = {
guiAddress = lib.mkDefault "${config.networking.hostName}.private:8384"; guiAddress = lib.mkDefault "${config.networking.hostName}.private:8384";
declarative = {
overrideDevices = lib.mkDefault true; overrideDevices = lib.mkDefault true;
devices = devices =
let let
@ -227,6 +226,5 @@ with lib; {
}; };
}; };
};
} }

4
nixos/system/all/tinc.nix
View file

@ -14,6 +14,10 @@ in
networking.firewall.trustedInterfaces = [ "tinc.private" ]; networking.firewall.trustedInterfaces = [ "tinc.private" ];
users.users."tinc.private".group = "tinc.private";
users.groups."tinc.private" = { };
# nix-shell -p tinc_pre --run "tinc --config . generate-keys 4096" # nix-shell -p tinc_pre --run "tinc --config . generate-keys 4096"
module.cluster.services.tinc = { module.cluster.services.tinc = {
"retiolum" = { "retiolum" = {