diff --git a/hosts/homes/ambroisie@mousqueton/default.nix b/hosts/homes/ambroisie@mousqueton/default.nix index 37884d7..44e62e6 100644 --- a/hosts/homes/ambroisie@mousqueton/default.nix +++ b/hosts/homes/ambroisie@mousqueton/default.nix @@ -15,9 +15,6 @@ # I use scripts that use the passthrough sequence often on this host enablePassthrough = true; - # Frequent reboots mean that session persistence can be handy - enableResurrect = true; - terminalFeatures = { # HTerm uses `xterm-256color` as its `$TERM`, so use that here xterm-256color = { }; diff --git a/modules/home/packages/default.nix b/modules/home/packages/default.nix index 43f7111..b0f8d67 100644 --- a/modules/home/packages/default.nix +++ b/modules/home/packages/default.nix @@ -1,7 +1,6 @@ -{ config, lib, pkgs, osConfig, ... }: +{ config, lib, pkgs, ... }: let cfg = config.my.home.packages; - useGlobalPkgs = osConfig.home-manager.useGlobalPkgs or false; in { options.my.home.packages = with lib; { @@ -30,7 +29,7 @@ in tree ] ++ cfg.additionalPackages); - nixpkgs.config = lib.mkIf (!useGlobalPkgs) { + nixpkgs.config = { inherit (cfg) allowAliases allowUnfree; }; }; diff --git a/modules/home/pager/default.nix b/modules/home/pager/default.nix index e84dcb7..1119440 100644 --- a/modules/home/pager/default.nix +++ b/modules/home/pager/default.nix @@ -16,11 +16,7 @@ in LESS = "-R -+X -c"; # Better XDG compliance LESSHISTFILE = "${config.xdg.stateHome}/less/history"; + LESSKEY = "${config.xdg.configHome}/less/lesskey"; }; - - xdg.configFile."lesskey".text = '' - # Quit without clearing the screen on `Q` - Q toggle-option -!^Predraw-on-quit\nq - ''; }; } diff --git a/modules/home/tmux/default.nix b/modules/home/tmux/default.nix index 4536628..ae8b8f0 100644 --- a/modules/home/tmux/default.nix +++ b/modules/home/tmux/default.nix @@ -20,8 +20,6 @@ in enablePassthrough = mkEnableOption "tmux DCS passthrough sequence"; - enableResurrect = mkEnableOption "tmux-resurrect plugin"; - terminalFeatures = mkOption { type = with types; attrsOf (submodule { options = { @@ -52,7 +50,6 @@ in mouse = false; # I dislike mouse support focusEvents = true; # Report focus events terminal = "tmux-256color"; # I want accurate termcap info - aggressiveResize = true; # Automatic resize when switching client size plugins = with pkgs.tmuxPlugins; [ # Open high-lighted files in copy mode @@ -82,13 +79,6 @@ in set -g status-right '#{prefix_highlight} %a %Y-%m-%d %H:%M' ''; } - # Resurrect sessions - (lib.optionalAttrs cfg.enableResurrect { - plugin = resurrect; - extraConfig = '' - set -g @resurrect-dir '${config.xdg.stateHome}/tmux/resurrect' - ''; - }) ]; extraConfig = ''