This commit is contained in:
Varris 2023-05-25 23:47:29 +02:00
parent 142c2a6103
commit 88d278f528
6 changed files with 56 additions and 56 deletions

View File

@ -130,7 +130,8 @@
# $ nix search wget
environment = {
systemPackages = with pkgs; [
bc distrobox fd file git htop links2 libsForQt5.dolphin libsForQt5.kio-extras lm_sensors nvtop-amd openrgb p7zip pciutils ripgrep unrar unzip usbutils
bc compsize distrobox fd file git htop links2 libsForQt5.dolphin
libsForQt5.kio-extras lm_sensors nvtop-amd openrgb p7zip pciutils ripgrep unrar unzip usbutils
];
};

View File

@ -51,16 +51,16 @@
nix.registry = { nixpkgs.flake = nixpkgs; };
}
./configuration.nix
home-manager.nixosModules.home-manager
{
home-manager = {
useUserPackages = true;
users.manuel = import ./user/home.nix;
extraSpecialArgs = { inherit inputs pkgs; };
};
}
inputs.grub2-themes.nixosModules.default
home-manager.nixosModules.home-manager
{
home-manager = {
useUserPackages = true;
users.manuel = import ./user/home.nix;
extraSpecialArgs = { inherit inputs pkgs; };
};
}
inputs.chaotic-nyx.nixosModules.default
inputs.grub2-themes.nixosModules.default
];
};
};

View File

@ -4,17 +4,18 @@
arrpc = inputs.arrpc.packages.${prev.system}.arrpc;
catppuccin-kvantum-macchiato = prev.catppuccin-kvantum.override {
accent = "Lavender";
variant = "Macchiato";
};
catppuccin-gtk-macchiato = prev.catppuccin-gtk.override {
accents = [ "lavender" ];
size = "standard";
variant = "macchiato";
};
catppuccin-kvantum-macchiato = prev.catppuccin-kvantum.override {
accent = "Lavender";
variant = "Macchiato";
};
catppuccin-papirus-folders-macchiato = prev.catppuccin-papirus-folders.override {
accent = "lavender";
flavor = "macchiato";
@ -69,6 +70,5 @@
prev.xorg.libpciaccess
];
});
};
}

View File

@ -4,19 +4,21 @@
enable = true;
plugins = with pkgs.vimPlugins; [
nvim-web-devicons
catppuccin-nvim
lualine-nvim
bufferline-nvim
nvim-colorizer-lua
nvim-autopairs
catppuccin-nvim
comment-nvim
neo-tree-nvim
nvim-notify
which-key-nvim
nvim-surround
luasnip
dressing-nvim
lualine-nvim
luasnip
neo-tree-nvim
nvim-autopairs
nvim-colorizer-lua
nvim-notify
nvim-surround
nvim-web-devicons
which-key-nvim
vim-fugitive
telescope-nvim
telescope-fzf-native-nvim
@ -24,25 +26,25 @@
nvim-lspconfig
nvim-treesitter.withAllGrammars
trouble-nvim
vim-fugitive
nvim-cmp
lspkind-nvim
cmp-cmdline
cmp-path
cmp-buffer
cmp-cmdline
cmp-nvim-lsp
cmp-path
cmp_luasnip
friendly-snippets
lspkind-nvim
];
extraLuaConfig = builtins.readFile ./init.lua;
extraPackages = with pkgs; [
nil
lua-language-server
clang-tools
lua-language-server
nil
rust-analyzer
nodePackages.vscode-css-languageserver-bin
];
};
}

View File

@ -49,9 +49,9 @@ require("bufferline").setup({
},
})
require("colorizer").setup()
require("nvim-autopairs").setup()
require("Comment").setup()
require("colorizer").setup({})
require("nvim-autopairs").setup({})
require("Comment").setup({})
require("neo-tree").setup({
default_component_configs = {
@ -104,6 +104,8 @@ telescope.load_extension("fzf")
require('nvim-surround').setup()
local capabilities = require('cmp_nvim_lsp').default_capabilities()
capabilities.textDocument.completion.completionItem.snippetSupport = true
local lspconfig = require("lspconfig")
lspconfig.nil_ls.setup {
capabilities = capabilities,
@ -112,22 +114,26 @@ lspconfig.lua_ls.setup {
capabilities = capabilities,
settings = {
Lua = {
diagnostics = {
globals = { "vim" },
},
telemetry = {
enable = false,
runtime = { version = "LuaJIT" },
diagnostics = { globals = { "vim" } },
workspace = {
library = vim.api.nvim_get_runtime_file("", true),
checkThirdParty = false
},
telemetry = { enable = false },
},
},
}
lspconfig.clangd.setup {
capabilities = capabilities,
}
lspconfig.clangd.setup { capabilities = capabilities }
lspconfig.rust_analyzer.setup { capabilities = capabilities }
lspconfig.rust_analyzer.setup {
lspconfig.cssls.setup {
capabilities = capabilities,
cmd = { "css-languageserver", "--stdio" },
settings = {
css = { validate = false },
}
}
require("luasnip.loaders.from_vscode").lazy_load()
@ -146,7 +152,7 @@ cmp.setup({
preselect = cmp.PreselectMode.None,
formatting = {
format = lspkind.cmp_format ({
mode = "symbol",
mode = "symbol_text",
symbol_map = {
Text = "󰉿",

View File

@ -1,4 +1,4 @@
{ pkgs, inputs, ... }:
{ pkgs, ... }:
{
imports = [
./configs/beets
@ -16,8 +16,6 @@
./configs/tmux
];
# Home Manager needs a bit of information about you and the
# paths it should manage.
home.username = "manuel";
home.homeDirectory = "/home/manuel";
home.packages = with pkgs; [
@ -158,14 +156,7 @@
music = "/mnt/hdd/Music";
download = "/mnt/hdd/Downloads";
};
# This value determines the Home Manager release that your
# configuration is compatible with. This helps avoid breakage
# when a new Home Manager release introduces backwards
# incompatible changes.
#
# You can update Home Manager without changing this value. See
# the Home Manager release notes for a list of state version
# changes in each release.
home.stateVersion = "22.05";
}