From 3ec4a7135e23387877f7bae6fe46bcfee7b312be Mon Sep 17 00:00:00 2001 From: marthsincemelee Date: Sun, 21 Apr 2024 17:46:13 +0200 Subject: [PATCH 01/22] feat: KDE Desktop Module --- machines/jupiter/environments.nix | 7 ++++--- modules/environments/default.nix | 1 + modules/environments/kde-desktop/default.nix | 20 ++++++++++++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 modules/environments/kde-desktop/default.nix diff --git a/machines/jupiter/environments.nix b/machines/jupiter/environments.nix index 84c331a..b972b19 100644 --- a/machines/jupiter/environments.nix +++ b/machines/jupiter/environments.nix @@ -8,10 +8,11 @@ in hyprland.enable = false; zsh.enable = true; apps = { - desktop_apps = false; - dev_apps = false; + desktop_apps = true; + dev_apps = true; gnome_apps = false; }; + kde-desktop.enable = true; radarr.enable = true; docker.enable = true; readarr.enable = true; @@ -19,7 +20,7 @@ in jellyfin.enable = true; jellyseerr.enable = true; paperless = { - enable = true; + enable = false; port = 28981; # Optional, to override the default port extraConfig = { PAPERLESS_ADMIN_USER = "finn"; diff --git a/modules/environments/default.nix b/modules/environments/default.nix index 1a6c3c2..b5c80ec 100644 --- a/modules/environments/default.nix +++ b/modules/environments/default.nix @@ -8,6 +8,7 @@ ./prowlarr ./radarr ./docker + ./kde-desktop ./readarr ./sonarr ./jellyfin diff --git a/modules/environments/kde-desktop/default.nix b/modules/environments/kde-desktop/default.nix new file mode 100644 index 0000000..2f3cd90 --- /dev/null +++ b/modules/environments/kde-desktop/default.nix @@ -0,0 +1,20 @@ +# KDE Desktio Environment +{ config, lib, pkgs, ... }: +let + cfg = config.my.profiles.kde-desktop; + # domain = config.networking.domain; + # port = 9696; +in +{ + options.my.profiles.kde-desktop = with lib; { + enable = mkEnableOption "KDE Desktop Environment"; + }; + + config = lib.mkIf cfg.enable { + services.xserver = { + enable = true; + displayManager.sddm.enable = true; + desktopManager.plasma5.enable = true; + }; + }; +} \ No newline at end of file From f9906a9e968f46732c97e942e1133110d96ab1c0 Mon Sep 17 00:00:00 2001 From: finn Date: Mon, 22 Apr 2024 22:05:47 +0200 Subject: [PATCH 02/22] Flake Update --- flake.lock | 222 +++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 173 insertions(+), 49 deletions(-) diff --git a/flake.lock b/flake.lock index 0e0e450..5c0ca9c 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -34,21 +34,88 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-utils": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "hyprcursor": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1713612213, + "narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, "hyprland": { "inputs": { + "hyprcursor": "hyprcursor", "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang", + "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs", "systems": "systems", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1709953765, - "narHash": "sha256-91LK3Ur3sy1jrh8Du8f+4maRVhcFNmwd6TBv7AxLGQU=", + "lastModified": 1713808098, + "narHash": "sha256-dtxj6PZkKw6q+q+KMKxWjYZCmEZsGC4ytDswmYe2MiM=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "3e930a568a76a810dde6bcabcf737a81850e7153", + "rev": "855a516596fa8a15aea7cf4b4068aba0293a9615", "type": "github" }, "original": { @@ -94,11 +161,11 @@ ] }, "locked": { - "lastModified": 1709775675, - "narHash": "sha256-G+gIMUQBtfbbrnsM/OPJzebdqKFP6typplNCE7X8Szw=", + "lastModified": 1713121246, + "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f1db1a7e1faee2a5c67d03b6bd283da82eed3730", + "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", "type": "github" }, "original": { @@ -107,6 +174,31 @@ "type": "github" } }, + "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1713730424, + "narHash": "sha256-MqYjTvQCxwuDIuAaqIEuyqserm5PYr0auiHHPuYFN/k=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "7c9c8adfe7e424faa0c5ce6e8be90157fda53c06", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, "libgit2": { "flake": false, "locked": { @@ -126,16 +218,18 @@ "nix": { "inputs": { "flake-compat": "flake-compat", + "flake-parts": "flake-parts_2", "libgit2": "libgit2", "nixpkgs": "nixpkgs_2", - "nixpkgs-regression": "nixpkgs-regression" + "nixpkgs-regression": "nixpkgs-regression", + "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1709945384, - "narHash": "sha256-7jY7r1vyUTqVX+hEACdgvpQVoKhii2muoIJYc5w8bRo=", + "lastModified": 1713798490, + "narHash": "sha256-tl9n8Yf2B6f16h2uVlg0Y26GwnSLEII5D04ilPiEP48=", "owner": "NixOS", "repo": "nix", - "rev": "3120fef01b0b78ab156865226839295b27694271", + "rev": "aa165301d1ae3b306319a6a834dc1d4e340a7112", "type": "github" }, "original": { @@ -146,11 +240,11 @@ }, "nixlib": { "locked": { - "lastModified": 1709426687, - "narHash": "sha256-jLBZmwXf0WYHzLkmEMq33bqhX55YtT5edvluFr0RcSA=", + "lastModified": 1712450863, + "narHash": "sha256-K6IkdtMtq9xktmYPj0uaYc8NsIqHuaAoRBaMgu9Fvrw=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "7873d84a89ae6e4841528ff7f5697ddcb5bdfe6c", + "rev": "3c62b6a12571c9a7f65ab037173ee153d539905f", "type": "github" }, "original": { @@ -167,11 +261,11 @@ ] }, "locked": { - "lastModified": 1709887845, - "narHash": "sha256-803UIoB8+vGkm/VK/g55aBAAOf/ncTGvxXyjTF4ydm0=", + "lastModified": 1713783234, + "narHash": "sha256-3yh0nqI1avYUmmtqqTW3EVfwaLE+9ytRWxsA5aWtmyI=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "bef32a05496d9480b02be586fa7827748b9e597b", + "rev": "722b512eb7e6915882f39fff0e4c9dd44f42b77e", "type": "github" }, "original": { @@ -182,11 +276,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1709410583, - "narHash": "sha256-esOSUoQ7mblwcsSea0K17McZuwAIjoS6dq/4b83+lvw=", + "lastModified": 1713521961, + "narHash": "sha256-EwR8wW9AqJhSIY+0oxWRybUZ32BVKuZ9bjlRh8SJvQ8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "59e37017b9ed31dee303dbbd4531c594df95cfbc", + "rev": "5d48925b815fd202781bfae8fb6f45c07112fdb2", "type": "github" }, "original": { @@ -197,11 +291,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "lastModified": 1713537308, + "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", "type": "github" }, "original": { @@ -214,11 +308,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1709237383, - "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "type": "github" }, "original": { @@ -247,11 +341,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "lastModified": 1713714899, + "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", "type": "github" }, "original": { @@ -278,11 +372,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1709884566, - "narHash": "sha256-NSYJg2sfdO/XS3L8XN/59Zhzn0dqWm7XtVnKI2mHq3w=", + "lastModified": 1713725259, + "narHash": "sha256-9ZR/Rbx5/Z/JZf5ehVNMoz/s5xjpP0a22tL6qNvLt5E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2be119add7b37dc535da2dd4cba68e2cf8d1517e", + "rev": "a5e4bbcb4780c63c79c87d29ea409abf097de3f7", "type": "github" }, "original": { @@ -291,6 +385,38 @@ "type": "indirect" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": [ + "nix" + ], + "flake-utils": "flake-utils", + "gitignore": [ + "nix" + ], + "nixpkgs": [ + "nix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712897695, + "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "flake-parts": "flake-parts", @@ -320,20 +446,18 @@ "wlroots": { "flake": false, "locked": { - "host": "gitlab.freedesktop.org", - "lastModified": 1708558866, - "narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=", - "owner": "wlroots", - "repo": "wlroots", - "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", - "type": "gitlab" + "lastModified": 1713731601, + "narHash": "sha256-bdcKdtLkusvv85DNuJsajZLFeq7bXp+x5AGP1Sd4wD8=", + "owner": "hyprwm", + "repo": "wlroots-hyprland", + "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", + "type": "github" }, "original": { - "host": "gitlab.freedesktop.org", - "owner": "wlroots", - "repo": "wlroots", - "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", - "type": "gitlab" + "owner": "hyprwm", + "repo": "wlroots-hyprland", + "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", + "type": "github" } }, "xdph": { @@ -356,11 +480,11 @@ ] }, "locked": { - "lastModified": 1709299639, - "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=", + "lastModified": 1713724432, + "narHash": "sha256-dtU1y4oj/0Y42oauzm93ucFg1AoqETnQ21bmXTIUng0=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "2d2fb547178ec025da643db57d40a971507b82fe", + "rev": "9ace6f969ce495185df34cc6254fb9d297765478", "type": "github" }, "original": { From b3b3bf9f4b6d8d335b2506c7ad6552db182cfa8e Mon Sep 17 00:00:00 2001 From: finn Date: Mon, 22 Apr 2024 22:22:20 +0200 Subject: [PATCH 03/22] Installed Pipewire and wireplumber for screen sharing --- modules/environments/apps/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/environments/apps/default.nix b/modules/environments/apps/default.nix index 26ba617..867cb17 100644 --- a/modules/environments/apps/default.nix +++ b/modules/environments/apps/default.nix @@ -23,6 +23,7 @@ let nextcloud-client neovim pipewire + vlc wireplumber ] ++ lib.optionals cfg.dev_apps [ vscode From eac2c87e2d0a2d1dc66f7c2f56c915d2c6cac04e Mon Sep 17 00:00:00 2001 From: finn Date: Fri, 26 Apr 2024 22:12:50 +0200 Subject: [PATCH 04/22] feat: Latte Dock --- modules/environments/kde-desktop/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/environments/kde-desktop/default.nix b/modules/environments/kde-desktop/default.nix index 2f3cd90..09e7341 100644 --- a/modules/environments/kde-desktop/default.nix +++ b/modules/environments/kde-desktop/default.nix @@ -16,5 +16,8 @@ in displayManager.sddm.enable = true; desktopManager.plasma5.enable = true; }; + users.users.finn.packages = with pkgs; [ + latte-dock + ]; }; } \ No newline at end of file From c9e725ff857b5f5e923d579f688c367c6aedd317 Mon Sep 17 00:00:00 2001 From: "finn.markwitz" Date: Fri, 26 Apr 2024 22:35:33 +0200 Subject: [PATCH 05/22] fix: Desktop Rebuild Fix Removed Arr Suite Temporarily Removed NFS Mount --- machines/jupiter/disks.nix | 6 ++---- machines/jupiter/environments.nix | 12 ++++++------ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/machines/jupiter/disks.nix b/machines/jupiter/disks.nix index 3dfde9b..aec3ab7 100644 --- a/machines/jupiter/disks.nix +++ b/machines/jupiter/disks.nix @@ -13,11 +13,9 @@ fsType = "vfat"; }; - fileSystems."/data/nfs" = +/* fileSystems."/data/nfs" = { device = "voyager:/"; fsType = "nfs"; options = [ "x-systemd.automount" "noauto" ]; - }; - - + };*/ } diff --git a/machines/jupiter/environments.nix b/machines/jupiter/environments.nix index b972b19..2720f25 100644 --- a/machines/jupiter/environments.nix +++ b/machines/jupiter/environments.nix @@ -13,12 +13,12 @@ in gnome_apps = false; }; kde-desktop.enable = true; - radarr.enable = true; + radarr.enable = false; docker.enable = true; - readarr.enable = true; - sonarr.enable = true; - jellyfin.enable = true; - jellyseerr.enable = true; + readarr.enable = false; + sonarr.enable = false; + jellyfin.enable = false; + jellyseerr.enable = false; paperless = { enable = false; port = 28981; # Optional, to override the default port @@ -27,7 +27,7 @@ in PAPERLESS_OCR_LANGUAGE = "deu+eng"; }; }; - prowlarr.enable = true; + prowlarr.enable = false; }; my.hardware = { From 192c1f5e5693cb71bbd847539676d2f7a8e21e20 Mon Sep 17 00:00:00 2001 From: "finn.markwitz" Date: Fri, 26 Apr 2024 22:35:50 +0200 Subject: [PATCH 06/22] feat: zsh Configuration --- modules/environments/zsh/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/environments/zsh/default.nix b/modules/environments/zsh/default.nix index cb1413f..b469db7 100644 --- a/modules/environments/zsh/default.nix +++ b/modules/environments/zsh/default.nix @@ -10,10 +10,15 @@ let }; config = lib.mkIf cfg.enable { - programs.zsh.enable = true; - programs.zsh.ohMyZsh.enable = true; users.defaultUserShell = pkgs.zsh; - } ; + programs.zsh = { + enable = true; + ohMyZsh = { + enable = true; + theme = "agnoster"; + }; + }; + }; } From 6018134b12403cabd1f5deb95202a58a1af95238 Mon Sep 17 00:00:00 2001 From: "finn.markwitz" Date: Fri, 26 Apr 2024 22:51:12 +0200 Subject: [PATCH 07/22] feat: Numix Icons --- modules/environments/apps/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/environments/apps/default.nix b/modules/environments/apps/default.nix index 867cb17..3b9b2f4 100644 --- a/modules/environments/apps/default.nix +++ b/modules/environments/apps/default.nix @@ -25,6 +25,7 @@ let pipewire vlc wireplumber + numix-icon-theme ] ++ lib.optionals cfg.dev_apps [ vscode jetbrains.webstorm From 0c393d81c8d5fc5512e623d1dd1ef0c4d079286f Mon Sep 17 00:00:00 2001 From: "finn.markwitz" Date: Fri, 10 May 2024 09:40:43 +0200 Subject: [PATCH 08/22] test: hyprland & jellyfin --- machines/jupiter/environments.nix | 8 ++++---- modules/environments/hyprland/default.nix | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/machines/jupiter/environments.nix b/machines/jupiter/environments.nix index 2720f25..7ce6397 100644 --- a/machines/jupiter/environments.nix +++ b/machines/jupiter/environments.nix @@ -5,22 +5,22 @@ let in { my.profiles = { - hyprland.enable = false; + hyprland.enable = true; zsh.enable = true; apps = { desktop_apps = true; dev_apps = true; gnome_apps = false; }; - kde-desktop.enable = true; + kde-desktop.enable = false; radarr.enable = false; docker.enable = true; readarr.enable = false; sonarr.enable = false; - jellyfin.enable = false; + jellyfin.enable = true; jellyseerr.enable = false; paperless = { - enable = false; + enable = true; port = 28981; # Optional, to override the default port extraConfig = { PAPERLESS_ADMIN_USER = "finn"; diff --git a/modules/environments/hyprland/default.nix b/modules/environments/hyprland/default.nix index 2f28584..ff03179 100644 --- a/modules/environments/hyprland/default.nix +++ b/modules/environments/hyprland/default.nix @@ -9,7 +9,6 @@ let config = lib.mkIf cfg.enable { programs.hyprland = { enable = true; - nvidiaPatches = true; xwayland.enable = true; }; users.users.finn.packages = with pkgs; [ From a3f2922017e6a2344cf6c71b20a45ef10537c7ee Mon Sep 17 00:00:00 2001 From: "finn.markwitz" Date: Fri, 10 May 2024 09:43:30 +0200 Subject: [PATCH 09/22] refactor: Jupiter Server Edition Removal --- machines/jupiter-server/configuration.nix | 29 -------------- machines/jupiter-server/disks.nix | 15 -------- machines/jupiter-server/environments.nix | 20 ---------- .../jupiter-server/hardware-configuration.nix | 38 ------------------- 4 files changed, 102 deletions(-) delete mode 100644 machines/jupiter-server/configuration.nix delete mode 100644 machines/jupiter-server/disks.nix delete mode 100644 machines/jupiter-server/environments.nix delete mode 100644 machines/jupiter-server/hardware-configuration.nix diff --git a/machines/jupiter-server/configuration.nix b/machines/jupiter-server/configuration.nix deleted file mode 100644 index 05c852a..0000000 --- a/machines/jupiter-server/configuration.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ 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 deleted file mode 100644 index 1c70e5e..0000000 --- a/machines/jupiter-server/disks.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ 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 deleted file mode 100644 index 4de0d21..0000000 --- a/machines/jupiter-server/environments.nix +++ /dev/null @@ -1,20 +0,0 @@ -# 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 diff --git a/machines/jupiter-server/hardware-configuration.nix b/machines/jupiter-server/hardware-configuration.nix deleted file mode 100644 index 6d6c886..0000000 --- a/machines/jupiter-server/hardware-configuration.nix +++ /dev/null @@ -1,38 +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 = [ "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; -} From a2e1831cc7379013d8018fc1bcb5d1a14d9194e5 Mon Sep 17 00:00:00 2001 From: Finn Date: Mon, 3 Jun 2024 13:14:52 +0200 Subject: [PATCH 10/22] feat: Voyager hubble --- machines/jupiter/disks.nix | 5 +++-- machines/jupiter/environments.nix | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/machines/jupiter/disks.nix b/machines/jupiter/disks.nix index aec3ab7..3a28256 100644 --- a/machines/jupiter/disks.nix +++ b/machines/jupiter/disks.nix @@ -13,9 +13,10 @@ fsType = "vfat"; }; -/* fileSystems."/data/nfs" = + fileSystems."/data/nfs" = { device = "voyager:/"; fsType = "nfs"; options = [ "x-systemd.automount" "noauto" ]; - };*/ + }; + } diff --git a/machines/jupiter/environments.nix b/machines/jupiter/environments.nix index 7ce6397..4c009d4 100644 --- a/machines/jupiter/environments.nix +++ b/machines/jupiter/environments.nix @@ -20,7 +20,7 @@ in jellyfin.enable = true; jellyseerr.enable = false; paperless = { - enable = true; + enable = false; port = 28981; # Optional, to override the default port extraConfig = { PAPERLESS_ADMIN_USER = "finn"; From 284ec2e841e251a421245a9dda6b120a4f160aa9 Mon Sep 17 00:00:00 2001 From: "finn.markwitz" Date: Sat, 11 May 2024 09:39:03 +0200 Subject: [PATCH 11/22] feat: Thunar File Manager --- modules/environments/apps/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/environments/apps/default.nix b/modules/environments/apps/default.nix index 3b9b2f4..ed008dc 100644 --- a/modules/environments/apps/default.nix +++ b/modules/environments/apps/default.nix @@ -17,6 +17,7 @@ let firefox thunderbird google-chrome + xfce.thunar discord spotify keepassxc From 71f160c3e56bddd0d9415ce40236d741b0aaa393 Mon Sep 17 00:00:00 2001 From: "finn.markwitz" Date: Mon, 3 Jun 2024 13:18:25 +0200 Subject: [PATCH 12/22] feat: Enable Arr Suite --- machines/jupiter/environments.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/machines/jupiter/environments.nix b/machines/jupiter/environments.nix index 4c009d4..4a5be0b 100644 --- a/machines/jupiter/environments.nix +++ b/machines/jupiter/environments.nix @@ -13,12 +13,12 @@ in gnome_apps = false; }; kde-desktop.enable = false; - radarr.enable = false; + radarr.enable = true; docker.enable = true; readarr.enable = false; - sonarr.enable = false; + sonarr.enable = true; jellyfin.enable = true; - jellyseerr.enable = false; + jellyseerr.enable = true; paperless = { enable = false; port = 28981; # Optional, to override the default port @@ -27,10 +27,10 @@ in PAPERLESS_OCR_LANGUAGE = "deu+eng"; }; }; - prowlarr.enable = false; + prowlarr.enable = true; }; my.hardware = { bluetooth.enable = true; }; -} \ No newline at end of file +} From c2a645a5b5e338896e04112ed435ad1a8d376660 Mon Sep 17 00:00:00 2001 From: "finn.markwitz" Date: Mon, 15 Jul 2024 11:43:31 +0200 Subject: [PATCH 13/22] update: Major System & Flake --- flake.lock | 179 +++++++++++++++++------------- flake.nix | 2 +- machines/jupiter/environments.nix | 6 +- 3 files changed, 104 insertions(+), 83 deletions(-) diff --git a/flake.lock b/flake.lock index 5c0ca9c..8c895e0 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1719877454, + "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f", "type": "github" }, "original": { @@ -86,11 +86,11 @@ ] }, "locked": { - "lastModified": 1713612213, - "narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=", + "lastModified": 1718450675, + "narHash": "sha256-jpsns6buS4bK+1sF8sL8AaixAiCRjA+nldTKvcwmvUs=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1", + "rev": "66d5b46ff94efbfa6fa3d1d1b66735f1779c34a6", "type": "github" }, "original": { @@ -102,20 +102,19 @@ "hyprland": { "inputs": { "hyprcursor": "hyprcursor", - "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang", + "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs", "systems": "systems", - "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1713808098, - "narHash": "sha256-dtxj6PZkKw6q+q+KMKxWjYZCmEZsGC4ytDswmYe2MiM=", + "lastModified": 1719915468, + "narHash": "sha256-2a+aQbaAqFNySNXZ9l44tebNmXnAfAzqj+Tw4JRUvqc=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "855a516596fa8a15aea7cf4b4068aba0293a9615", + "rev": "2fa57f2dc4909be697d003a22ce6870039e4db9b", "type": "github" }, "original": { @@ -128,19 +127,21 @@ "inputs": { "nixpkgs": [ "hyprland", + "xdph", "nixpkgs" ], "systems": [ "hyprland", + "xdph", "systems" ] }, "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", + "lastModified": 1714869498, + "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", + "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161", "type": "github" }, "original": { @@ -150,6 +151,35 @@ } }, "hyprlang": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1717881852, + "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "ec6938c66253429192274d612912649a0cfe4d28", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprutils": { "inputs": { "nixpkgs": [ "hyprland", @@ -161,16 +191,16 @@ ] }, "locked": { - "lastModified": 1713121246, - "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", + "lastModified": 1719316102, + "narHash": "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw=", "owner": "hyprwm", - "repo": "hyprlang", - "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", + "repo": "hyprutils", + "rev": "1f6bbec5954f623ff8d68e567bddcce97cd2f085", "type": "github" }, "original": { "owner": "hyprwm", - "repo": "hyprlang", + "repo": "hyprutils", "type": "github" } }, @@ -186,11 +216,11 @@ ] }, "locked": { - "lastModified": 1713730424, - "narHash": "sha256-MqYjTvQCxwuDIuAaqIEuyqserm5PYr0auiHHPuYFN/k=", + "lastModified": 1719067853, + "narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "7c9c8adfe7e424faa0c5ce6e8be90157fda53c06", + "rev": "914f083741e694092ee60a39d31f693d0a6dc734", "type": "github" }, "original": { @@ -221,15 +251,16 @@ "flake-parts": "flake-parts_2", "libgit2": "libgit2", "nixpkgs": "nixpkgs_2", + "nixpkgs-23-11": "nixpkgs-23-11", "nixpkgs-regression": "nixpkgs-regression", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1713798490, - "narHash": "sha256-tl9n8Yf2B6f16h2uVlg0Y26GwnSLEII5D04ilPiEP48=", + "lastModified": 1719873912, + "narHash": "sha256-i+qQmaneLQKD/LYgZuCp+/dkyiqUW9+b9rSQ1i2oZCQ=", "owner": "NixOS", "repo": "nix", - "rev": "aa165301d1ae3b306319a6a834dc1d4e340a7112", + "rev": "80d67d603b68d5b1eae468c8be3016117dcaefb2", "type": "github" }, "original": { @@ -240,11 +271,11 @@ }, "nixlib": { "locked": { - "lastModified": 1712450863, - "narHash": "sha256-K6IkdtMtq9xktmYPj0uaYc8NsIqHuaAoRBaMgu9Fvrw=", + "lastModified": 1719708727, + "narHash": "sha256-XFNKtyirrGNdehpg7lMNm1skEcBApjqGhaHc/OI95HY=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "3c62b6a12571c9a7f65ab037173ee153d539905f", + "rev": "1bba8a624b3b9d4f68db94fb63aaeb46039ce9e6", "type": "github" }, "original": { @@ -261,11 +292,11 @@ ] }, "locked": { - "lastModified": 1713783234, - "narHash": "sha256-3yh0nqI1avYUmmtqqTW3EVfwaLE+9ytRWxsA5aWtmyI=", + "lastModified": 1719841141, + "narHash": "sha256-WOyohxFJJdfDvEB7N3eTcX44lNU2rZes1inHsyHL7mM=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "722b512eb7e6915882f39fff0e4c9dd44f42b77e", + "rev": "140dcc2b9a0eb87ba5e9011076a1a7af19179ab1", "type": "github" }, "original": { @@ -276,11 +307,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1713521961, - "narHash": "sha256-EwR8wW9AqJhSIY+0oxWRybUZ32BVKuZ9bjlRh8SJvQ8=", + "lastModified": 1719895800, + "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "5d48925b815fd202781bfae8fb6f45c07112fdb2", + "rev": "6e253f12b1009053eff5344be5e835f604bb64cd", "type": "github" }, "original": { @@ -291,11 +322,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1713537308, - "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", + "lastModified": 1719075281, + "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", + "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "type": "github" }, "original": { @@ -305,24 +336,34 @@ "type": "github" } }, - "nixpkgs-lib": { + "nixpkgs-23-11": { "locked": { - "dir": "lib", - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", + "lastModified": 1717159533, + "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", "type": "github" }, "original": { - "dir": "lib", "owner": "NixOS", - "ref": "nixos-unstable", "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1719876945, + "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + } + }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, @@ -341,11 +382,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1713714899, - "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", + "lastModified": 1719848872, + "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", + "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", "type": "github" }, "original": { @@ -356,32 +397,32 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1709083642, - "narHash": "sha256-7kkJQd4rZ+vFrzWu8sTRtta5D1kBG0LSRYAfhtmMlSo=", + "lastModified": 1717432640, + "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b550fe4b4776908ac2a861124307045f8e717c8e", + "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1713725259, - "narHash": "sha256-9ZR/Rbx5/Z/JZf5ehVNMoz/s5xjpP0a22tL6qNvLt5E=", + "lastModified": 1719838683, + "narHash": "sha256-Zw9rQjHz1ilNIimEXFeVa1ERNRBF8DoXDhLAZq5B4pE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a5e4bbcb4780c63c79c87d29ea409abf097de3f7", + "rev": "d032c1a6dfad4eedec7e35e91986becc699d7d69", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "type": "indirect" } }, @@ -443,29 +484,9 @@ "type": "github" } }, - "wlroots": { - "flake": false, - "locked": { - "lastModified": 1713731601, - "narHash": "sha256-bdcKdtLkusvv85DNuJsajZLFeq7bXp+x5AGP1Sd4wD8=", - "owner": "hyprwm", - "repo": "wlroots-hyprland", - "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "wlroots-hyprland", - "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", - "type": "github" - } - }, "xdph": { "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], + "hyprland-protocols": "hyprland-protocols", "hyprlang": [ "hyprland", "hyprlang" @@ -480,11 +501,11 @@ ] }, "locked": { - "lastModified": 1713724432, - "narHash": "sha256-dtU1y4oj/0Y42oauzm93ucFg1AoqETnQ21bmXTIUng0=", + "lastModified": 1718619174, + "narHash": "sha256-FWW68AVYmB91ZDQnhLMBNCUUTCjb1ZpO2k2KIytHtkA=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "9ace6f969ce495185df34cc6254fb9d297765478", + "rev": "c7894aa54f9a7dbd16df5cd24d420c8af22d5623", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a4c2bac..9e3bf44 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ inputs = { nix.url = "github:NixOS/nix"; - nixpkgs.url = "nixpkgs/nixos-23.11"; + nixpkgs.url = "nixpkgs/nixos-24.05"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; flake-parts.url = "github:hercules-ci/flake-parts"; nixos-hardware.url = "github:NixOS/nixos-hardware"; diff --git a/machines/jupiter/environments.nix b/machines/jupiter/environments.nix index 4a5be0b..78655db 100644 --- a/machines/jupiter/environments.nix +++ b/machines/jupiter/environments.nix @@ -5,11 +5,11 @@ let in { my.profiles = { - hyprland.enable = true; + hyprland.enable = false; zsh.enable = true; apps = { - desktop_apps = true; - dev_apps = true; + desktop_apps = false; + dev_apps = false; gnome_apps = false; }; kde-desktop.enable = false; From af2d9af641110c0edb0e3b48de9040fdd465bae2 Mon Sep 17 00:00:00 2001 From: "finn.markwitz" Date: Sun, 21 Jul 2024 21:58:25 +0200 Subject: [PATCH 14/22] feat: Enable Readarr --- machines/jupiter/environments.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machines/jupiter/environments.nix b/machines/jupiter/environments.nix index 78655db..e9b0e91 100644 --- a/machines/jupiter/environments.nix +++ b/machines/jupiter/environments.nix @@ -15,7 +15,7 @@ in kde-desktop.enable = false; radarr.enable = true; docker.enable = true; - readarr.enable = false; + readarr.enable = true; sonarr.enable = true; jellyfin.enable = true; jellyseerr.enable = true; From 42d2702bad47de9dbf012d957d8dc5fe658b6872 Mon Sep 17 00:00:00 2001 From: marthsincemelee Date: Wed, 14 Aug 2024 19:01:29 +0200 Subject: [PATCH 15/22] conf: Paperless Data Location --- machines/jupiter/environments.nix | 2 +- modules/environments/paperless/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/machines/jupiter/environments.nix b/machines/jupiter/environments.nix index e9b0e91..387da45 100644 --- a/machines/jupiter/environments.nix +++ b/machines/jupiter/environments.nix @@ -20,7 +20,7 @@ in jellyfin.enable = true; jellyseerr.enable = true; paperless = { - enable = false; + enable = true; port = 28981; # Optional, to override the default port extraConfig = { PAPERLESS_ADMIN_USER = "finn"; diff --git a/modules/environments/paperless/default.nix b/modules/environments/paperless/default.nix index 10faabd..2865247 100644 --- a/modules/environments/paperless/default.nix +++ b/modules/environments/paperless/default.nix @@ -26,7 +26,7 @@ in services.paperless = { enable = true; address = "0.0.0.0"; - dataDir = "/data/nfs/arr-data/documents/paperless"; + dataDir = "/home/finn/documents/paperless"; #inherit (cfg) port extraConfig; port = cfg.port; extraConfig = cfg.extraConfig; From 97981637a36a4c6ee5cc27a42593caa6ad677eaf Mon Sep 17 00:00:00 2001 From: "finn.markwitz" Date: Wed, 14 Aug 2024 19:04:02 +0200 Subject: [PATCH 16/22] feat: Disable Powersaving --- machines/jupiter/hardware-configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machines/jupiter/hardware-configuration.nix b/machines/jupiter/hardware-configuration.nix index 903b09f..c0a9146 100644 --- a/machines/jupiter/hardware-configuration.nix +++ b/machines/jupiter/hardware-configuration.nix @@ -49,6 +49,6 @@ # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; + powerManagement.cpuFreqGovernor = lib.mkDefault "performance"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } From 232fa2ead95a5e691df271a51fddc922c554ad07 Mon Sep 17 00:00:00 2001 From: "finn.markwitz" Date: Mon, 30 Sep 2024 22:53:25 +0200 Subject: [PATCH 17/22] test: disable Paperless, since docker service is more stable --- machines/jupiter/environments.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machines/jupiter/environments.nix b/machines/jupiter/environments.nix index 387da45..e9b0e91 100644 --- a/machines/jupiter/environments.nix +++ b/machines/jupiter/environments.nix @@ -20,7 +20,7 @@ in jellyfin.enable = true; jellyseerr.enable = true; paperless = { - enable = true; + enable = false; port = 28981; # Optional, to override the default port extraConfig = { PAPERLESS_ADMIN_USER = "finn"; From c300b55e8f3bff9f635e2d4d902c45524b62fc9d Mon Sep 17 00:00:00 2001 From: "finn.markwitz" Date: Mon, 28 Oct 2024 20:54:51 +0100 Subject: [PATCH 18/22] Config: KDE-Desktop with VS Code enabled --- machines/jupiter/environments.nix | 4 ++-- modules/environments/apps/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/machines/jupiter/environments.nix b/machines/jupiter/environments.nix index e9b0e91..16f5b65 100644 --- a/machines/jupiter/environments.nix +++ b/machines/jupiter/environments.nix @@ -8,11 +8,11 @@ in hyprland.enable = false; zsh.enable = true; apps = { - desktop_apps = false; + desktop_apps = true; dev_apps = false; gnome_apps = false; }; - kde-desktop.enable = false; + kde-desktop.enable = true; radarr.enable = true; docker.enable = true; readarr.enable = true; diff --git a/modules/environments/apps/default.nix b/modules/environments/apps/default.nix index ed008dc..8dbaf54 100644 --- a/modules/environments/apps/default.nix +++ b/modules/environments/apps/default.nix @@ -18,6 +18,7 @@ let thunderbird google-chrome xfce.thunar + vscode discord spotify keepassxc @@ -28,7 +29,6 @@ let wireplumber numix-icon-theme ] ++ lib.optionals cfg.dev_apps [ - vscode jetbrains.webstorm jetbrains.goland jetbrains.pycharm-professional @@ -40,4 +40,4 @@ let gnome.gnome-tweaks ]; }; - } \ No newline at end of file + } From 6086ace4310b7a5383344c6427714bb77f63f458 Mon Sep 17 00:00:00 2001 From: Finn Date: Tue, 10 Dec 2024 19:27:22 +0100 Subject: [PATCH 19/22] test: nix-pkg: 24.11 --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index a4c2bac..cd305ad 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ inputs = { nix.url = "github:NixOS/nix"; - nixpkgs.url = "nixpkgs/nixos-23.11"; + nixpkgs.url = "nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; flake-parts.url = "github:hercules-ci/flake-parts"; nixos-hardware.url = "github:NixOS/nixos-hardware"; From 8ce14dc6e081e99e27f6e2854b604a69a96768de Mon Sep 17 00:00:00 2001 From: marthsincemelee Date: Sun, 21 Apr 2024 17:46:13 +0200 Subject: [PATCH 20/22] update: 24.11 --- machines/configuration_old.nix | 1 - machines/jupiter/configuration.nix | 12 ++++++++++-- machines/mibook/configuration.nix | 1 - modules/hardware/sound/default.nix | 3 +-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/machines/configuration_old.nix b/machines/configuration_old.nix index 2ebb3b6..d0e0dbf 100644 --- a/machines/configuration_old.nix +++ b/machines/configuration_old.nix @@ -63,7 +63,6 @@ services.printing.enable = true; # Enable sound with pipewire. - sound.enable = true; hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { diff --git a/machines/jupiter/configuration.nix b/machines/jupiter/configuration.nix index 0725066..9a62d6d 100644 --- a/machines/jupiter/configuration.nix +++ b/machines/jupiter/configuration.nix @@ -14,6 +14,16 @@ boot.loader.efi.canTouchEfiVariables = true; boot.kernelPackages = pkgs.unstable.linuxPackages_latest; + # Shitfuck SOnar Dotnet dependency + nixpkgs.config = { + permittedInsecurePackages = [ + "aspnetcore-runtime-6.0.36" + "aspnetcore-runtime-wrapped-6.0.36" + "dotnet-sdk-6.0.428" + "dotnet-sdk-wrapped-6.0.428" + ]; + }; + # Enable the X11 windowing system. # services.xserver.enable = true; @@ -38,8 +48,6 @@ # Enable CUPS to print documents. services.printing.enable = true; - # Enable sound with pipewire. - sound.enable = true; security.rtkit.enable = true; system = { diff --git a/machines/mibook/configuration.nix b/machines/mibook/configuration.nix index 89c8b2d..afc02aa 100644 --- a/machines/mibook/configuration.nix +++ b/machines/mibook/configuration.nix @@ -35,7 +35,6 @@ services.printing.enable = true; # Enable sound with pipewire. - sound.enable = true; hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { diff --git a/modules/hardware/sound/default.nix b/modules/hardware/sound/default.nix index 50f9e2c..52a6094 100644 --- a/modules/hardware/sound/default.nix +++ b/modules/hardware/sound/default.nix @@ -8,8 +8,7 @@ in }; config = lib.mkIf cfg.enable { - sound.enable = true; - hardware.pulseaudio.enable = true; + hardware.pulseaudio.enable = false; hardware.pulseaudio.support32Bit = true; users.extraUsers.finn.extraGroups = [ "audio" ]; }; From 74f1471bb9f99f6bf2f7f9ccce4de5753d20c9d7 Mon Sep 17 00:00:00 2001 From: "finn.markwitz" Date: Tue, 10 Dec 2024 21:58:44 +0100 Subject: [PATCH 21/22] update: 24.11 - flake --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 8c895e0..e17ba89 100644 --- a/flake.lock +++ b/flake.lock @@ -413,16 +413,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1719838683, - "narHash": "sha256-Zw9rQjHz1ilNIimEXFeVa1ERNRBF8DoXDhLAZq5B4pE=", + "lastModified": 1733550349, + "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d032c1a6dfad4eedec7e35e91986becc699d7d69", + "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "type": "indirect" } }, From 76955ad6b3b60d574176803d4294236ec315701c Mon Sep 17 00:00:00 2001 From: "finn.markwitz" Date: Thu, 12 Dec 2024 20:13:53 +0100 Subject: [PATCH 22/22] config: disable desktop --- machines/jupiter/environments.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/machines/jupiter/environments.nix b/machines/jupiter/environments.nix index 16f5b65..e9b0e91 100644 --- a/machines/jupiter/environments.nix +++ b/machines/jupiter/environments.nix @@ -8,11 +8,11 @@ in hyprland.enable = false; zsh.enable = true; apps = { - desktop_apps = true; + desktop_apps = false; dev_apps = false; gnome_apps = false; }; - kde-desktop.enable = true; + kde-desktop.enable = false; radarr.enable = true; docker.enable = true; readarr.enable = true;