diff --git a/common/constants.nix b/common/constants.nix index f762a41..47072c3 100644 --- a/common/constants.nix +++ b/common/constants.nix @@ -41,6 +41,9 @@ with lib; { https = 443; jellyfin = 8096; jellyseerr = 52660; + prowlarr = 30784; + radarr = 37196; + sonarr = 32438; vault = 25487; }; description = '' diff --git a/flake.lock b/flake.lock index 5cd822c..ef14dde 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1747742835, - "narHash": "sha256-kYL4GCwwznsypvsnA20oyvW8zB/Dvn6K5G/tgMjVMT4=", + "lastModified": 1748225455, + "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=", "owner": "nix-community", "repo": "disko", - "rev": "df522e787fdffc4f32ed3e1fca9ed0968a384d62", + "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba", "type": "github" }, "original": { @@ -207,11 +207,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1748119343, - "narHash": "sha256-/3J/o+qZrn3IJdbi+jde+W0jHA/OAeqa3hH6VA53DWA=", + "lastModified": 1748391243, + "narHash": "sha256-7sCuihzsTRZemtbTXaFUoGJUfuQErhKEcL9v7HKIo1k=", "owner": "nix-community", "repo": "home-manager", - "rev": "8fc1e46ab6d5daac4563c2a3684d68cc0106f458", + "rev": "f5b12be834874f7661db4ced969a621ab2d57971", "type": "github" }, "original": { @@ -247,11 +247,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1747990026, - "narHash": "sha256-sG5VbID+x5+xUC+jjgHibnzg8IllVcH+K2TLmYHLPME=", + "lastModified": 1748411314, + "narHash": "sha256-fvtRp+oHGDLiSQico9+LTAr6Z8CU1AIldLYLQ9mHqjo=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "e2f4ced874406541a7957f7e2b8f05a0d59a0f00", + "rev": "9d69aed9023082af370b71bffdfcd414b6b61593", "type": "github" }, "original": { @@ -333,11 +333,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747467164, - "narHash": "sha256-JBXbjJ0t6T6BbVc9iPVquQI9XSXCGQJD8c8SgnUquus=", + "lastModified": 1748186667, + "narHash": "sha256-UQubDNIQ/Z42R8tPCIpY+BOhlxO8t8ZojwC9o2FW3c8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3fcbdcfc707e0aa42c541b7743e05820472bdaec", + "rev": "bdac72d387dca7f836f6ef1fe547755fb0e9df61", "type": "github" }, "original": { @@ -365,11 +365,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1747744144, - "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", + "lastModified": 1748026106, + "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", "type": "github" }, "original": { @@ -429,11 +429,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1748026106, - "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "type": "github" }, "original": { @@ -497,11 +497,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1742765550, - "narHash": "sha256-2vVIh2JrL6GAGfgCeY9e6iNKrBjs0Hw3bGQEAbwVs68=", + "lastModified": 1748196248, + "narHash": "sha256-1iHjsH6/5UOerJEoZKE+Gx1BgAoge/YcnUsOA4wQ/BU=", "owner": "pjones", "repo": "plasma-manager", - "rev": "b70be387276e632fe51232887f9e04e2b6ef8c16", + "rev": "b7697abe89967839b273a863a3805345ea54ab56", "type": "github" }, "original": { diff --git a/linux/comet/configuration.nix b/linux/comet/configuration.nix deleted file mode 100644 index bcc9b94..0000000 --- a/linux/comet/configuration.nix +++ /dev/null @@ -1,30 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). -{...}: { - # Configure boot loader - boot.loader = { - efi.canTouchEfiVariables = true; - systemd-boot.enable = true; - }; - - # Change secrets file - constants.sopsFile = ../../common/auths.yaml; - - # Disable sudo password - security.sudo.wheelNeedsPassword = false; - - # Set time zone. - time.timeZone = "Asia/Shanghai"; - - # Enable zram - zramSwap.enable = true; - - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "24.05"; # Did you read the comment? -} diff --git a/linux/comet/default.nix b/linux/comet/default.nix deleted file mode 100644 index a079293..0000000 --- a/linux/comet/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{inputs, ...}: { - imports = with inputs; [ - hardware.nixosModules.common-cpu-intel - ../../common - ./configuration.nix - ./hardware-configuration.nix - ./network.nix - ./tailscale.nix - ]; -} diff --git a/linux/comet/hardware-configuration.nix b/linux/comet/hardware-configuration.nix deleted file mode 100644 index fc8b01c..0000000 --- a/linux/comet/hardware-configuration.nix +++ /dev/null @@ -1,41 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ - config, - lib, - pkgs, - modulesPath, - ... -}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "usbhid" "uas" "sd_mod" "sdhci_acpi"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-intel"]; - boot.extraModulePackages = []; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/9f65c4b3-1c87-42a0-8c1d-f3c1ff2e71b1"; - fsType = "ext4"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/1C5A-E5B5"; - fsType = "vfat"; - }; - - swapDevices = []; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/linux/comet/network.nix b/linux/comet/network.nix deleted file mode 100644 index d13efdc..0000000 --- a/linux/comet/network.nix +++ /dev/null @@ -1,7 +0,0 @@ -{...}: { - networking = { - hostId = "3ddd2ad2"; - nftables.enable = true; - }; - services.openssh.enable = true; -} diff --git a/linux/comet/tailscale.nix b/linux/comet/tailscale.nix deleted file mode 100644 index add5c79..0000000 --- a/linux/comet/tailscale.nix +++ /dev/null @@ -1,7 +0,0 @@ -{...}: { - services.tailscale = { - enable = true; - port = 12765; - useRoutingFeatures = "both"; - }; -} diff --git a/linux/nebula/jellyfin.nix b/linux/nebula/jellyfin.nix index ec04780..8b02c80 100644 --- a/linux/nebula/jellyfin.nix +++ b/linux/nebula/jellyfin.nix @@ -21,14 +21,19 @@ with config.constants; { enable = true; port = port.jellyseerr; }; - prowlarr.enable = true; + prowlarr = { + enable = true; + settings.server.port = port.prowlarr; + }; radarr = { enable = true; user = userName; + settings.server.port = port.radarr; }; sonarr = { enable = true; user = userName; + settings.server.port = port.sonarr; }; };