fix: MarleyNet fixes

flake.nix

@@ -22,7 +22,7 @@
       ];
 
       systems.modules.nixos = with inputs; [
-        rose-pine.nixosModules.rose-pine
+        stylix.nixosModules.stylix
         niri-flake.nixosModules.niri
       ];
 
@@ -37,10 +37,6 @@
       outputs-builder = channels: {
         formatter = channels.nixpkgs.alejandra;
       };
-
-      alias = {
-        shells.default = "nix";
-      };
     };
 
   inputs = {
@@ -77,28 +73,16 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    rose-pine.url = "git+https://codewith.babesonthe.net/punkfairie/rose-pine-nix";
+    stylix.url = "github:danth/stylix/release-24.11";
 
-    marleyvim.url = "git+https://codewith.babesonthe.net/punkfairie/marleyvim";
+    niri-flake.url = "github:sodiboo/niri-flake";
 
     wezterm = {
       url = "github:wez/wezterm?dir=nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    niri-flake.url = "github:sodiboo/niri-flake";
-
-    # Rose pine themes that aren't included in the above flake:
-    # TODO: Integrate these to punkfairie/rose-pine-nix.
-    rose-pine-amfora = {
-      url = "github:rose-pine/amfora";
-      flake = false;
-    };
-    rose-pine-qt5ct = {
-      url = "github:piperbly/rose-pine-qt5ct";
-      flake = false;
-    };
-    rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor";
+    marleyvim.url = "git+https://codewith.babesonthe.net/punkfairie/marleyvim";
 
     # Rofi
     rofi-themes = {

homes/x86_64-linux/marley@marleynet/default.nix

@@ -0,0 +1,9 @@
+{lib, ...}: let
+  inherit (lib.marleyos) enabled;
+in {
+  marleyos = {
+    bundles.server = enabled;
+  };
+
+  home.stateVersion = "24.05";
+}

modules/nixos/base/boot/default.nix

@@ -5,4 +5,6 @@
   ...
 }: {
   boot.kernelPackages = lib.mkIf (!config.marleyos.isServer) pkgs.linuxPackages_xanmod;
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
 }

modules/nixos/bundles/desktop/default.nix

@@ -11,6 +11,8 @@ in {
 
   config = lib.mkIf cfg.enable {
     marleyos = {
+      isDesktop = lib.mkDefault true;
+
       mounts = {
         automounts = enabled;
         babeshare = enabled;

modules/nixos/bundles/server/default.nix

@@ -11,6 +11,8 @@ in {
 
   config = lib.mkIf cfg.enable {
     marleyos = {
+      isServer = lib.mkDefault true;
+
       appearance = {
         base = enabled;
         console = enabled;

overlays/ddclient/default.nix

@@ -1,5 +1,5 @@
 _: final: prev: {
-  ddclient = prev.polybar.overrideAttrs {
+  ddclient = prev.ddclient.overrideAttrs {
     src = final.fetchFromGitHub {
       owner = "ddclient";
       repo = "ddclient";

systems/x86_64-linux/marleynet/default.nix

@@ -3,15 +3,18 @@
 in {
   imports = [./hardware-configuration.nix];
 
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
   networking.hostName = "marleynet";
 
+  marleyos = {
+    bundles.server = enabled;
+  };
+
   users.users.marley.openssh.authorizedKeys.keys = [
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDcKsDGK8C5W6eRsJQSdAOTFVZnkKRWjnyn4iDR8zMi7 marley@nyx"
 
     # iphone
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+hMOzQBPmi6Rjw7fYvwn43w1Dgk+GEooGPnQz2RTcK Generated By Termius"
   ];
+
+  system.stateVersion = "24.05";
 }

systems/x86_64-linux/nyx/default.nix

@@ -3,9 +3,6 @@
 in {
   imports = [./hardware-configuration.nix ./mounts.nix ./autorandr.nix];
 
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
   networking.hostName = "nyx";
 
   # For local dev.