diff --git a/users/modules/programs/nixvim.nix b/users/modules/programs/nixvim.nix index d93461b..4631ee9 100644 --- a/users/modules/programs/nixvim.nix +++ b/users/modules/programs/nixvim.nix @@ -1,13 +1,13 @@ { inputs, ... }: { imports = [ inputs.nixvim.homeManagerModules.nixvim + ./nixvim/conform-nvim.nix # formatter ./nixvim/lualine.nix # custom statusline ./nixvim/noice.nix # custom CMDLINE ./nixvim/nvim-tree.nix # filetree ./nixvim/treesitter-context.nix # context line ./nixvim/treesitter.nix # syntax highlighting ./nixvim/which-key.nix # show keybind hints - ./nixvim/conform-nvim.nix # formatter ]; programs.nixvim = { enable = true; diff --git a/users/modules/programs/tmux.nix b/users/modules/programs/tmux.nix index a98da3f..5b1b9d1 100644 --- a/users/modules/programs/tmux.nix +++ b/users/modules/programs/tmux.nix @@ -23,6 +23,10 @@ set -g default-terminal "tmux-256color" set -ag terminal-overrides ",tmux-256color:RGB" set -as terminal-features ",tmux-256color:RGB" + + # inherit environment variables from outside so that we can use wl-copy etc + setenv -g WAYLAND_DISPLAY "$WAYLAND_DISPLAY" +setenv -g XDG_RUNTIME_DIR "$XDG_RUNTIME_DIR" ''; }; }