mirror of
https://github.com/foo-dogsquared/nixos-config.git
synced 2025-04-19 00:19:11 +00:00
users/foo-dogsquared/dotfiles: update conditionals and Neovim setup
This commit is contained in:
parent
383d4efcc5
commit
e89ea98f8b
@ -123,7 +123,7 @@ in
|
|||||||
diff = pkgs.diffoscope;
|
diff = pkgs.diffoscope;
|
||||||
pager = config.programs.bat.package;
|
pager = config.programs.bat.package;
|
||||||
editor =
|
editor =
|
||||||
if userCfg.programs.nixvim.enable then
|
if config.programs.nixvim.enable then
|
||||||
config.programs.nixvim.finalPackage
|
config.programs.nixvim.finalPackage
|
||||||
else
|
else
|
||||||
config.programs.neovim.package;
|
config.programs.neovim.package;
|
||||||
|
@ -43,16 +43,22 @@ in
|
|||||||
|
|
||||||
# Comes with a heavy assumption that the Neovim configuration found in this
|
# Comes with a heavy assumption that the Neovim configuration found in this
|
||||||
# home-manager environment will not write to the XDG config directory.
|
# home-manager environment will not write to the XDG config directory.
|
||||||
(lib.mkIf (!config.programs.nixvim.enable) {
|
(lib.mkIf (config.programs.neovim.enable) {
|
||||||
xdg.configFile.nvim.source = getDotfiles "nvim";
|
xdg.configFile.nvim.source = getDotfiles "nvim";
|
||||||
|
|
||||||
programs.neovim.extraPackages = with pkgs; [
|
programs.neovim.extraPackages = with pkgs; [
|
||||||
luarocks
|
luarocks
|
||||||
shfmt
|
shfmt
|
||||||
|
cmake
|
||||||
|
|
||||||
|
# Just assume that there is no clipboard thingy that is already managed
|
||||||
|
# within this home-manager configuration.
|
||||||
|
wl-clipboard
|
||||||
|
xclip
|
||||||
];
|
];
|
||||||
})
|
})
|
||||||
|
|
||||||
(lib.mkIf userCfg.programs.nushell.enable {
|
(lib.mkIf config.programs.nushell.enable {
|
||||||
home.file."${config.xdg.dataHome}/nushell/vendor/autoload".source = getDotfiles "nu/autoload";
|
home.file."${config.xdg.dataHome}/nushell/vendor/autoload".source = getDotfiles "nu/autoload";
|
||||||
})
|
})
|
||||||
]);
|
]);
|
||||||
|
Loading…
Reference in New Issue
Block a user