Initial port to 24.05

This commit is contained in:
Dave Gallant
2024-05-29 19:56:38 -04:00
parent b233b7b99e
commit 02386185bc
5 changed files with 327 additions and 309 deletions

View File

@@ -7,7 +7,7 @@ let
inherit (pkgs) stdenv;
in
{
home.stateVersion = "23.11";
home.stateVersion = "24.05";
home.packages = with pkgs; [ just ];
@@ -15,18 +15,9 @@ in
base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml";
targets.nixvim.enable = false; # tokyonight module missing?
targets.vscode.enable = false; # overrides synced settings
targets.alacritty.enable = true;
targets.alacritty.enable = false;
targets.tmux.enable = true;
fonts.sizes =
if stdenv.isLinux
then {
terminal = 14;
}
else {
terminal = 16;
};
fonts.monospace = {
name = "FiraCode Nerd Font Mono";
package = "${pkgs.fira-mono}";
@@ -130,7 +121,7 @@ in
zsh = {
enable = true;
enableAutosuggestions = true;
autosuggestion.enable = true;
enableCompletion = true;
syntaxHighlighting.enable = true;
history.size = 1000000;
@@ -229,6 +220,15 @@ in
args = [ "-l" "-c" "tmux" "u" ];
};
font =
if stdenv.isLinux
then {
size = 20;
}
else {
size = 16;
};
colors = {
primary.background = "#1a1b26";
primary.foreground = "#a9b1d6";
@@ -256,25 +256,6 @@ in
cyan = "#0db9d7";
white = "#acb0d0";
};
key_bindings = [
{
key = "Home";
mods = "Control";
action = "ResetFontSize";
}
{
key = "Plus";
mods = "Control";
action = "IncreaseFontSize";
}
{
key = "Minus";
mods = "Control";
action = "DecreaseFontSize";
}
];
};
};
};
@@ -364,13 +345,10 @@ in
'';
};
rofi = {
wofi = {
enable = stdenv.isLinux;
plugins = [ pkgs.rofi-emoji ];
terminal = "${pkgs.alacritty}/bin/alacritty";
extraConfig = {
modi = "drun,run";
show-icons = true;
settings = {
location = "center";
};
};
@@ -382,7 +360,7 @@ in
enable = true;
viAlias = true;
vimAlias = true;
colorschemes.tokyonight = {
colorschemes.tokyonight.settings.style = {
enable = true;
style = "night";
};
@@ -420,6 +398,16 @@ in
mode = [ "n" ];
action = "<cmd>lua vim.lsp.buf.references()<CR>";
}
{
key = "<leader>ff";
mode = [ "n" ];
action = "<cmd>Telescope Git Files<CR>";
}
{
key = "<leader>fg";
mode = [ "n" ];
action = "<cmd>live_grep<CR>";
}
];
plugins = {
@@ -435,11 +423,11 @@ in
lualine.enable = true;
lsp.enable = true;
lsp.servers = {
#ansiblels.enable = true;
ansiblels.enable = true;
bashls.enable = true;
#dockerls.enable = true;
dockerls.enable = true;
gopls.enable = true;
#helm-ls.enable = true;
helm-ls.enable = true;
jsonls.enable = true;
pyright.enable = true;
nixd.enable = true;
@@ -454,7 +442,7 @@ in
go = { };
};
};
nvim-cmp.enable = true;
cmp.enable = true;
nvim-tree.enable = true;
packer = {
enable = true;
@@ -464,7 +452,7 @@ in
treesitter.enable = true;
telescope = {
enable = true;
defaults = {
settings.defaults = {
layout_strategy = "vertical";
layout_config = {
vertical = {
@@ -473,17 +461,9 @@ in
};
};
package = pkgs.vimPlugins.telescope-fzy-native-nvim;
keymaps = {
"<leader>ff" = {
action = "git_files";
desc = "Telescope Git Files";
};
"<leader>fg" = "live_grep";
};
keymapsSilent = true;
};
};
options = {
opts = {
autoindent = true;
backup = false;
belloff = "all";