wip

settings/default.nix

@@ -7,12 +7,12 @@
       theme = lib.mkOption { };
       accent = lib.mkOption { };
       font = lib.mkOption { };
-      username = lib.mkOption { };
+      username = lib.mkOption { type = lib.types.str; };
       mail = lib.mkOption { };
-      dmenu = lib.mkOption { };
+      dmenu = lib.mkOption { type = lib.types.str; };
-      desktop = lib.mkOption { };
+      desktop = lib.mkOption { type = lib.types.str; };
-      browser = lib.mkOption { };
+      browser = lib.mkOption { type = lib.types.str; };
-      editor = lib.mkOption { };
+      editor = lib.mkOption { type = lib.types.str; };
     };
   };
 }

user/fish/default.nix

@@ -6,9 +6,12 @@
 }:
 let
   inherit (config.my) accent editor desktop;
+  cfg = config.my.fish;
 in
 {
-  config = {
+  options.my.fish.enable = lib.mkEnableOption { };
+
+  config = lib.mkIf cfg.enable {
     programs.fish = {
       enable = true;
       shellInit = ''

user/fzf.nix

@@ -2,16 +2,10 @@
   config,
   pkgs,
   lib,
-  inputs,
   ...
 }:
 let
-  inherit (config.my)
+  inherit (config.my) theme accent;
-    key
-    theme
-    accent
-    font
-    ;
   inherit (theme) color;
 
   colors = {

user/gaming.nix

@@ -1,9 +1,24 @@
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 let
   cfg = config.my.gaming;
 in
 {
   options.my.gaming.enable = lib.mkEnableOption { };
   config = lib.mkIf cfg.enable {
+    my.mangohud.enable = true;
+
+    home.packages = with pkgs; [
+      # lutris-unwrapped
+      # steam # It's enabled in the system config
+      tlauncher
+      gamescope
+      glxinfo
+      vulkan-tools
+    ];
   };
 }

user/home.nix

@@ -45,7 +45,11 @@
     ./powerplay-led-idle.nix
   ];
 
-  my = import ./variables.nix;
+  my = import ./variables.nix // {
+    sway.enable = true;
+    pass.enable = true;
+    fish.enable = true;
+  };
 
   # Home Manager needs a bit of information about you and the
   # paths it should manage.
@@ -92,14 +96,6 @@
     mate.engrampa
     # gnome.nautilus
 
-    ## games
-    # lutris-unwrapped
-    # steam # It's enabled in the system config
-    tlauncher
-    gamescope
-    glxinfo
-    vulkan-tools
-
     ## Theming
     orchis_theme_compact
     papirus_red

user/mangohud.nix

@@ -1,22 +1,11 @@
-{
+{ config, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  font,
-  ...
-}:
 let
-  inherit (config.my)
+  cfg = config.my.mangohud;
-    key
-    theme
-    color
-    accent
-    font
-    ;
 in
 {
-  config = {
+  options.my.mangohud.enable = lib.mkEnableOption { };
-    programs.mangohud = {
+
+  config.programs.mangohud = lib.mkIf cfg.enable {
     enable = true;
     enableSessionWide = true;
     settings = {
@@ -76,5 +65,4 @@ in
       # output_folder = "/home/lelgenio";
     };
   };
-  };
 }

user/mpd.nix

@@ -4,8 +4,13 @@
   config,
   ...
 }:
+let
+  cfg = config.my.mpd;
+in
 {
-  config = lib.mkIf (config.my.desktop != "gnome") {
+  options.my.mpd.enable = lib.mkEnableOption { };
+
+  config = lib.mkIf cfg.enable {
     services.mpd = {
       enable = true;
       musicDirectory = config.home.homeDirectory + "/Música";

user/pass.nix

@@ -2,11 +2,15 @@
   config,
   pkgs,
   lib,
-  inputs,
   ...
 }:
+let
+  cfg = config.my.pass;
+in
 {
-  config = {
+  options.my.pass.enable = lib.mkEnableOption { };
+
+  config = lib.mkIf cfg.enable {
     programs.password-store = {
       enable = true;
       package = pkgs.pass.withExtensions (

user/sway/default.nix

@@ -5,13 +5,10 @@
   ...
 }:
 let
-  inherit (config.my)
+  inherit (config.my) accent font theme;
-    key
-    accent
-    font
-    theme
-    ;
   inherit (theme) color;
+
+  cfg = config.my.sway;
 in
 {
   imports = [
@@ -24,10 +21,17 @@ in
     ./swaylock.nix
     ./theme.nix
   ];
-  config = lib.mkIf (config.my.desktop == "sway") {
+
-    services.mako.enable = true;
+  options.my.sway.enable = lib.mkEnableOption { };
-    services.swayidle.enable = true;
+
-    services.kanshi.enable = true;
+  config = lib.mkIf cfg.enable {
+    my.mako.enable = true;
+    my.kanshi.enable = true;
+    my.swayidle.enable = true;
+    my.swaylock.enable = true;
+    my.mpd.enable = true;
+    my.zathura.enable = true;
+    my.waybar.enable = true;
 
     wayland.windowManager.sway = {
       enable = true;
@@ -36,7 +40,7 @@ in
         bars = [ ];
 
         floating.modifier = "Mod4";
-        terminal = pkgs.alacritty.executable;
+        terminal = lib.getExe pkgs.alacritty;
 
         window.titlebar = false;
         gaps = {
@@ -147,7 +151,6 @@ in
       swaylock
       wdisplays
 
-      waybar
       dhist
       demoji
       bmenu

user/sway/kanshi.nix

@@ -1,20 +1,12 @@
-{
+{ config, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 let
-  inherit (config.my)
+  cfg = config.my.kanshi;
-    key
-    accent
-    font
-    theme
-    ;
-  inherit (theme) color;
 in
 {
-  services.kanshi = {
+  options.my.kanshi.enable = lib.mkEnableOption { };
+
+  config.services.kanshi = lib.mkIf cfg.enable {
+    enable = true;
     settings = [
       {
         profile = {

user/sway/mako.nix

@@ -6,15 +6,20 @@
 }:
 let
   inherit (config.my)
-    key
     accent
     font
     theme
     ;
   inherit (theme) color;
+
+  cfg = config.my.mako;
 in
 {
+  options.my.mako.enable = lib.mkEnableOption { };
+
+  config = lib.mkIf cfg.enable {
     services.mako = {
+      enable = true;
       borderSize = 2;
       padding = "5";
       margin = "15";
@@ -62,4 +67,5 @@ in
         WantedBy = [ "sway-session.target" ];
       };
     };
+  };
 }

user/sway/swayidle.nix

@@ -5,18 +5,15 @@
   ...
 }:
 let
-  inherit (config.my)
-    key
-    accent
-    font
-    theme
-    ;
-  inherit (theme) color;
-
   asScript = filename: text: toString (pkgs.writeShellScript filename text);
+
+  cfg = config.my.swayidle;
 in
 {
-  services.swayidle = {
+  options.my.swayidle.enable = lib.mkEnableOption { };
+
+  config.services.swayidle = {
+    enable = cfg.enable;
     timeouts = [
       {
         timeout = 360;

user/sway/swaylock.nix

@@ -1,20 +1,14 @@
-{
+{ config, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 let
-  inherit (config.my)
+  inherit (config.my) accent font theme;
-    key
-    accent
-    font
-    theme
-    ;
   inherit (theme) color;
+
+  cfg = config.my.swaylock;
 in
 {
-  programs.swaylock.settings = {
+  options.my.swaylock.enable = lib.mkEnableOption { };
+
+  config.programs.swaylock.settings = lib.mkIf cfg.enable {
     image = toString theme.background;
     font = font.interface;
     font-size = font.size.medium;

user/waybar/default.nix

@@ -14,9 +14,13 @@ let
     font
     ;
   inherit (theme) color;
+
+  cfg = config.my.waybar;
 in
 {
-  config = {
+  options.my.waybar.enable = lib.mkEnableOption { };
+
+  config = lib.mkIf cfg.enable {
     programs.waybar = {
       enable = true;
       systemd.enable = true;

user/zathura.nix

@@ -1,10 +1,4 @@
-{
+{ config, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  font,
-  ...
-}:
 let
   inherit (config.my)
     key
@@ -13,11 +7,16 @@ let
     theme
     ;
   inherit (theme) color;
+
+  cfg = config.my.zathura;
 in
 {
-  config = {
+  options.my.zathura.enable = lib.mkEnableOption { };
-    programs.zathura.enable = true;
+
-    programs.zathura.options = {
+  config = lib.mkIf cfg.enable {
+    programs.zathura = {
+      enable = true;
+      options = {
         font = "${font.mono} ${toString font.size.small}";
         guioptions = "s";
 
@@ -49,7 +48,7 @@ in
         index-active-bg = accent.color;
         index-active-fg = accent.fg;
       };
-    programs.zathura.mappings = {
+      mappings = {
         "<C-b>" = "toggle_statusbar";
         ${key.left} = "scroll left";
         ${key.down} = "scroll down";
@@ -65,4 +64,5 @@ in
         ${lib.toUpper key.next} = "search backward";
       };
     };
+  };
 }