nezia/flocon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

treewide: move nvf back to repo, switch theme on vamos to rose-pine

Browse source
This commit is contained in:
Anthony Rodriguez 2024-12-04 22:22:45 +01:00
parent 378ac8e01c
commit 7e5a0442ec
Signed by: nezia
GPG key ID: EE3BE97C040A86CE
8 changed files with 831 additions and 431 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1000
flake.lock
View file

File diff suppressed because it is too large Load diff

5
flake.nix
View file

@ -59,10 +59,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
niri.url = "github:sodiboo/niri-flake";
neovim-flake = {
url = "git+https://git.nezia.dev/nezia/neovim-flake";
inputs.nixpkgs.follows = "nixpkgs";
};
nvf.url = "github:notashelf/nvf";
portfolio.url = "github:nezia1/portfolio";
plasma-manager = {
url = "github:nix-community/plasma-manager";

3
home/programs/default.nix
View file

@ -7,7 +7,6 @@
./browsers
./media
./xdg.nix
./gtk.nix
./editors/helix.nix
];
@ -45,7 +44,5 @@
simple-scan
vesktop
wl-clipboard
inputs.neovim-flake.packages.${pkgs.system}.default
];
}

216
home/programs/editors/neovim.nix Normal file
View file

@ -0,0 +1,216 @@
{
inputs,
pkgs,
...
}: {
imports = [inputs.nvf.homeManagerModules.default];
programs.nvf = {
enable = true;
settings.vim = {
viAlias = true;
vimAlias = true;
enableLuaLoader = true;
preventJunkFiles = true;
options.tabstop = 4;
autoIndent = false;
useSystemClipboard = true;
luaConfigPost = ''
vim.opt.formatoptions:remove('c')
vim.opt.formatoptions:remove('r')
vim.opt.formatoptions:remove('o')
'';
maps = {
normal = {
"<leader>m" = {
silent = true;
action = "<cmd>make<CR>";
}; # Same as nnoremap <leader>m <silent> <cmd>make<CR>
"<leader>t" = {
silent = true;
action = "<cmd>Neotree toggle<CR>";
};
};
};
theme = {
enable = true;
name = "catppuccin";
style = "macchiato";
};
ui = {
noice.enable = true;
};
notify.nvim-notify.enable = true;
statusline = {
lualine = {
enable = true;
theme = "auto";
componentSeparator = {
left = "";
};
sectionSeparator = {
left = "";
right = "";
};
activeSection = {
a = [
''
{
"mode",
separator = { right = "" },
right_padding = 2
}
''
];
b = [
''
{
"branch",
icon = '',
separator = { right = "" }
}
''
];
c = [
''
"filename"
''
];
x = [
''
{
"diagnostics",
sources = {'nvim_lsp', 'nvim_diagnostic', 'nvim_diagnostic', 'vim_lsp', 'coc'},
symbols = {error = '󰅙 ', warn = ' ', info = ' ', hint = '󰌵 '},
colored = true,
update_in_insert = false,
always_visible = false,
diagnostics_color = {
color_error = { fg = 'red' },
color_warn = { fg = 'yellow' },
color_info = { fg = 'cyan' },
},
}
''
''
"filetype"
''
];
y = [
''
{
"progress",
separator = { left = "" },
}
''
''
''
];
z = [
''
{
"location",
separator = { left = "" },
left_padding = 2
}
''
''
{
"fileformat",
color = {fg='black'},
symbols = {
unix = '', -- e712
dos = '', -- e70f
mac = '', -- e711
},
}
''
];
};
inactiveSection = {
a = [
''
"filename"
''
];
z = [
''
"location"
''
];
};
};
};
git.enable = true;
utility = {
vim-wakatime.enable = true;
};
lsp = {
enable = true;
lspSignature.enable = true;
lspconfig.enable = true;
formatOnSave = true;
mappings = {
addWorkspaceFolder = "<leader>wa";
codeAction = "<leader>a";
goToDeclaration = "gD";
goToDefinition = "gd";
hover = "K";
listImplementations = "gi";
listReferences = "gr";
listWorkspaceFolders = "<leader>wl";
nextDiagnostic = "<leader>k";
previousDiagnostic = "<leader>j";
openDiagnosticFloat = "<leader>e";
removeWorkspaceFolder = "<leader>wr";
renameSymbol = "<leader>r";
signatureHelp = "<C-k>";
};
};
autocomplete.nvim-cmp = {
enable = true;
};
autopairs.nvim-autopairs.enable = true;
languages = {
enableExtraDiagnostics = true;
enableFormat = true;
enableLSP = true;
enableTreesitter = true;
nix.enable = true;
clang.enable = true;
python.enable = true;
ts.enable = true;
css.enable = true;
};
treesitter = {
enable = true;
fold = true;
context.enable = true;
grammars = [
pkgs.vimPlugins.nvim-treesitter.builtGrammars.nix
pkgs.vimPlugins.nvim-treesitter.builtGrammars.c
pkgs.vimPlugins.nvim-treesitter.builtGrammars.python
];
};
binds.whichKey.enable = true;
filetree.neo-tree.enable = true;
telescope.enable = true;
};
};
}

25
home/programs/gtk.nix
View file

@ -1,25 +0,0 @@
{
pkgs,
config,
...
}: {
gtk = {
enable = true;
font = {
name = "Inter";
package = pkgs.inter;
size = 11;
};
gtk3.extraConfig = {
gtk-decoration-layout = ":menu";
};
gtk4.extraConfig = {
gtk-decoration-layout = ":menu";
};
gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
};
}

6
hosts/vamos/default.nix
View file

@ -42,9 +42,11 @@ in {
"${home}/programs/swaylock.nix"
"${home}/programs/swayidle.nix"
"${home}/terminal/emulators/foot.nix"
"${home}/services/syncthing.nix"
"${home}/programs/editors/neovim.nix"
"${home}/terminal/emulators/foot.nix"
];
extraSpecialArgs = specialArgs;
};

5
hosts/vamos/modules/theme.nix
View file

@ -5,5 +5,10 @@
url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/e0cf0eb237dc5baba86661a3572b20a6183c1876/wallpapers/nix-wallpaper-nineish-catppuccin-frappe.png?raw=true";
hash = "sha256-/HAtpGwLxjNfJvX5/4YZfM8jPNStaM3gisK8+ImRmQ4=";
};
schemeName = "rose-pine-moon";
gtk.theme = {
name = "rose-pine-moon";
package = pkgs.rose-pine-gtk-theme;
};
};
}

2
modules/theme/default.nix
View file

@ -90,7 +90,7 @@ in {
programs = {
niri = {
settings = {
layout.focus-ring.active.color = scheme.palette.base0E;
layout.focus-ring.active.color = scheme.palette.base0D;
cursor = {
inherit (config.theme.cursorTheme) size;
theme = config.theme.cursorTheme.name;