diff --git a/modules/home-manager/common.nix b/modules/home-manager/common.nix index 89d5dce..7d18e4b 100644 --- a/modules/home-manager/common.nix +++ b/modules/home-manager/common.nix @@ -18,6 +18,7 @@ zellij broot cargo + tmux ]; # TODO: specify an email? diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index d758982..251f3d9 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -25,6 +25,7 @@ linux-desktop = import ./linux-desktop.nix; sway = import ./sway.nix; sway-laptop = import ./sway-laptop.nix; + tmux = import ./tmux.nix; dragon = import ./dragon.nix; thinker = import ./thinker.nix; diff --git a/modules/home-manager/tmux.nix b/modules/home-manager/tmux.nix index 52a6d21..ebfec35 100644 --- a/modules/home-manager/tmux.nix +++ b/modules/home-manager/tmux.nix @@ -102,9 +102,7 @@ bind -T off M-O \ set -u prefix \;\ set -u key-table \;\ - source-file "$HOME/.tmux.conf" - - source-file "$ENV_PATH/*/tmux.d.conf" + source-file "$HOME/.config/tmux/tmux.conf" # set -g @plugin 'tmux-plugins/tpm' # set -g @plugin 'tmux-plugins/tmux-resurrect' diff --git a/nixos/router/default.nix b/nixos/router/default.nix index 779dc43..b012b04 100644 --- a/nixos/router/default.nix +++ b/nixos/router/default.nix @@ -27,16 +27,10 @@ in { networking.hostName = "router"; networking.domain = "h.lyte.dev"; - imports = - [ - inputs.disko.nixosModules.disko - flake.diskoConfigurations.unencrypted - ] - ++ [ - # inputs.hardware.nixosModules.common-cpu-amd - # inputs.hardware.nixosModules.common-cpu-amd-pstate - # inputs.hardware.nixosModules.common-pc-laptop-ssd - ]; + imports = [ + inputs.disko.nixosModules.disko + flake.diskoConfigurations.unencrypted + ]; # TODO: perform a hardware scan