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

Compare commits

merge into: jalr:main
Branches Tags
jalr:main
jalr:25.11
jalr:vm
jalr:kauma
jalr:24.05
jalr:rotate-gpg-key
jalr:snapserver
jalr:hass
jalr:weinturm-pretix-23.11
jalr:aluminium-23.05
jalr:23.11
jalr:dynamic-colors
jalr:artwork
jalr:rmfakecloud
jalr:asterisk-test
jalr:waybar
jalr:mitel
jalr:lightburn
jalr:injury
jalr:pretix-test-vm
...
pull from: jalr:kauma
Branches Tags
jalr:25.11
jalr:main
jalr:vm
jalr:kauma
jalr:24.05
jalr:rotate-gpg-key
jalr:snapserver
jalr:hass
jalr:weinturm-pretix-23.11
jalr:aluminium-23.05
jalr:23.11
jalr:dynamic-colors
jalr:artwork
jalr:rmfakecloud
jalr:asterisk-test
jalr:waybar
jalr:mitel
jalr:lightburn
jalr:injury
jalr:pretix-test-vm
Sign in to create a new pull request.

3 commits
main ... kauma

Author SHA1 Message Date
Jakob Lechner
7dcff12182 flake.lock: Update 
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/1e6f8a7b4634fc051cc9361959bf414fcf17e094' (2024-07-29)
  → 'github:nix-community/disko/96073e6423623d4a8027e9739d2af86d6422ea7a' (2024-09-02)
• Updated input 'gomod2nix':
    'github:nix-community/gomod2nix/7b8ef0d5fdc09b3a7acb27f1e6c168888947f364' (2024-07-25)
  → 'github:nix-community/gomod2nix/4e08ca09253ef996bd4c03afa383b23e35fe28a1' (2024-08-02)
• Updated input 'nix-pre-commit-hooks':
    'github:cachix/git-hooks.nix/f451c19376071a90d8c58ab1a953c6e9840527fd' (2024-07-15)
  → 'github:cachix/git-hooks.nix/4509ca64f1084e73bc7a721b20c669a8d4c5ebe6' (2024-08-28)
• Updated input 'nixos-hardware':
    'github:nixos/nixos-hardware/14c333162ba53c02853add87a0000cbd7aa230c2' (2024-07-30)
  → 'github:nixos/nixos-hardware/95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef' (2024-08-28)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/12bf09802d77264e441f48e25459c10c93eada2e' (2024-07-29)
  → 'github:nixos/nixpkgs/6e99f2a27d600612004fbd2c3282d614bfee6421' (2024-08-30)
• Updated input 'nixpkgsMaster':
    'github:NixOS/nixpkgs/d156aabee9a3ab78451fadd6a1b51be2d7304fdb' (2024-07-31)
  → 'github:NixOS/nixpkgs/1f34eeb6720f5d8cf6b661ce44703a3aa08a973b' (2024-09-02)
• Updated input 'nur':
    'github:nix-community/NUR/9ba05057d90d2c8fda1f40685871c0d8dbf81402' (2024-07-31)
  → 'github:nix-community/NUR/fbbda4f8411d98ed64cab20b3e4e9acb4e33b0f9' (2024-09-02)
• Updated input 'poetry2nix':
    'github:nix-community/poetry2nix/1dcd9fdca06bf28bdd6eeab0a464f4bc5d643bca' (2024-07-30)
  → 'github:nix-community/poetry2nix/0d3fad5740d892487805cd2d60d8e4ed828486e9' (2024-09-02)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/eb34eb588132d653e4c4925d862f1e5a227cc2ab' (2024-07-27)
  → 'github:Mic92/sops-nix/5db5921e40ae382d6716dce591ea23b0a39d96f7' (2024-09-01)
 2024-09-02 22:26:24 +02:00
Jakob Lechner
d8a8b19d4b Update unifi controller to version 8 2024-08-08 16:53:02 +02:00
Jakob Lechner
d8cd3fb201 flake.lock: Update 
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/bad376945de7033c7adc424c02054ea3736cf7c4' (2024-07-15)
  → 'github:nix-community/disko/1e6f8a7b4634fc051cc9361959bf414fcf17e094' (2024-07-29)
• Updated input 'gomod2nix':
    'github:nix-community/gomod2nix/31b6d2e40b36456e792cd6cf50d5a8ddd2fa59a1' (2024-05-30)
  → 'github:nix-community/gomod2nix/7b8ef0d5fdc09b3a7acb27f1e6c168888947f364' (2024-07-25)
• Updated input 'nixos-hardware':
    'github:nixos/nixos-hardware/c5013aa7ce2c7ec90acee5d965d950c8348db751' (2024-07-11)
  → 'github:nixos/nixos-hardware/14c333162ba53c02853add87a0000cbd7aa230c2' (2024-07-30)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/53e81e790209e41f0c1efa9ff26ff2fd7ab35e27' (2024-07-14)
  → 'github:nixos/nixpkgs/12bf09802d77264e441f48e25459c10c93eada2e' (2024-07-29)
• Updated input 'nixpkgsMaster':
    'github:NixOS/nixpkgs/3f7fcbb2f91ec01dfb2574567d668494a56304e7' (2024-07-17)
  → 'github:NixOS/nixpkgs/d156aabee9a3ab78451fadd6a1b51be2d7304fdb' (2024-07-31)
• Updated input 'nur':
    'github:nix-community/NUR/f33f46c1e38b07b20a978ac39208058ab9ddedb1' (2024-07-17)
  → 'github:nix-community/NUR/9ba05057d90d2c8fda1f40685871c0d8dbf81402' (2024-07-31)
• Updated input 'poetry2nix':
    'github:nix-community/poetry2nix/d11c01e58587e5f21037ed6477465a7f26a32e27' (2024-07-15)
  → 'github:nix-community/poetry2nix/1dcd9fdca06bf28bdd6eeab0a464f4bc5d643bca' (2024-07-30)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/0703ba03fd9c1665f8ab68cc3487302475164617' (2024-07-14)
  → 'github:Mic92/sops-nix/eb34eb588132d653e4c4925d862f1e5a227cc2ab' (2024-07-27)
• Updated input 'sops-nix/nixpkgs-stable':
    'github:NixOS/nixpkgs/74348da2f3a312ee25cea09b98cdba4cb9fa5d5d' (2024-07-14)
  → 'github:NixOS/nixpkgs/556533a23879fc7e5f98dd2e0b31a6911a213171' (2024-07-21)
 2024-08-01 00:40:21 +02:00
4 changed files with 36 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

60
flake.lock generated
View file

@ -28,11 +28,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721007199, "lastModified": 1725242307,
"narHash": "sha256-Gof4Lj1rgTrX59bNu5b/uS/3X/marUGM7LYw31NoXEA=", "narHash": "sha256-a2iTMBngegEZvaNAzzxq5Gc5Vp3UWoGUqWtK11Txbic=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "bad376945de7033c7adc424c02054ea3736cf7c4", "rev": "96073e6423623d4a8027e9739d2af86d6422ea7a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -183,11 +183,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717050755, "lastModified": 1722589758,
"narHash": "sha256-C9IEHABulv2zEDFA+Bf0E1nmfN4y6MIUe5eM2RCrDC0=", "narHash": "sha256-sbbA8b6Q2vB/t/r1znHawoXLysCyD4L/6n6/RykiSnA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "gomod2nix", "repo": "gomod2nix",
"rev": "31b6d2e40b36456e792cd6cf50d5a8ddd2fa59a1", "rev": "4e08ca09253ef996bd4c03afa383b23e35fe28a1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -298,11 +298,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1721042469, "lastModified": 1724857454,
"narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -314,11 +314,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1720737798, "lastModified": 1724878143,
"narHash": "sha256-G/OtEAts7ZUvW5lrGMXSb8HqRp2Jr9I7reBuvCOL54w=", "narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "c5013aa7ce2c7ec90acee5d965d950c8348db751", "rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -330,11 +330,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1720954236, "lastModified": 1725001927,
"narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=", "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27", "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -378,11 +378,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1720915306, "lastModified": 1721524707,
"narHash": "sha256-6vuViC56+KSr+945bCV8akHK+7J5k6n/epYg/W3I5eQ=", "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "74348da2f3a312ee25cea09b98cdba4cb9fa5d5d", "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -394,11 +394,11 @@
}, },
"nixpkgsMaster": { "nixpkgsMaster": {
"locked": { "locked": {
"lastModified": 1721241996, "lastModified": 1725308466,
"narHash": "sha256-4An0f26vnpKA9vm1FG0XtOxDaPHiTrziTekwaX3J3jE=", "narHash": "sha256-oK/LjzZHZRRdcs86jPS8unc+lbrr2GiDcfHnn0gd7KA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3f7fcbb2f91ec01dfb2574567d668494a56304e7", "rev": "1f34eeb6720f5d8cf6b661ce44703a3aa08a973b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -410,11 +410,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1721241063, "lastModified": 1725306339,
"narHash": "sha256-jBAuwmtJmSNT6xwjtGINslFK0m3R3+Ydw+xrd+a3tSE=", "narHash": "sha256-fucZHdKy2AsujebYk6Yx1KlMgDe11uNrKOxOB+qaPCA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "f33f46c1e38b07b20a978ac39208058ab9ddedb1", "rev": "fbbda4f8411d98ed64cab20b3e4e9acb4e33b0f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -436,11 +436,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1721039874, "lastModified": 1725253878,
"narHash": "sha256-XANsG9GYHip8pxZpbqKf/YGv8tIa0xTh289Y+WNBNfw=", "narHash": "sha256-HwXut4WbOUAjmybhui2eNSE6+Wb0nigYgDzBBOZaPG4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "poetry2nix", "repo": "poetry2nix",
"rev": "d11c01e58587e5f21037ed6477465a7f26a32e27", "rev": "0d3fad5740d892487805cd2d60d8e4ed828486e9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -526,11 +526,11 @@
"nixpkgs-stable": "nixpkgs-stable_3" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1720926522, "lastModified": 1725201042,
"narHash": "sha256-eTpnrT6yu1vp8C0B5fxHXhgKxHoYMoYTEikQx///jxY=", "narHash": "sha256-lj5pxOwidP0W//E7IvyhbhXrnEUW99I07+QpERnzTS4=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "0703ba03fd9c1665f8ab68cc3487302475164617", "rev": "5db5921e40ae382d6716dce591ea23b0a39d96f7",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
hosts/aluminium/services/unifi-controller.nix
View file

@ -6,7 +6,7 @@ in
{ {
services.unifi = { services.unifi = {
enable = true; enable = true;
unifiPackage = pkgs.unifi; unifiPackage = pkgs.unifi8;
}; };
networking.firewall.interfaces.lechner.allowedTCPPorts = [ networking.firewall.interfaces.lechner.allowedTCPPorts = [
ports.unifi.tcp ports.unifi.tcp

3
hosts/iron/ports.nix
View file

@ -18,6 +18,7 @@ custom-utils.validatePortAttrset {
qbittorrent-webui.tcp = 8099; qbittorrent-webui.tcp = 8099;
radicale.tcp = 5232; radicale.tcp = 5232;
rmfakecloud.tcp = 3000; rmfakecloud.tcp = 3000;
unifi.tcp = 8443; unifi-http.tcp = 8080;
unifi-https.tcp = 8443;
wireguard-public-ip-tunnel.udp = 51000; wireguard-public-ip-tunnel.udp = 51000;
} }

5
hosts/iron/services/unifi-controller.nix
View file

@ -6,9 +6,10 @@ in
{ {
services.unifi = { services.unifi = {
enable = true; enable = true;
unifiPackage = pkgs.unifi; unifiPackage = pkgs.unifi8;
}; };
networking.firewall.interfaces.enp2s4.allowedTCPPorts = [ networking.firewall.interfaces.enp2s4.allowedTCPPorts = [
ports.unifi.tcp ports.unifi-http.tcp
ports.unifi-https.tcp
]; ];
} }