diff --git a/hosts/marty-latitude.nix b/hosts/marty-latitude.nix index 8afba0c..488631f 100644 --- a/hosts/marty-latitude.nix +++ b/hosts/marty-latitude.nix @@ -13,24 +13,11 @@ hostName = "marty-latitude"; }; - development = { - vscodium.enable = true; - git.enable = true; - }; - terminal = { - kitty.enable = true; - }; - window_manager = { - hyprland.enable = true; - waybar.enable = true; - walker.enable = true; - }; home-manager = { extraSpecialArgs = { inherit inputs; }; useGlobalPkgs = true; useUserPackages = true; - users = { marty = import ./../modules/home.nix; }; diff --git a/modules/home.nix b/modules/home.nix index 8f61a28..e17d719 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -2,6 +2,7 @@ config, pkgs, inputs, + lib, ... }: @@ -81,6 +82,21 @@ EDITOR = "codium"; }; + + development = { + vscodium.enable = true; + git.enable = true; + }; + terminal = { + kitty.enable = true; + ranger.enable = true; + }; + window_manager = { + hyprland.enable = true; + waybar.enable = true; + walker.enable = true; + }; + imports = [ ./window_manager ./development diff --git a/modules/terminal/default.nix b/modules/terminal/default.nix index 172004f..215dca1 100644 --- a/modules/terminal/default.nix +++ b/modules/terminal/default.nix @@ -8,7 +8,7 @@ { imports = [ ./kitty.nix - ./vscodium.nix + ./ranger.nix ]; } diff --git a/modules/terminal/ranger.nix b/modules/terminal/ranger.nix new file mode 100644 index 0000000..e688d9f --- /dev/null +++ b/modules/terminal/ranger.nix @@ -0,0 +1,22 @@ +{ + config, + lib, + pkgs, + ... +}: + +{ + options = { + terminal = { + ranger.enable = lib.mkEnableOption "enable ranger"; + }; + }; + + config = lib.mkIf config.terminal.ranger.enable { + programs = { + ranger = { + enable = true; + }; + }; + }; +} diff --git a/modules/window_manager/walker.nix b/modules/window_manager/walker.nix index cb42bf4..2ac417c 100644 --- a/modules/window_manager/walker.nix +++ b/modules/window_manager/walker.nix @@ -2,6 +2,7 @@ config, pkgs, inputs, + lib, ... }: