fix: proper null checking

flake/config.nix

@@ -14,11 +14,9 @@
       };
 
       # TODO: Move these to custom modules
-      overlays = with inputs; [
-        lix.overlays.default
-        nur.overlays.default
-        agenix.overlays.default
-        niri-flake.overlays.niri
+      overlays = [
+        # Lix pollutes my terminal with warnings if I move this to a module :(
+        inputs.lix.overlays.default
 
         (import ./overlays/ddclient.nix)
         (import ./overlays/firefox-addons {
@@ -26,12 +24,8 @@
           inherit inputs;
         })
         (import ./overlays/jetbrains.nix {inherit inputs;})
-        (import ./overlays/maple-mono-NF.nix)
         (import ./overlays/marleyvim.nix {inherit inputs;})
         (import ./overlays/wezterm.nix {inherit inputs;})
-
-        # Custom packages
-        (import ./overlays/marleyos.nix)
       ];
     };
   };

hosts/default.nix

@@ -1,12 +1,13 @@
 {
   inputs,
+  lib,
   self,
   ...
 }: {
   imports = [inputs.easy-hosts.flakeModule];
 
   config.easy-hosts = {
-    shared.specialArgs.marleylib = import ../lib;
+    shared.specialArgs.marleylib = import ../lib {inherit lib;};
 
     # shared.modules = with inputs; [
     #   # TODO: Move module imports to custom module
@@ -19,13 +20,6 @@
 
     perClass = class: {
       modules = ["${self}/modules/${class}/default.nix"];
-
-      # modules = with inputs;
-      #   (nixpkgs.lib.optionals (class == "nixos") [
-      #     niri-flake.nixosModules.niri
-      #   ])
-      #   ++ (nixpkgs.lib.optionals (class == "darwin") [
-      #   ]);
     };
 
     hosts = {

hosts/nyx/default.nix

@@ -22,6 +22,11 @@ in {
   };
 
   home-manager.users."${name}" = {
+    marleyos = {
+      shell.niri.monitors = ["DP-1" "HDMI-A-1"];
+      services.syncthing = enabled;
+    };
+
     home.stateVersion = "24.05";
   };
 

lib/default.nix

@@ -1,3 +1,3 @@
-{
-  module = import ./module.nix;
+{lib}: {
+  module = import ./module.nix {inherit lib;};
 }

lib/module.nix

@@ -1,23 +1,39 @@
-{
+{lib}: {
+  ## Quickly enable an option.
+  ##
+  ## ```nix
+  ## services.nginx = enabled;
+  ## ```
+  ##
+  #@ true
   enabled = {
-    ## Quickly enable an option.
-    ##
-    ## ```nix
-    ## services.nginx = enabled;
-    ## ```
-    ##
-    #@ true
     enable = true;
   };
 
+  ## Quickly disable an option.
+  ##
+  ## ```nix
+  ## services.nginx = enabled;
+  ## ```
+  ##
+  #@ false
   disabled = {
-    ## Quickly disable an option.
-    ##
-    ## ```nix
-    ## services.nginx = enabled;
-    ## ```
-    ##
-    #@ false
     enable = false;
   };
+
+  ## Like lib.mkEnableOption, but allows specifying the default.
+  ##
+  ## ```nix
+  ## options.marleyos.wayland = mkEnableOption' "wayland" false;
+  ## ```
+  mkEnableOption' = name: default:
+    lib.mkOption {
+      inherit default;
+      example = true;
+      description =
+        if name ? _type && name._type == "mdDoc"
+        then lib.mdDoc "Whether to enable ${name.text}."
+        else "Whether to enable ${name}.";
+      type = lib.types.bool;
+    };
 }

modules/base/home.nix

@@ -1,4 +1,8 @@
-{marleylib, ...}: let
+{
+  marleylib,
+  inputs',
+  ...
+}: let
   my = {
     name = "marley";
     fullName = "Marley Rae";
@@ -19,7 +23,7 @@ in {
       };
 
       sharedModules = [../home];
-      extraSpecialArgs = {inherit marleylib;};
+      extraSpecialArgs = {inherit marleylib inputs';};
     };
   };
 }

modules/base/nix.nix

@@ -50,8 +50,17 @@
       };
     };
 
-    nixpkgs.config = {
-      allowUnfree = true;
+    nixpkgs = {
+      config = {
+        allowUnfree = true;
+      };
+
+      overlays = [
+        inputs.nur.overlays.default
+
+        # Custom packages
+        (import ../../overlays/marleyos.nix)
+      ];
     };
 
     # More useful repl.

modules/base/stylix/default.nix

@@ -1,5 +1,7 @@
 {pkgs, ...}: {
   config = {
+    nixpkgs.overlays = [(import ../../../overlays/maple-mono-NF.nix)];
+
     stylix = {
       enable = true;
 

modules/home/default.nix

@@ -9,6 +9,7 @@
     ./system
     ./shell
     ./programs
+    ./services
 
     ./profiles.nix
   ];

modules/home/profiles.nix

@@ -12,13 +12,30 @@ in {
     # Universal - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     {
       programs = {
+        agenix = enabled;
+        bat = enabled;
+        curl = enabled;
+        eza = enabled;
+        fish = enabled;
         nh = enabled;
       };
     }
     #
     #
     # Graphical Desktop - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-    (lib.optionalAttrs cfg.desktop {})
+    (lib.optionalAttrs cfg.desktop {
+      shell.niri = enabled;
+
+      programs = {
+        cheat = enabled;
+        figlet = enabled;
+        nemo = enabled;
+      };
+
+      services = {
+        udiskie = enabled;
+      };
+    })
     #
     #
     # Server - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

modules/home/programs/agenix.nix

@@ -1,7 +1,7 @@
 {
-  lib,
   config,
-  pkgs,
+  lib,
+  inputs',
   ...
 }: let
   cfg = config.marleyos.programs.agenix;
@@ -9,8 +9,9 @@ in {
   options.marleyos.programs.agenix.enable = lib.mkEnableOption "agenix";
 
   config = lib.mkIf cfg.enable {
-    home.packages = with pkgs; [
-      agenix
+    home.packages = [
+      # The overlay doesn't work for some reason...
+      inputs'.agenix.packages.default
     ];
   };
 }

modules/home/programs/bat.nix

@@ -1,7 +1,6 @@
 {
-  lib,
   config,
-  # pkgs,
+  lib,
   ...
 }: let
   cfg = config.marleyos.programs.bat;
@@ -12,21 +11,11 @@ in {
     programs.bat = {
       enable = true;
 
-      # FIX: Currently broken. Re-enable when not broken.
-      # extraPackages = with pkgs.bat-extras; [
-      #   batdiff
-      #   batman
-      # ];
-
       config = {
         style = "auto";
       };
     };
 
-    home.sessionVariables = lib.mkIf config.programs.git.delta.enable {
-      # BATDIFF_USE_DELTA = "true";
-    };
-
     programs.fish = {
       functions = {
         cat = {

modules/home/programs/cheat.nix

@@ -1,7 +1,7 @@
 {
-  lib,
   config,
   pkgs,
+  lib,
   ...
 }: let
   cfg = config.marleyos.programs.cheat;

modules/home/programs/curl.nix

@@ -1,12 +1,17 @@
 {
-  lib,
+  marleylib,
   config,
+  osConfig,
+  lib,
   pkgs,
   ...
 }: let
+  inherit (marleylib.module) mkEnableOption';
+
   cfg = config.marleyos.programs.curl;
+  osCfg = osConfig.marleyos.programs.curl;
 in {
-  options.marleyos.programs.curl.enable = lib.mkEnableOption "curl";
+  options.marleyos.programs.curl.enable = mkEnableOption' "curl" osCfg.enable;
 
   config = lib.mkIf cfg.enable {
     home.packages = with pkgs; [

modules/home/programs/default.nix

@@ -1,5 +1,20 @@
 {
   imports = [
+    ./agenix.nix
+    ./bat.nix
+    ./cheat.nix
+    ./curl.nix
+    ./eza.nix
+    ./figlet.nix
+    ./fish.nix
+    ./fuzzel.nix
+    ./nemo.nix
     ./nh.nix
+    ./waybar.nix
+
+    # TODO: uncomment when swaylock is figured out
+    # ./wlogout
+
+    ./xwayland-satellite.nix
   ];
 }

modules/home/programs/eza.nix

@@ -1,6 +1,6 @@
 {
-  lib,
   config,
+  lib,
   ...
 }: let
   cfg = config.marleyos.programs.eza;

modules/home/programs/figlet.nix

@@ -1,6 +1,6 @@
 {
-  lib,
   config,
+  lib,
   pkgs,
   ...
 }: let

modules/home/programs/fish.nix

@@ -1,15 +1,17 @@
 {
-  lib,
+  marleylib,
   config,
+  osConfig,
+  lib,
   pkgs,
-  system,
   ...
 }: let
-  inherit (lib.snowfall.system) is-linux is-darwin;
+  inherit (marleylib.module) mkEnableOption';
 
   cfg = config.marleyos.programs.fish;
+  osCfg = osConfig.marleyos.programs.fish;
 in {
-  options.marleyos.programs.fish.enable = lib.mkEnableOption "fish";
+  options.marleyos.programs.fish.enable = mkEnableOption' "fish" osCfg.enable;
 
   config = lib.mkIf cfg.enable {
     home.packages = with pkgs;
@@ -31,8 +33,8 @@ in {
         pax
       ]
       # unrar-free is broken on darwin :(
-      ++ (lib.optionals (is-linux system) [unrar-free])
-      ++ (lib.optionals (is-darwin system) [unrar]);
+      ++ (lib.optionals pkgs.stdenv.isLinux [unrar-free])
+      ++ (lib.optionals pkgs.stdenv.isDarwin [unrar]);
 
     programs.fish = {
       enable = true;

modules/home/programs/fuzzel.nix

@@ -1,14 +1,15 @@
 {
   lib,
   config,
+  pkgs,
   ...
 }: let
   cfg = config.marleyos.programs.fuzzel;
 in {
   options.marleyos.programs.fuzzel.enable = lib.mkEnableOption "fuzzel";
 
-  config = lib.mkIf cfg.enable {
-    marleyos.apps.launcher = {
+  config = lib.mkIf (cfg.enable && pkgs.stdenv.isLinux) {
+    marleycfg.apps.launcher = {
       inherit (config.programs.fuzzel) package;
       command = "";
     };

modules/home/programs/nemo.nix

@@ -8,11 +8,11 @@
 in {
   options.marleyos.programs.nemo.enable = lib.mkEnableOption "nemo";
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf (cfg.enable && pkgs.stdenv.isLinux) {
     home.packages = with pkgs; [
       nemo
     ];
 
-    marleyos.apps.file-browser = pkgs.nemo;
+    marleycfg.apps.file-browser = pkgs.nemo;
   };
 }

modules/home/programs/nh.nix

@@ -1,12 +1,16 @@
 {
   config,
-  lib,
+  marleylib,
   osConfig,
+  lib,
   ...
 }: let
+  inherit (marleylib.module) mkEnableOption';
+
+  osCfg = osConfig.marleyos.programs.nh.enable;
   cfg = config.marleyos.programs.nh;
 in {
-  options.marleyos.programs.nh.enable = lib.mkEnableOption "nh";
+  options.marleyos.programs.nh.enable = mkEnableOption' "nh" osCfg;
 
   config = lib.mkIf cfg.enable {
     programs.nh = {

modules/home/programs/waybar.nix

@@ -1,19 +1,24 @@
 {
-  lib,
+  marleylib,
   config,
+  osConfig,
+  lib,
   pkgs,
   ...
 }: let
-  cfg = config.marleyos.programs.waybar;
-in {
-  options.marleyos.programs.waybar = {
-    enable = lib.mkEnableOption "waybar";
-  };
+  inherit (marleylib.module) mkEnableOption';
 
-  config = lib.mkIf cfg.enable {
+  cfg = config.marleyos.programs.waybar;
+  osCfg = osConfig.marleyos.programs.waybar;
+in {
+  options.marleyos.programs.waybar.enable =
+    mkEnableOption' "waybar" osCfg.enable;
+
+  config = lib.mkIf (cfg.enable && pkgs.stdenv.isLinux) {
     marleyos = {
       services.swaync.enable = true;
-      programs.wlogout.enable = true;
+      # TODO: enable once swaylock is figured out
+      # programs.wlogout.enable = true;
     };
 
     stylix.targets.waybar.addCss = false;
@@ -26,9 +31,10 @@ in {
       settings = let
         niri =
           config.programs.niri
-          # HM module doesn't include an enable option...
+          # HM module doesn't include an enable option when imported by nixOS
+          # module...
           // {
-            enable = config.marleyos.wayland.niri.enable;
+            inherit (config.marleyos.shell.niri) enable;
           };
       in [
         {
@@ -47,18 +53,16 @@ in {
               "cpu"
               "memory"
             ];
-          modules-center =
-            []
-            ++ (lib.optionals niri.enable [
-              "niri/workspaces"
-            ]);
+          modules-center = lib.optionals niri.enable [
+            "niri/workspaces"
+          ];
           modules-right =
             [
               "mpd"
               "custom/notifications"
               "tray"
             ]
-            ++ (lib.optionals (!config.marleyos.isDesktop) [
+            ++ (lib.optionals config.marleycfg.profiles.laptop [
               "battery"
             ])
             ++ [
@@ -71,7 +75,7 @@ in {
             tooltip = false;
             format = "";
             on-click = let
-              inherit (config.marleyos.apps) launcher;
+              inherit (config.marleycfg.apps) launcher;
             in "sleep 0.1 && ${lib.getExe launcher.package} ${launcher.command}";
           };
 

modules/home/programs/wlogout/default.nix

@@ -8,7 +8,7 @@
 in {
   options.marleyos.programs.wlogout.enable = lib.mkEnableOption "wlogout";
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf (cfg.enable && pkgs.stdenv.isLinux) {
     marleyos.programs.hyprlock.enable = true;
 
     programs.wlogout = {
@@ -16,8 +16,10 @@ in {
 
       layout = let
         systemctl = lib.getExe' pkgs.systemd "systemctl";
+        # TODO: use niri msg action quit
         hyprctrl =
           lib.getExe' config.wayland.windowManager.hyprland.package "hyprctrl";
+        # TODO: switch to swaylock
         hyprlock = lib.getExe config.programs.hyprlock.package;
       in [
         {

modules/home/programs/xwayland-satellite.nix

@@ -1,6 +1,6 @@
 {
-  lib,
   config,
+  lib,
   pkgs,
   ...
 }: let
@@ -8,7 +8,7 @@
 in {
   options.marleyos.programs.xwayland-satellite.enable = lib.mkEnableOption "xwayland-satellite";
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf (cfg.enable && pkgs.stdenv.isLinux) {
     home.packages = with pkgs; [
       xwayland-satellite
     ];

modules/home/services/default.nix

@@ -0,0 +1,9 @@
+{
+  imports = [
+    ./gnome-keyring.nix
+    ./swaybg.nix
+    ./swaync.nix
+    ./syncthing.nix
+    ./udiskie.nix
+  ];
+}

modules/home/services/gnome-keyring.nix

@@ -0,0 +1,21 @@
+{
+  marleylib,
+  config,
+  osConfig,
+  lib,
+  ...
+}: let
+  inherit (marleylib.module) mkEnableOption';
+
+  cfg = config.marleyos.services.gnome-keyring;
+  osCfg = osConfig.marleyos.services.gnome-keyring;
+in {
+  options.marleyos.services.gnome-keyring.enable =
+    mkEnableOption' "gnome-keyring" osCfg.enable;
+
+  config = lib.mkIf cfg.enable {
+    services.gnome-keyring = {
+      enable = true;
+    };
+  };
+}

modules/home/services/swaybg.nix

@@ -1,6 +1,6 @@
 {
-  lib,
   config,
+  lib,
   pkgs,
   ...
 }: let

modules/home/services/swaync.nix

@@ -1,13 +1,14 @@
 {
-  lib,
   config,
+  lib,
+  pkgs,
   ...
 }: let
   cfg = config.marleyos.services.swaync;
 in {
   options.marleyos.services.swaync.enable = lib.mkEnableOption "swaync";
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf (cfg.enable && pkgs.stdenv.isLinux) {
     services.swaync = {
       enable = true;
 

modules/home/services/syncthing.nix

@@ -6,6 +6,8 @@
 }: let
   cfg = config.marleyos.services.syncthing;
 in {
+  # I am specifically not enabling this for the OS as a whole, as I don't want
+  # to deal with user shenanigans.
   options.marleyos.services.syncthing.enable = lib.mkEnableOption "syncthing";
 
   config = lib.mkIf cfg.enable {

modules/home/services/udiskie.nix

@@ -8,13 +8,12 @@
 in {
   options.marleyos.services.udiskie.enable = lib.mkEnableOption "udiskie";
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf (cfg.enable && pkgs.stdenv.isLinux) {
     services.udiskie = {
       enable = true;
       settings = {
         program_options = {
-          # FIXME: set default file manager in default progs mod
-          file_manager = "${lib.getExe pkgs.xfce.thunar}";
+          file_manager = "${lib.getExe config.marleycfg.apps.file-browser}";
         };
       };
     };

modules/home/shell/default.nix

@@ -1,6 +1,12 @@
 {
   imports = [
     ./stylix.nix
+
+    ./xorg.nix
+
+    ./wayland.nix
+    ./niri.nix
+
     ./gtk.nix
     ./qt.nix
   ];

modules/home/shell/gtk.nix

@@ -1,9 +1,10 @@
 {
   lib,
   config,
+  pkgs,
   ...
 }: {
-  config = lib.mkIf config.marleycfg.profiles.desktop {
+  config = lib.mkIf (config.marleycfg.profiles.desktop && pkgs.stdenv.isLinux) {
     home.pointerCursor.gtk.enable = true;
 
     gtk = {

modules/home/shell/niri.nix

@@ -1,12 +1,19 @@
 {
-  lib,
+  marleylib,
   config,
+  osConfig,
+  lib,
+  pkgs,
+  inputs,
   ...
 }: let
-  cfg = config.marleyos.wayland.niri;
+  inherit (marleylib.module) mkEnableOption' enabled;
+
+  cfg = config.marleyos.shell.niri;
+  osCfg = osConfig.marleyos.shell.niri;
 in {
-  options.marleyos.wayland.niri = {
-    enable = lib.mkEnableOption "niri";
+  options.marleyos.shell.niri = {
+    enable = mkEnableOption' "niri" osCfg.enable;
 
     monitors = lib.mkOption {
       type = with lib.types; nullOr (listOf str);
@@ -15,19 +22,22 @@ in {
     };
   };
 
-  config = lib.mkIf cfg.enable {
-    marleyos = {
-      wayland.enable = true;
+  config = lib.mkIf (cfg.enable && pkgs.stdenv.isLinux) {
+    nixpkgs.overlays = [inputs.niri-flake.overlays.niri];
 
+    marleyos = {
+      shell.wayland = enabled;
       programs = {
-        waybar.enable = true;
-        wlogout.enable = true;
-        fuzzel.enable = true;
-        xwayland-satellite.enable = true;
+        waybar = enabled;
+        #   TODO: enable once swaylock is figured out
+        #   wlogout = enabled;
+        fuzzel = enabled;
+        xwayland-satellite = enabled;
       };
       services = {
-        swaybg.enable = true;
-        swaync.enable = true;
+        gnome-keyring = enabled;
+        swaybg = enabled;
+        swaync = enabled;
       };
     };
 
@@ -48,7 +58,7 @@ in {
 
         ### Startup Programs ###
         spawn-at-startup = let
-          inherit (config.marleyos) apps;
+          inherit (config.marleycfg) apps;
         in [
           {command = ["sh" "-c" "${lib.getExe apps.terminal} -e tmux new -s main -A"];}
           (cmd (lib.getExe apps.browser))
@@ -95,7 +105,7 @@ in {
         };
 
         ### Screenshots ###
-        screenshot-path = "~/pictures/screenshots/%Y-%m-%d %H-%M-%S.png";
+        screenshot-path = "~/${config.xdg.userDirs.pictures}/screenshots/%Y-%m-%d %H-%M-%S.png";
 
         ### Workspaces ###
         workspaces = {
@@ -128,6 +138,7 @@ in {
                   title = "^Picture-in-Picture$";
                 }
                 {title = "^Picture in picture$";}
+                {title = "Bitwarden";}
               ];
               open-floating = true;
             }
@@ -164,7 +175,7 @@ in {
           "Ctrl+Alt+Delete".action = quit;
 
           "Mod+Shift+Slash".action = show-hotkey-overlay;
-          "Mod+Return".action = spawn (lib.getExe config.marleyos.apps.terminal);
+          "Mod+Return".action = spawn (lib.getExe config.marleycfg.apps.terminal);
           "Mod+R".action = spawn (lib.getExe config.programs.fuzzel.package);
 
           "Mod+H".action = focus-column-or-monitor-left;

modules/home/shell/qt.nix

@@ -1,9 +1,10 @@
 {
   lib,
   config,
+  pkgs,
   ...
 }: {
-  config = lib.mkIf config.marleycfg.profiles.desktop {
+  config = lib.mkIf (config.marleycfg.profiles.desktop && pkgs.stdenv.isLinux) {
     qt = {
       enable = true;
     };

modules/home/shell/wayland.nix

@@ -1,13 +1,12 @@
 {
-  config,
   lib,
+  config,
+  pkgs,
   ...
-}: let
-  cfg = config.marleyos.wayland;
-in {
-  options.marleyos.wayland.enable = lib.mkEnableOption "wayland";
+}: {
+  options.marleyos.shell.wayland.enable = lib.mkEnableOption "wayland";
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf (config.marleyos.shell.wayland.enable && pkgs.stdenv.isLinux) {
     # Fix the "tray.target not found" error.
     systemd.user.targets.tray = lib.mkIf (!config.xsession.enable) {
       Unit = {

modules/home/shell/xorg.nix

@@ -0,0 +1,16 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  options.marleyos.shell.xorg.enable = lib.mkEnableOption "xorg";
+
+  config = lib.mkIf (config.marleyos.shell.xorg.enable && pkgs.stdenv.isLinux) {
+    xsession = {
+      enable = true;
+
+      numlock.enable = true;
+    };
+  };
+}

modules/home/system/session.nix

@@ -17,8 +17,8 @@ in {
 
       shellAbbrs = {
         c = "clear";
-        e = "${config.home.sessionVariables.EDITOR}";
-        v = "${config.home.sessionVariables.EDITOR}";
+        e = "${config.home.sessionVariables.EDITOR or "$EDITOR"}";
+        v = "${config.home.sessionVariables.EDITOR or "$EDITOR"}";
       };
 
       packages = [
@@ -27,7 +27,9 @@ in {
     };
 
     marleycfg.apps.pinentry =
-      if profiles.desktop
+      if pkgs.stdenv.isDarwin
+      then pkgs.pinentry_mac
+      else if profiles.desktop
       then pkgs.pinentry-gtk2
       else pkgs.pinentry-curses;
   };

modules/nixos/profiles.nix

@@ -12,6 +12,7 @@ in {
     # Universal - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     {
       programs = {
+        curl = enabled;
         fish = enabled;
         nh = enabled;
       };

modules/nixos/programs/curl.nix

@@ -0,0 +1,16 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
+  cfg = config.marleyos.programs.curl;
+in {
+  options.marleyos.programs.curl.enable = lib.mkEnableOption "curl";
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      curl
+    ];
+  };
+}

modules/nixos/programs/default.nix

@@ -1,6 +1,8 @@
 {
   imports = [
+    ./curl.nix
     ./fish.nix
     ./nh.nix
+    ./waybar.nix
   ];
 }

modules/nixos/programs/waybar.nix

@@ -0,0 +1,15 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.marleyos.programs.waybar;
+in {
+  options.marleyos.programs.waybar.enable = lib.mkEnableOption "waybar";
+
+  config = lib.mkIf cfg.enable {
+    programs.waybar = {
+      enable = true;
+    };
+  };
+}

modules/nixos/shell/niri.nix

@@ -1,13 +1,31 @@
 {
-  lib,
   config,
+  marleylib,
+  lib,
+  inputs,
   ...
 }: let
   cfg = config.marleyos.shell.niri;
+
+  inherit (marleylib.module) enabled;
 in {
   options.marleyos.shell.niri.enable = lib.mkEnableOption "niri";
 
+  imports = [inputs.niri-flake.nixosModules.niri];
+
   config = lib.mkIf cfg.enable {
+    nixpkgs.overlays = [inputs.niri-flake.overlays.niri];
+
+    marleyos = {
+      shell.hyprlock = enabled;
+      programs = {
+        waybar = enabled;
+      };
+      services = {
+        gnome-keyring = enabled;
+      };
+    };
+
     programs.niri = {
       enable = true;
     };

modules/options/profiles.nix

@@ -1,6 +1,25 @@
-{lib, ...}: {
+{
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.marleycfg.profiles;
+in {
   options.marleycfg.profiles = {
     desktop = lib.mkEnableOption "graphical desktop profile";
+    laptop = lib.mkEnableOption "laptop profile";
     server = lib.mkEnableOption "server profile";
   };
+
+  config = lib.mkIf cfg.server {
+    assertions = [
+      {
+        assertion = cfg.server -> !cfg.desktop;
+        message = ''
+          The marleycfg.profiles.server and marleycfg.profiles.desktop options
+          are mutually exclusive.
+        '';
+      }
+    ];
+  };
 }

overlays/marleyos.nix

@@ -1,6 +1,6 @@
 _: prev: {
   marleyos =
-    prev.marleyos
+    (prev.marleyos or {})
     // {
       CEmu-TI-84-Plus-CE = prev.callPackage ../packages/CEmu-TI-84-Plus-CE {};
       figlet-xero-fonts = prev.callPackage ../packages/figlet-xero-fonts {};

snowflake/homes/x86_64-linux/marley@nyx/default.nix

@@ -1,14 +0,0 @@
-{lib, ...}: let
-  inherit (lib.marleyos) enabled;
-in {
-  marleyos = {
-    bundles.desktop = enabled;
-
-    wayland.niri = {
-      enable = true;
-      monitors = ["DP-1" "HDMI-A-1"];
-    };
-  };
-
-  home.stateVersion = "24.05";
-}

snowflake/modules/home/programs/wayland/hyprlock/default.nix

@@ -1,35 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.marleyos.programs.hyprlock;
-in {
-  options.marleyos.programs.hyprlock.enable = lib.mkEnableOption "hyprlock";
-
-  config = lib.mkIf cfg.enable {
-    programs.hyprlock = {
-      enable = true;
-
-      settings = {
-        general = {
-          disable_loading_bar = true;
-          grace = 10;
-          hide_cursor = true;
-          no_fade_in = false;
-        };
-
-        input-field = {
-          size = "200, 50";
-          position = "0, -80";
-          monitor = "";
-          dots_center = true;
-          fade_on_empty = false;
-          outline_thickness = 5;
-          placeholder_text = "password...";
-          shadow_passes = 2;
-        };
-      };
-    };
-  };
-}

snowflake/modules/home/services/gnome-keyring/default.nix

@@ -1,15 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.marleyos.services.gnome-keyring;
-in {
-  options.marleyos.services.gnome-keyring.enable = lib.mkEnableOption "gnome-keyring";
-
-  config = lib.mkIf cfg.enable {
-    services.gnome-keyring = {
-      enable = true;
-    };
-  };
-}

snowflake/modules/home/services/kanata/config.kbd

@@ -1,60 +0,0 @@
-;; vim: ft=commonlisp
-
-;; Home row mods QWERTY example with more complexity.
-;; Some of the changes from the basic example:
-;; - when a home row mod activates tap, the home row mods are disabled
-;;   while continuing to type rapidly
-;; - tap-hold-release helps make the hold action more responsive
-;; - pressing another key on the same half of the keyboard
-;;   as the home row mod will activate an early tap action
-
-(defcfg
-  process-unmapped-keys yes
-)
-(defsrc
-  lsft a   s   d   f   j   k   l   ;
-)
-(defvar
-  ;; Note: consider using different time values for your different fingers.
-  ;; For example, your pinkies might be slower to release keys and index
-  ;; fingers faster.
-  tap-time 200
-  hold-time 150
-
-  left-hand-keys (
-    q w e r t
-    a s d f g
-    z x c v b
-  )
-  right-hand-keys (
-    y u i o p
-    h j k l ;
-    n m , . /
-  )
-)
-(deflayer base
-  @lsft @a  @s  @d  @f  @j  @k  @l  @;
-)
-
-(deflayer nomods
-  @lsft a   s   d   f   j   k   l   ;
-)
-(deffakekeys
-  to-base (layer-switch base)
-)
-(defalias
-  tap (multi
-    (layer-switch nomods)
-    (on-idle-fakekey to-base tap 20)
-  )
-
-  lsft (tap-hold 100 100 esc lsft)
-  a (tap-hold-release-keys $tap-time $hold-time (multi a @tap) lctl $left-hand-keys)
-  s (tap-hold-release-keys $tap-time $hold-time (multi s @tap) lalt $left-hand-keys)
-  d (tap-hold-release-keys $tap-time $hold-time (multi d @tap) lsft $left-hand-keys)
-  f (tap-hold-release-keys $tap-time $hold-time (multi f @tap) lmet $left-hand-keys)
-  j (tap-hold-release-keys $tap-time $hold-time (multi j @tap) rmet $right-hand-keys)
-  k (tap-hold-release-keys $tap-time $hold-time (multi k @tap) rsft $right-hand-keys)
-  l (tap-hold-release-keys $tap-time $hold-time (multi l @tap) ralt $right-hand-keys)
-  ; (tap-hold-release-keys $tap-time $hold-time (multi ; @tap) rctl $right-hand-keys)
-)

snowflake/modules/home/services/kanata/default.nix

@@ -1,42 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  system,
-  ...
-}: let
-  inherit (lib.snowfall.system) is-darwin;
-
-  cfg = config.marleyos.services.kanata;
-  isGenericLinux = config.targets.genericLinux.enable;
-  isNotNixOS = isGenericLinux || (is-darwin system);
-in {
-  options.marleyos.services.kanata.enable = lib.mkEnableOption "kanata";
-
-  # Kanata is available as a module for nixOS and that should be preferred when
-  # possible.
-  config = lib.mkIf (cfg.enable && isNotNixOS) {
-    home.packages = with pkgs; [
-      kanata
-    ];
-
-    systemd.user.services.kanata = {
-      Unit = {
-        Description = "Kanata keyboard remapper";
-        Documentation = "https://github.com/jtroo/kanata";
-      };
-
-      Service = {
-        Environment = [
-          "PATH=/usr/local/bin:/usr/local/sbin:/usr/bin:/bin"
-          "DISPLAY=:0"
-        ];
-        Type = "simple";
-        ExecStart = "/bin/sh -c 'exec ${lib.getExe pkgs.kanata} --cfg ${./config.kbd}'";
-        Restart = "no";
-      };
-
-      Install.WantedBy = ["default.target"];
-    };
-  };
-}

snowflake/modules/home/xorg/default.nix

@@ -1,13 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.marleyos.xorg;
-in {
-  options.marleyos.xorg.enable = lib.mkEnableOption "xorg";
-
-  # config = lib.mkIf cfg.enable {
-  #
-  # };
-}

snowflake/modules/home/xorg/xsession/default.nix

@@ -1,17 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.marleyos.xorg.xsession;
-in {
-  options.marleyos.xorg.xsession.enable = lib.mkEnableOption "xsession";
-
-  config = lib.mkIf cfg.enable {
-    xsession = {
-      enable = true;
-
-      numlock.enable = true;
-    };
-  };
-}