flake/config.nix

@@ -15,6 +15,10 @@
 
       # TODO: Move these to custom modules
       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 {
           inherit (inputs.nixpkgs) lib;
           inherit inputs;

modules/home/option-inheritance.nix

@@ -3,7 +3,13 @@
 in {
   config = {
     marleycfg = {
-      inherit (cfg) my profiles;
+      profiles = {
+        inherit (cfg.profiles) desktop server;
+      };
+
+      my = {
+        inherit (cfg.my) name fullName username email git;
+      };
     };
   };
 }

modules/home/options/apps.nix

@@ -86,9 +86,18 @@
   };
 
   # config = lib.mkIf pkgs.stdenv.isLinux {
+  #   home.packages = [
+  #     cfg.pinentry
+  #     cfg.clipboard.package
+  #   ];
+  #
   #   # TODO: move these to respective modules
   #   programs.rbw = lib.mkDefault {
   #     settings.pinentry = cfg.pinentry;
   #   };
+  #
+  #   services.gpg-agent = lib.mkDefault {
+  #     pinentryPackage = cfg.pinentry;
+  #   };
   # };
 }

modules/home/profiles.nix

@@ -16,15 +16,7 @@ in {
         bat = enabled;
         curl = enabled;
         eza = enabled;
-        figlet = enabled;
         fish = enabled;
-        gpg = enabled;
-        httpie = enabled;
-        hyfetch = enabled;
-        journalctl = enabled;
-        jq = enabled;
-        just = enabled;
-        less = enabled;
         nh = enabled;
       };
     }
@@ -36,9 +28,7 @@ in {
 
       programs = {
         cheat = enabled;
-        fzf = enabled;
+        figlet = enabled;
-        gh = enabled;
-        glow = enabled;
         nemo = enabled;
       };
 

modules/home/programs/default.nix

@@ -8,17 +8,6 @@
     ./figlet.nix
     ./fish.nix
     ./fuzzel.nix
-    ./fzf.nix
-    ./gh.nix
-    ./git
-    ./glow.nix
-    ./gpg.nix
-    ./httpie.nix
-    ./hyfetch
-    ./journalctl.nix
-    ./jq.nix
-    ./just.nix
-    ./less.nix
     ./nemo.nix
     ./nh.nix
     ./waybar.nix

modules/home/programs/journalctl.nix

@@ -1,19 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  cfg = config.marleyos.programs.journalctl;
-in {
-  options.marleyos.programs.journalctl.enable = lib.mkEnableOption "journalctl";
-
-  config = lib.mkIf (cfg.enable && pkgs.stdenv.isLinux) {
-    home.shellAbbrs = rec {
-      jctlf = "journalctl --follow --unit";
-      jctle = "journalctl --pager-end --unit";
-      sjctlf = "sudo ${jctlf}";
-      sjctle = "sudo ${jctle}";
-    };
-  };
-}

modules/home/programs/jq.nix

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

modules/home/programs/less.nix

@@ -1,27 +0,0 @@
-{
-  marleylib,
-  config,
-  osConfig,
-  lib,
-  ...
-}: let
-  inherit (marleylib.module) mkEnableOption';
-
-  cfg = config.marleyos.programs.less;
-  osCfg = osConfig.marleyos.programs.less;
-in {
-  options.marleyos.programs.less.enable = mkEnableOption' "less" osCfg.enable;
-
-  config = lib.mkIf cfg.enable {
-    programs.less.enable = true;
-
-    home.sessionVariables = let
-      osEnv = osConfig.programs.less.envVariables;
-    in
-      lib.mkIf (osEnv ? LESS) {
-        inherit (osEnv) LESS;
-      };
-
-    programs.lesspipe.enable = true;
-  };
-}

modules/home/shell/wayland.nix

@@ -14,15 +14,5 @@
         Requires = ["graphical-session-pre.target"];
       };
     };
-
-    marleycfg.apps.clipboard = {
-      package = pkgs.wl-clipboard;
-      copy-command = lib.getExe' pkgs.wl-clipboard "wl-copy";
-      paste-command = lib.getExe' pkgs.wl-clipboard "wl-paste";
-    };
-
-    home.packages = [
-      config.marleycfg.apps.clipboard.package
-    ];
   };
 }

modules/nixos/profiles.nix

@@ -14,8 +14,6 @@ in {
       programs = {
         curl = enabled;
         fish = enabled;
-        jq = enabled;
-        less = enabled;
         nh = enabled;
       };
 

modules/nixos/programs/default.nix

@@ -2,8 +2,6 @@
   imports = [
     ./curl.nix
     ./fish.nix
-    ./jq.nix
-    ./less.nix
     ./nh.nix
     ./waybar.nix
   ];

modules/nixos/services/ddclient.nix

@@ -1,6 +1,6 @@
 {
-  config,
   lib,
+  config,
   ...
 }: let
   cfg = config.marleyos.services.ddclient;
@@ -8,8 +8,6 @@ in {
   options.marleyos.services.ddclient.enable = lib.mkEnableOption "ddclient";
 
   config = lib.mkIf cfg.enable {
-    nixpkgs.overlays = [(import ../../../overlays/ddclient.nix)];
-
     age.secrets.ddclient.file = ../../../secrets/ddclient.conf.age;
 
     services.ddclient = {

snowflake/modules/home/programs/cli/fzf/default.nix

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

snowflake/modules/home/programs/cli/gh/default.nix

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

snowflake/modules/home/programs/cli/git/aliases.nix

@@ -1,6 +1,6 @@
 {
-  config,
   lib,
+  config,
   ...
 }: let
   cfg = config.marleyos.programs.git;
@@ -14,7 +14,6 @@ in {
     #    ╚═╝  ╚═╝╚══════╝╚═╝╚═╝  ╚═╝╚══════╝╚══════╝╚══════╝
 
     programs.git.aliases = let
-      has_fish = config.programs.fish.enable;
       fish_fns = config.programs.fish.functions;
     in {
       ### Staging ###
@@ -85,8 +84,8 @@ in {
 
       b = "branch";
       cb = "checkout -b";
-      cm = lib.mkIf (has_fish && (fish_fns ? git_main_branch)) "!git checkout $(git_main_branch)";
+      cm = lib.mkIf (fish_fns ? git_main_branch) "!git checkout $(git_main_branch)";
-      cd = lib.mkIf (has_fish && (fish_fns ? git_develop_branch)) "!git checkout $(git_develop_branch)";
+      cd = lib.mkIf (fish_fns ? git_develop_branch) "!git checkout $(git_develop_branch)";
 
       m = "merge";
       mtl = "mergetool --no-prompt";
@@ -160,9 +159,9 @@ in {
 
       nevermind = "!git reset --hard head && git clean -df";
 
-      open = lib.mkIf (has_fish && (fish_fns ? git_open)) "!fish -c git_open";
+      open = lib.mkIf (config.programs.fish.enable && (fish_fns ? git_open)) "!fish -c git_open";
 
-      chash = "!git log --oneline | gum filter --height 10 | cut -d' ' -f1 | ${config.marleycfg.apps.clipboard.copy-command} &>/dev/null";
+      chash = "!git log --oneline | gum filter --height 10 | cut -d' ' -f1 | ${config.marleyos.apps.clipboard.copy-command} &>/dev/null";
     };
   };
 }

snowflake/modules/home/programs/cli/git/default.nix

@@ -1,12 +1,10 @@
 {
-  config,
   lib,
+  config,
   pkgs,
   ...
 }: let
   cfg = config.marleyos.programs.git;
-
-  inherit (config.marleycfg) my;
 in {
   options.marleyos.programs.git.enable = lib.mkEnableOption "git";
 
@@ -17,6 +15,7 @@ in {
   config = lib.mkIf cfg.enable {
     home.packages = with pkgs; [
       gum
+      config.marleyos.apps.clipboard.package
     ];
 
     #     ██████╗ ██╗████████╗
@@ -29,8 +28,8 @@ in {
     programs.git = {
       enable = true;
 
-      userName = my.git.name;
+      userName = "punkfairie";
-      userEmail = my.git.email;
+      userEmail = "marley@punkfairie.net";
 
       signing = {
         signByDefault = true;

snowflake/modules/home/programs/cli/glow/default.nix

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

snowflake/modules/home/programs/cli/gpg/default.nix

@@ -1,6 +1,6 @@
 {
-  config,
   lib,
+  config,
   ...
 }: let
   cfg = config.marleyos.programs.gpg;
@@ -18,8 +18,6 @@ in {
       # Don't ask for the password very often.
       defaultCacheTtl = 60480000;
       maxCacheTtl = defaultCacheTtl;
-
-      pinentryPackage = config.marleycfg.apps.pinentry;
     };
   };
 }

snowflake/modules/home/programs/cli/httpie/default.nix

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

snowflake/modules/home/programs/cli/hyfetch/default.nix

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

snowflake/modules/home/programs/cli/hyfetch/neofetch.nix

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

snowflake/modules/home/programs/cli/journalctl/default.nix

@@ -0,0 +1,16 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.marleyos.programs.journalctl;
+in {
+  options.marleyos.programs.journalctl.enable = lib.mkEnableOption "journalctl";
+
+  config = lib.mkIf cfg.enable {
+    home.shellAbbrs = {
+      jctlf = "sudo journalctl --follow --unit";
+      jctle = "sudo journalctl --pager-end --unit";
+    };
+  };
+}

snowflake/modules/home/programs/cli/jq/default.nix

@@ -1,7 +1,6 @@
 {
   lib,
   config,
-  pkgs,
   ...
 }: let
   cfg = config.marleyos.programs.jq;
@@ -9,8 +8,8 @@ in {
   options.marleyos.programs.jq.enable = lib.mkEnableOption "jq";
 
   config = lib.mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
+    programs.jq = {
-      jq
+      enable = true;
-    ];
+    };
   };
 }

snowflake/modules/home/programs/cli/just/default.nix

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

snowflake/modules/home/programs/cli/less/default.nix

@@ -1,7 +1,6 @@
 {
-  config,
   lib,
-  pkgs,
+  config,
   ...
 }: let
   cfg = config.marleyos.programs.less;
@@ -9,14 +8,12 @@ in {
   options.marleyos.programs.less.enable = lib.mkEnableOption "less";
 
   config = lib.mkIf cfg.enable {
-    programs.less = {
+    programs.less.enable = true;
-      enable = true;
 
-      envVariables = {
+    home.sessionVariables = {
       LESS = "-R";
     };
 
-      lessopen = "|${pkgs.lesspipe}/bin/lesspipe.sh %s";
+    programs.lesspipe.enable = true;
-    };
   };
 }