From c1d83736eb28ac6122126241e732bebfb7bc9c70 Mon Sep 17 00:00:00 2001 From: finn Date: Mon, 16 Oct 2023 22:04:58 +0200 Subject: [PATCH 01/25] Feature: Enable ssh --- machines/jupiter/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/machines/jupiter/configuration.nix b/machines/jupiter/configuration.nix index 957cb95..3491fa6 100644 --- a/machines/jupiter/configuration.nix +++ b/machines/jupiter/configuration.nix @@ -24,6 +24,8 @@ services.xserver.enable = true; services.xserver.displayManager.sddm.enable = true; + services.openssh.enable = true; + # Configure keymap in X11 services.xserver = { layout = "de"; From 5e40f81c992d6ee451e2f47c9e83739d61c0a43c Mon Sep 17 00:00:00 2001 From: marthsincemelee Date: Mon, 16 Oct 2023 22:20:02 +0200 Subject: [PATCH 02/25] Feature: Prowlarr module --- machines/jupiter/environments.nix | 1 + modules/environments/default.nix | 1 + modules/environments/prowlarr/default.nix | 32 +++++++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 modules/environments/prowlarr/default.nix diff --git a/machines/jupiter/environments.nix b/machines/jupiter/environments.nix index 2553d86..08f0561 100644 --- a/machines/jupiter/environments.nix +++ b/machines/jupiter/environments.nix @@ -12,6 +12,7 @@ in dev_apps = true; gnome_apps = true; }; + prowlarr.enable = true; }; my.hardware = { diff --git a/modules/environments/default.nix b/modules/environments/default.nix index 1854d0c..c287e65 100644 --- a/modules/environments/default.nix +++ b/modules/environments/default.nix @@ -4,5 +4,6 @@ ./apps ./hyprland ./zsh + ./prowlarr ]; } \ No newline at end of file diff --git a/modules/environments/prowlarr/default.nix b/modules/environments/prowlarr/default.nix new file mode 100644 index 0000000..179fc77 --- /dev/null +++ b/modules/environments/prowlarr/default.nix @@ -0,0 +1,32 @@ +# manages indexes +{ config, lib, pkgs, ... }: +let + cfg = config.my.profiles.prowlarr; + # domain = config.networking.domain; + # port = 9696; +in +{ + options.my.profiles.prowlarr = with lib; { + enable = mkEnableOption "Prowlarr for indexing"; + }; + + config = lib.mkIf cfg.enable { + services.prowlarr = { + enable = true; + }; + # # ugly fix for service not having a homedirectory + # users.users.prowlarr = { + # isSystemUser = true; + # home = "/var/lib/prowlarr"; + # group = "prowlarr"; + # uid = 61654; + # }; + # users.groups.prowlarr = { + # gid = 61654; + # }; + + systemd.services.prowlarr = { + after = [ "network-online.target" ]; + }; + }; +} \ No newline at end of file From dac0e346e7e6d5457932beb91b859ceeb08a3248 Mon Sep 17 00:00:00 2001 From: marthsincemelee Date: Mon, 16 Oct 2023 22:33:02 +0200 Subject: [PATCH 03/25] Feature: radrarr module --- machines/jupiter/environments.nix | 2 +- modules/environments/default.nix | 1 + modules/environments/radarr/default.nix | 25 +++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 modules/environments/radarr/default.nix diff --git a/machines/jupiter/environments.nix b/machines/jupiter/environments.nix index 08f0561..06be881 100644 --- a/machines/jupiter/environments.nix +++ b/machines/jupiter/environments.nix @@ -12,7 +12,7 @@ in dev_apps = true; gnome_apps = true; }; - prowlarr.enable = true; + radarr.enable = true; }; my.hardware = { diff --git a/modules/environments/default.nix b/modules/environments/default.nix index c287e65..f01f5d9 100644 --- a/modules/environments/default.nix +++ b/modules/environments/default.nix @@ -5,5 +5,6 @@ ./hyprland ./zsh ./prowlarr + ./radarr ]; } \ No newline at end of file diff --git a/modules/environments/radarr/default.nix b/modules/environments/radarr/default.nix new file mode 100644 index 0000000..5dfc2ca --- /dev/null +++ b/modules/environments/radarr/default.nix @@ -0,0 +1,25 @@ +# manages and downloads films +{ config, lib, pkgs, ... }: +let + cfg = config.my.profiles.radarr; + # domain = config.networking.domain; + # port = 7878; +in +{ + options.my.profiles.radarr = with lib; { + enable = mkEnableOption "Sonarr for films management"; + + }; + + config = lib.mkIf cfg.enable { + services.radarr = { + enable = true; + }; + + my.profiles.prowlarr.enable = true; + + systemd.services.radarr = { + after = [ "network-online.target" ]; + }; + }; +} \ No newline at end of file From 6ba6b3dca67a568810c53dd674ce9bb504278fed Mon Sep 17 00:00:00 2001 From: marthsincemelee Date: Mon, 16 Oct 2023 22:36:37 +0200 Subject: [PATCH 04/25] Fix: Firewallrules for arr suite --- modules/environments/prowlarr/default.nix | 1 + modules/environments/radarr/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/environments/prowlarr/default.nix b/modules/environments/prowlarr/default.nix index 179fc77..d53b78c 100644 --- a/modules/environments/prowlarr/default.nix +++ b/modules/environments/prowlarr/default.nix @@ -13,6 +13,7 @@ in config = lib.mkIf cfg.enable { services.prowlarr = { enable = true; + openFirewall = true; }; # # ugly fix for service not having a homedirectory # users.users.prowlarr = { diff --git a/modules/environments/radarr/default.nix b/modules/environments/radarr/default.nix index 5dfc2ca..7a4f96a 100644 --- a/modules/environments/radarr/default.nix +++ b/modules/environments/radarr/default.nix @@ -14,6 +14,7 @@ in config = lib.mkIf cfg.enable { services.radarr = { enable = true; + openFirewall = true; }; my.profiles.prowlarr.enable = true; From 70076accf1cccbaa780d6c3ad33de74a8508bb6f Mon Sep 17 00:00:00 2001 From: marthsincemelee Date: Mon, 30 Oct 2023 21:53:18 +0100 Subject: [PATCH 05/25] Feature: Docker Module --- machines/jupiter/environments.nix | 1 + modules/environments/default.nix | 1 + modules/environments/docker/default.nix | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 modules/environments/docker/default.nix diff --git a/machines/jupiter/environments.nix b/machines/jupiter/environments.nix index 06be881..8fd659e 100644 --- a/machines/jupiter/environments.nix +++ b/machines/jupiter/environments.nix @@ -13,6 +13,7 @@ in gnome_apps = true; }; radarr.enable = true; + docker.enable = true; }; my.hardware = { diff --git a/modules/environments/default.nix b/modules/environments/default.nix index f01f5d9..4903735 100644 --- a/modules/environments/default.nix +++ b/modules/environments/default.nix @@ -6,5 +6,6 @@ ./zsh ./prowlarr ./radarr + ./docker ]; } \ No newline at end of file diff --git a/modules/environments/docker/default.nix b/modules/environments/docker/default.nix new file mode 100644 index 0000000..b3cd871 --- /dev/null +++ b/modules/environments/docker/default.nix @@ -0,0 +1,22 @@ +# Docker related settings +{ config, inputs, lib, options, pkgs, ... }: +let + cfg = config.my.profiles.docker; +in +{ + options.my.profiles.docker = with lib; { + enable = mkEnableOption "docker configuration"; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = with pkgs; [ + docker + docker-compose + ]; + + virtualisation.docker = { + enable = true; + autoPrune.enable = true; + }; + }; +} \ No newline at end of file From ef7fe9abc2c4ea8db903f9fc5ebabb37dbb964ab Mon Sep 17 00:00:00 2001 From: marthsincemelee Date: Wed, 1 Nov 2023 11:06:16 +0100 Subject: [PATCH 06/25] Feature: Added Jellyfin + Readarr Service --- machines/jupiter/environments.nix | 2 ++ modules/environments/default.nix | 2 ++ modules/environments/jellyfin/default.nix | 23 ++++++++++++++++++++ modules/environments/readarr/default.nix | 26 +++++++++++++++++++++++ 4 files changed, 53 insertions(+) create mode 100644 modules/environments/jellyfin/default.nix create mode 100644 modules/environments/readarr/default.nix diff --git a/machines/jupiter/environments.nix b/machines/jupiter/environments.nix index 8fd659e..9d29cc9 100644 --- a/machines/jupiter/environments.nix +++ b/machines/jupiter/environments.nix @@ -14,6 +14,8 @@ in }; radarr.enable = true; docker.enable = true; + readarr.enable = true; + jellyfin.enable = true; }; my.hardware = { diff --git a/modules/environments/default.nix b/modules/environments/default.nix index 4903735..d432fe8 100644 --- a/modules/environments/default.nix +++ b/modules/environments/default.nix @@ -7,5 +7,7 @@ ./prowlarr ./radarr ./docker + ./readarr + ./jellyfin ]; } \ No newline at end of file diff --git a/modules/environments/jellyfin/default.nix b/modules/environments/jellyfin/default.nix new file mode 100644 index 0000000..7a63ae8 --- /dev/null +++ b/modules/environments/jellyfin/default.nix @@ -0,0 +1,23 @@ +# manages and downloads films +{ config, lib, pkgs, ... }: +let + cfg = config.my.profiles.jellyfin; +in +{ + options.my.profiles.jellyfin = with lib; { + enable = mkEnableOption "Media Service"; + + }; + + config = lib.mkIf cfg.enable { + services.jellyfin = { + enable = true; + openFirewall = true; + }; + + + systemd.services.jellyfin = { + after = [ "network-online.target" ]; + }; + }; +} \ No newline at end of file diff --git a/modules/environments/readarr/default.nix b/modules/environments/readarr/default.nix new file mode 100644 index 0000000..82ca277 --- /dev/null +++ b/modules/environments/readarr/default.nix @@ -0,0 +1,26 @@ +# manages and downloads films +{ config, lib, pkgs, ... }: +let + cfg = config.my.profiles.readarr; + # domain = config.networking.domain; + # port = 7878; +in +{ + options.my.profiles.readarr = with lib; { + enable = mkEnableOption "Readarr for ebook management"; + + }; + + config = lib.mkIf cfg.enable { + services.readarr = { + enable = true; + openFirewall = true; + }; + + my.profiles.prowlarr.enable = true; + + systemd.services.readarr = { + after = [ "network-online.target" ]; + }; + }; +} \ No newline at end of file From 5af5a1e30056ac1d0910f640a146eabb7c609ce5 Mon Sep 17 00:00:00 2001 From: Finn Date: Sat, 4 Nov 2023 10:17:48 +0100 Subject: [PATCH 07/25] Update User for Radarr Service --- modules/environments/radarr/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/environments/radarr/default.nix b/modules/environments/radarr/default.nix index 7a4f96a..1df3b33 100644 --- a/modules/environments/radarr/default.nix +++ b/modules/environments/radarr/default.nix @@ -15,6 +15,7 @@ in services.radarr = { enable = true; openFirewall = true; + user = "finn"; }; my.profiles.prowlarr.enable = true; From c1ee956e02455e7437caefe64ca769c4aa077f9f Mon Sep 17 00:00:00 2001 From: Finn Date: Sat, 4 Nov 2023 10:33:54 +0100 Subject: [PATCH 08/25] Removed User from Radarr setup --- modules/environments/radarr/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/environments/radarr/default.nix b/modules/environments/radarr/default.nix index 1df3b33..7a4f96a 100644 --- a/modules/environments/radarr/default.nix +++ b/modules/environments/radarr/default.nix @@ -15,7 +15,6 @@ in services.radarr = { enable = true; openFirewall = true; - user = "finn"; }; my.profiles.prowlarr.enable = true; From c6763f4976a8d81f73b1708f59256ff9855e2e5c Mon Sep 17 00:00:00 2001 From: marthsincemelee Date: Mon, 20 Nov 2023 16:49:41 +0100 Subject: [PATCH 09/25] Feature: Sonarr Service --- machines/jupiter/environments.nix | 1 + modules/environments/sonarr/default.nix | 26 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 modules/environments/sonarr/default.nix diff --git a/machines/jupiter/environments.nix b/machines/jupiter/environments.nix index 9d29cc9..3817527 100644 --- a/machines/jupiter/environments.nix +++ b/machines/jupiter/environments.nix @@ -15,6 +15,7 @@ in radarr.enable = true; docker.enable = true; readarr.enable = true; + sonarr.enable = true; jellyfin.enable = true; }; diff --git a/modules/environments/sonarr/default.nix b/modules/environments/sonarr/default.nix new file mode 100644 index 0000000..8f1dd9c --- /dev/null +++ b/modules/environments/sonarr/default.nix @@ -0,0 +1,26 @@ +# manages and downloads films +{ config, lib, pkgs, ... }: +let + cfg = config.my.profiles.sonarr; + # domain = config.networking.domain; + port = 8989; +in +{ + options.my.profiles.sonarr = with lib; { + enable = mkEnableOption "sonarr for series management"; + + }; + + config = lib.mkIf cfg.enable { + services.sonarr = { + enable = true; + openFirewall = true; + }; + + my.profiles.prowlarr.enable = true; + + systemd.services.sonarr = { + after = [ "network-online.target" ]; + }; + }; +} \ No newline at end of file From 1da5a581f17e716fbff34c58ce11502817c3d76d Mon Sep 17 00:00:00 2001 From: marthsincemelee Date: Mon, 20 Nov 2023 16:52:50 +0100 Subject: [PATCH 10/25] Feature: idea config --- .idea/misc.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 639900d..6e86672 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ - From 246927fc113de71f8193a37adc96591f694c434c Mon Sep 17 00:00:00 2001 From: marthsincemelee Date: Mon, 20 Nov 2023 16:57:01 +0100 Subject: [PATCH 11/25] Bug: Import statements for Sonarr Service --- modules/environments/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/environments/default.nix b/modules/environments/default.nix index d432fe8..837794d 100644 --- a/modules/environments/default.nix +++ b/modules/environments/default.nix @@ -8,6 +8,7 @@ ./radarr ./docker ./readarr + ./sonarr ./jellyfin ]; } \ No newline at end of file From 5ab19e678c90e33fc862620ff72d3595e629165f Mon Sep 17 00:00:00 2001 From: Finn Date: Wed, 22 Nov 2023 19:12:58 +0100 Subject: [PATCH 12/25] Feature: Jellyseerr Service --- machines/jupiter/environments.nix | 1 + modules/environments/default.nix | 1 + modules/environments/jellyseerr/default.nix | 23 +++++++++++++++++++++ 3 files changed, 25 insertions(+) create mode 100644 modules/environments/jellyseerr/default.nix diff --git a/machines/jupiter/environments.nix b/machines/jupiter/environments.nix index 3817527..7e1a50a 100644 --- a/machines/jupiter/environments.nix +++ b/machines/jupiter/environments.nix @@ -17,6 +17,7 @@ in readarr.enable = true; sonarr.enable = true; jellyfin.enable = true; + jellyseerr.enable = true; }; my.hardware = { diff --git a/modules/environments/default.nix b/modules/environments/default.nix index 837794d..7e1e2fc 100644 --- a/modules/environments/default.nix +++ b/modules/environments/default.nix @@ -10,5 +10,6 @@ ./readarr ./sonarr ./jellyfin + ./jellyseerr ]; } \ No newline at end of file diff --git a/modules/environments/jellyseerr/default.nix b/modules/environments/jellyseerr/default.nix new file mode 100644 index 0000000..659874e --- /dev/null +++ b/modules/environments/jellyseerr/default.nix @@ -0,0 +1,23 @@ + +# manages and downloads films +{ config, lib, ... }: +let + cfg = config.my.profiles.jellyseerr; + inherit (config.networking) domain; +in +{ + options.my.profiles.jellyseerr = with lib; { + enable = mkEnableOption "JellySeerr Media Service"; + }; + + config = lib.mkIf cfg.enable { + services.jellyseerr = { + enable = true; + openFirewall = true; + }; + + systemd.services.jellyseerr = { + after = [ "network-online.target" ]; + }; + }; +} \ No newline at end of file From 2c1b19052ee3ce04aa4676f4ed0b764d9d15457b Mon Sep 17 00:00:00 2001 From: Finn Date: Fri, 24 Nov 2023 20:01:31 +0100 Subject: [PATCH 13/25] Feature: Hardware acceleration --- machines/jupiter/hardware-configuration.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/machines/jupiter/hardware-configuration.nix b/machines/jupiter/hardware-configuration.nix index 6d6c886..903b09f 100644 --- a/machines/jupiter/hardware-configuration.nix +++ b/machines/jupiter/hardware-configuration.nix @@ -12,6 +12,22 @@ boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; + #boot.kernelParams = [ "i915.force_probe=9a49" ]; + # 9a49 + + nixpkgs.config.packageOverrides = pkgs: { + vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; + }; + hardware.opengl = { + enable = true; + extraPackages = with pkgs; [ + intel-media-driver # LIBVA_DRIVER_NAME=iHD + #vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) + vaapiVdpau + libvdpau-va-gl + ]; + }; + fileSystems."/" = { device = "/dev/disk/by-uuid/c95c64ad-f131-4bde-9bca-a7a3692173da"; From d7d23b1dd74607afcaf67577ab85be0fc47ff59d Mon Sep 17 00:00:00 2001 From: Finn Date: Fri, 24 Nov 2023 20:29:06 +0100 Subject: [PATCH 14/25] Config: Disable Desktop Apps --- machines/jupiter/environments.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/machines/jupiter/environments.nix b/machines/jupiter/environments.nix index 7e1a50a..0ee7ee8 100644 --- a/machines/jupiter/environments.nix +++ b/machines/jupiter/environments.nix @@ -5,12 +5,12 @@ let in { my.profiles = { - hyprland.enable = true; + hyprland.enable = false; zsh.enable = true; apps = { - desktop_apps = true; + desktop_apps = false; dev_apps = true; - gnome_apps = true; + gnome_apps = false; }; radarr.enable = true; docker.enable = true; From 29b51380f144c71c175df009e9fa40e3d167f0ce Mon Sep 17 00:00:00 2001 From: marthsincemelee Date: Wed, 17 Jan 2024 08:59:45 +0100 Subject: [PATCH 15/25] Feature: QNAP NAS --- machines/jupiter/disks.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/machines/jupiter/disks.nix b/machines/jupiter/disks.nix index 1c70e5e..7f04f13 100644 --- a/machines/jupiter/disks.nix +++ b/machines/jupiter/disks.nix @@ -12,4 +12,12 @@ { device = "/dev/disk/by-uuid/0D77-17BB"; fsType = "vfat"; }; + + fileSystems."/home/finn/nfs" = + { device = "server:/tomoyo"; + fsType = "nfs"; + options = [ "x-systemd.automount" "noauto" ]; + }; + + } From 7019c9476c9e4417bd808d2508d927e13d8e6202 Mon Sep 17 00:00:00 2001 From: marthsincemelee Date: Wed, 17 Jan 2024 10:59:41 +0100 Subject: [PATCH 16/25] Feature: QNAP NAS --- machines/jupiter/disks.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machines/jupiter/disks.nix b/machines/jupiter/disks.nix index 7f04f13..397f7c9 100644 --- a/machines/jupiter/disks.nix +++ b/machines/jupiter/disks.nix @@ -14,7 +14,7 @@ }; fileSystems."/home/finn/nfs" = - { device = "server:/tomoyo"; + { device = "voyager:/data1"; fsType = "nfs"; options = [ "x-systemd.automount" "noauto" ]; }; From b73f1f49a20b5361c27090030be1f3e4fa566cd8 Mon Sep 17 00:00:00 2001 From: marthsincemelee Date: Wed, 17 Jan 2024 11:22:33 +0100 Subject: [PATCH 17/25] Feature: QNAP NAS --- machines/jupiter/disks.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machines/jupiter/disks.nix b/machines/jupiter/disks.nix index 397f7c9..f8346e5 100644 --- a/machines/jupiter/disks.nix +++ b/machines/jupiter/disks.nix @@ -14,7 +14,7 @@ }; fileSystems."/home/finn/nfs" = - { device = "voyager:/data1"; + { device = "voyager:/"; fsType = "nfs"; options = [ "x-systemd.automount" "noauto" ]; }; From 9fb7e973666f04054437f3d7da54472749402cfb Mon Sep 17 00:00:00 2001 From: marthsincemelee Date: Wed, 17 Jan 2024 11:38:17 +0100 Subject: [PATCH 18/25] Feature: QNAP NAS --- machines/jupiter/disks.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machines/jupiter/disks.nix b/machines/jupiter/disks.nix index f8346e5..71af3e2 100644 --- a/machines/jupiter/disks.nix +++ b/machines/jupiter/disks.nix @@ -13,7 +13,7 @@ fsType = "vfat"; }; - fileSystems."/home/finn/nfs" = + fileSystems."/data" = { device = "voyager:/"; fsType = "nfs"; options = [ "x-systemd.automount" "noauto" ]; From 5b2d8ce8b67e3f9cbb9824e81c68b094160439e4 Mon Sep 17 00:00:00 2001 From: marthsincemelee Date: Wed, 17 Jan 2024 11:41:52 +0100 Subject: [PATCH 19/25] Feature: QNAP NAS --- machines/jupiter/disks.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machines/jupiter/disks.nix b/machines/jupiter/disks.nix index 71af3e2..3dfde9b 100644 --- a/machines/jupiter/disks.nix +++ b/machines/jupiter/disks.nix @@ -13,7 +13,7 @@ fsType = "vfat"; }; - fileSystems."/data" = + fileSystems."/data/nfs" = { device = "voyager:/"; fsType = "nfs"; options = [ "x-systemd.automount" "noauto" ]; From 3174128babe5b3987e2c2f37657ecbf12567e139 Mon Sep 17 00:00:00 2001 From: marthsincemelee Date: Sat, 20 Jan 2024 10:03:13 +0100 Subject: [PATCH 20/25] Feature: Paperless Module --- modules/environments/default.nix | 1 + modules/environments/paperless/default.nix | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 modules/environments/paperless/default.nix diff --git a/modules/environments/default.nix b/modules/environments/default.nix index 7e1e2fc..1a6c3c2 100644 --- a/modules/environments/default.nix +++ b/modules/environments/default.nix @@ -4,6 +4,7 @@ ./apps ./hyprland ./zsh + ./paperless ./prowlarr ./radarr ./docker diff --git a/modules/environments/paperless/default.nix b/modules/environments/paperless/default.nix new file mode 100644 index 0000000..91e9df7 --- /dev/null +++ b/modules/environments/paperless/default.nix @@ -0,0 +1,17 @@ +# document management system +{ config, lib, ... }: +let + cfg = config.my.profiles.paperless; +in +{ + options.my.profiles.paperless = with lib; { + enable = mkEnableOption "Paperless Server"; + + port = mkOption { + type = types.port; + default = 28981; + example = 8081; + description = "Internal port for webui"; + }; + }; +} \ No newline at end of file From 5aae4ebf13e46d959fd5bf2d10183049a4a83ec9 Mon Sep 17 00:00:00 2001 From: marthsincemelee Date: Fri, 13 Oct 2023 22:45:35 +0200 Subject: [PATCH 21/25] Feature: New Jupiter Server machine --- machines/jupiter-server/configuration.nix | 29 +++++++++++++++++++++++ machines/jupiter-server/disks.nix | 15 ++++++++++++ machines/jupiter-server/environments.nix | 20 ++++++++++++++++ 3 files changed, 64 insertions(+) create mode 100644 machines/jupiter-server/configuration.nix create mode 100644 machines/jupiter-server/disks.nix create mode 100644 machines/jupiter-server/environments.nix diff --git a/machines/jupiter-server/configuration.nix b/machines/jupiter-server/configuration.nix new file mode 100644 index 0000000..05c852a --- /dev/null +++ b/machines/jupiter-server/configuration.nix @@ -0,0 +1,29 @@ +{ config, pkgs, lib, ... }: +{ + imports = [ + + ./disks.nix + ./hardware-configuration.nix + ./environments.nix + ]; + + networking.hostName = "jupiter-server"; + + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + boot.kernelPackages = pkgs.unstable.linuxPackages_latest; + + # Configure keymap in X11 + services.xserver = { + layout = "de"; + xkbVariant = ""; + }; + + # Configure console keymap + console.keyMap = "de"; + + system = { + stateVersion = "23.05"; + autoUpgrade.enable = true; + }; +} diff --git a/machines/jupiter-server/disks.nix b/machines/jupiter-server/disks.nix new file mode 100644 index 0000000..1c70e5e --- /dev/null +++ b/machines/jupiter-server/disks.nix @@ -0,0 +1,15 @@ +{ config, lib, pkgs, ... }: + +#TODO: CHECK THIS OUT: https://github.com/nix-community/disko its kinda better but felix does not support it + +{ + fileSystems."/" = + { device = "/dev/disk/by-uuid/c95c64ad-f131-4bde-9bca-a7a3692173da"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/0D77-17BB"; + fsType = "vfat"; + }; +} diff --git a/machines/jupiter-server/environments.nix b/machines/jupiter-server/environments.nix new file mode 100644 index 0000000..4de0d21 --- /dev/null +++ b/machines/jupiter-server/environments.nix @@ -0,0 +1,20 @@ +# enabled profiles +{ config, lib, ... }: +let + secrets = config.sops.secrets; +in +{ + my.profiles = { + hyprland.enable = false; + zsh.enable = true; + apps = { + desktop_apps = false; + dev_apps = true; + gnome_apps = false; + }; + }; + + my.hardware = { + bluetooth.enable = true; + }; +} \ No newline at end of file From 2985cd7ab23533e0c46950170f02abdc7aaccbd9 Mon Sep 17 00:00:00 2001 From: marthsincemelee Date: Fri, 13 Oct 2023 22:45:57 +0200 Subject: [PATCH 22/25] Feature: New Development Server Environment --- .../jupiter-server/hardware-configuration.nix | 38 +++++++++++++++++++ modules/environments/dev_server/default.nix | 20 ++++++++++ modules/environments/hyprland/default.nix | 3 -- 3 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 machines/jupiter-server/hardware-configuration.nix create mode 100644 modules/environments/dev_server/default.nix diff --git a/machines/jupiter-server/hardware-configuration.nix b/machines/jupiter-server/hardware-configuration.nix new file mode 100644 index 0000000..6d6c886 --- /dev/null +++ b/machines/jupiter-server/hardware-configuration.nix @@ -0,0 +1,38 @@ +# 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 = [ "xhci_pci" "ahci" "nvme" "usbhid" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/c95c64ad-f131-4bde-9bca-a7a3692173da"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/0D77-17BB"; + 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.enp3s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/modules/environments/dev_server/default.nix b/modules/environments/dev_server/default.nix new file mode 100644 index 0000000..9d4adec --- /dev/null +++ b/modules/environments/dev_server/default.nix @@ -0,0 +1,20 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.my.profiles.dev_server; + in { + options.my.profiles.dev_server = with lib; { + enable = mkEnableOption "Development Server environment"; + }; + + config = lib.mkIf cfg.enable { + programs.dev_server = { + enable = true; + nvidiaPatches = true; + xwayland.enable = true; + }; + users.users.finn.packages = with pkgs; [ + # Software + ]; + }; + +} diff --git a/modules/environments/hyprland/default.nix b/modules/environments/hyprland/default.nix index 34a0410..8ed9694 100644 --- a/modules/environments/hyprland/default.nix +++ b/modules/environments/hyprland/default.nix @@ -2,9 +2,6 @@ let cfg = config.my.profiles.hyprland; in { - - - options.my.profiles.hyprland = with lib; { enable = mkEnableOption "hyprland env"; }; From e22eb62d2bba639473073a354158a7361fc0d8c9 Mon Sep 17 00:00:00 2001 From: marthsincemelee Date: Mon, 16 Oct 2023 22:20:02 +0200 Subject: [PATCH 23/25] Feature: Prowlarr module --- machines/jupiter/environments.nix | 1 + modules/environments/default.nix | 1 + modules/environments/prowlarr/default.nix | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/machines/jupiter/environments.nix b/machines/jupiter/environments.nix index 0ee7ee8..338463e 100644 --- a/machines/jupiter/environments.nix +++ b/machines/jupiter/environments.nix @@ -18,6 +18,7 @@ in sonarr.enable = true; jellyfin.enable = true; jellyseerr.enable = true; + prowlarr.enable = true; }; my.hardware = { diff --git a/modules/environments/default.nix b/modules/environments/default.nix index 1a6c3c2..60efd44 100644 --- a/modules/environments/default.nix +++ b/modules/environments/default.nix @@ -12,5 +12,6 @@ ./sonarr ./jellyfin ./jellyseerr + ./prowlarr ]; } \ No newline at end of file diff --git a/modules/environments/prowlarr/default.nix b/modules/environments/prowlarr/default.nix index d53b78c..179fc77 100644 --- a/modules/environments/prowlarr/default.nix +++ b/modules/environments/prowlarr/default.nix @@ -13,7 +13,6 @@ in config = lib.mkIf cfg.enable { services.prowlarr = { enable = true; - openFirewall = true; }; # # ugly fix for service not having a homedirectory # users.users.prowlarr = { From 02f2deb21924f293e7ece712bf373ca3187617c5 Mon Sep 17 00:00:00 2001 From: finn Date: Mon, 25 Sep 2023 11:25:57 +0200 Subject: [PATCH 24/25] Installed Pipewire and wireplumber for screen sharing --- modules/environments/apps/default.nix | 2 ++ modules/environments/hyprland/default.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/modules/environments/apps/default.nix b/modules/environments/apps/default.nix index 963ac40..8cecb11 100644 --- a/modules/environments/apps/default.nix +++ b/modules/environments/apps/default.nix @@ -22,6 +22,8 @@ let keepassxc nextcloud-client neovim + pipewire + wireplumber ] ++ lib.optionals cfg.dev_apps [ vscode jetbrains.webstorm diff --git a/modules/environments/hyprland/default.nix b/modules/environments/hyprland/default.nix index 8ed9694..11a08d5 100644 --- a/modules/environments/hyprland/default.nix +++ b/modules/environments/hyprland/default.nix @@ -19,6 +19,8 @@ let hyprpaper waybar libsForQt5.dolphin + libsForQt5.systemsettings + libsForQt5.polkit-kde-agent ]; hardware = { # Opengl From 6030e88a357dff54caa533eb52d65e74a23f8930 Mon Sep 17 00:00:00 2001 From: finn Date: Mon, 16 Oct 2023 21:59:07 +0200 Subject: [PATCH 25/25] added go --- modules/environments/apps/default.nix | 1 + modules/environments/hyprland/default.nix | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/environments/apps/default.nix b/modules/environments/apps/default.nix index 8cecb11..26ba617 100644 --- a/modules/environments/apps/default.nix +++ b/modules/environments/apps/default.nix @@ -30,6 +30,7 @@ let jetbrains.goland jetbrains.pycharm-professional jetbrains.idea-ultimate + go ] ++ lib.optionals cfg.gnome_apps [ gnomeExtensions.tweaks-in-system-menu gnomeExtensions.wireless-hid diff --git a/modules/environments/hyprland/default.nix b/modules/environments/hyprland/default.nix index 11a08d5..2f28584 100644 --- a/modules/environments/hyprland/default.nix +++ b/modules/environments/hyprland/default.nix @@ -19,8 +19,9 @@ let hyprpaper waybar libsForQt5.dolphin - libsForQt5.systemsettings + #libsForQt5.systemsettings libsForQt5.polkit-kde-agent + #xdg-desktop-portal-hyprland ]; hardware = { # Opengl