diff --git a/modules/alacritty.nix b/modules/desktop/alacritty.nix similarity index 67% rename from modules/alacritty.nix rename to modules/desktop/alacritty.nix index 21a99c1..73f8def 100644 --- a/modules/alacritty.nix +++ b/modules/desktop/alacritty.nix @@ -6,8 +6,6 @@ # (November 2021) let - cfg = config.sconfig.alacritty; - configText = builtins.toJSON { env.TERM = "xterm-256color"; @@ -43,26 +41,21 @@ let in { - options.sconfig.alacritty.enable = lib.mkEnableOption "Enable Alacritty"; + environment.etc."xdg/alacritty.yml".text = configText; - config = lib.mkIf cfg.enable { + environment.systemPackages = [ + pkgs.alacritty + (pkgs.writeTextFile { + name = "alacritty.yml"; + destination = "/etc/xdg/alacritty.yml"; + text = configText; + }) + ]; - environment.etc."xdg/alacritty.yml".text = configText; - - environment.systemPackages = [ - pkgs.alacritty - (pkgs.writeTextFile { - name = "alacritty.yml"; - destination = "/etc/xdg/alacritty.yml"; - text = configText; - }) - ]; - - programs.bash.interactiveShellInit = '' - function _set_title() { - printf "\033]0;%s@%s:%s\007" "''${USER}" "''${HOSTNAME%%.*}" "''${PWD/#$HOME/\~}" - } - [ -z "$VTE_VERSION" ] && PROMPT_COMMAND="_set_title; $PROMPT_COMMAND" - ''; - }; + programs.bash.interactiveShellInit = '' + function _set_title() { + printf "\033]0;%s@%s:%s\007" "''${USER}" "''${HOSTNAME%%.*}" "''${PWD/#$HOME/\~}" + } + [ -z "$VTE_VERSION" ] && PROMPT_COMMAND="_set_title; $PROMPT_COMMAND" + ''; } diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index aebfa23..602b052 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -6,6 +6,7 @@ with lib; }; imports = [ + ./alacritty.nix ./chromium.nix ./firefox.nix ]; @@ -27,7 +28,6 @@ with lib; }; sconfig = { - alacritty.enable = true; security-tools = true; };