Merge branch 'main' of github.com:bloxx12/nichts

This commit is contained in:
get 2024-04-15 13:18:21 +02:00
commit d38a9acc02
5 changed files with 39 additions and 5 deletions

View file

@ -1,5 +1,10 @@
{ config, inputs, pkgs, ... }: { config, inputs, pkgs, ... }:
{ {
imports = [
./hyprland.nix
./programs.nix
];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
time.timeZone = "Europe/Zurich"; time.timeZone = "Europe/Zurich";
security.sudo.package = pkgs.sudo.override { withInsults = true; }; security.sudo.package = pkgs.sudo.override { withInsults = true; };
@ -62,6 +67,10 @@
enable = true; enable = true;
catppuccin = true; catppuccin = true;
}; };
neovim = {
enable = true;
};
}; };
services = { services = {
@ -99,6 +108,9 @@
console.keyMap = "sg"; console.keyMap = "sg";
# services.flatpak.enable = true; # services.flatpak.enable = true;
services = {
twingate.enable = true;
};
system.stateVersion = "23.11"; system.stateVersion = "23.11";
nix.settings.experimental-features = ["nix-command" "flakes"]; nix.settings.experimental-features = ["nix-command" "flakes"];

View file

@ -1,8 +1,6 @@
_: { _: {
imports = [ imports = [
../. ../.
./../programs.nix
./../hyprland.nix
./programs.nix ./programs.nix
./configuration.nix ./configuration.nix
./hardware-configuration.nix ./hardware-configuration.nix

View file

@ -1,8 +1,6 @@
_: { _: {
imports = [ imports = [
../. ../.
./../programs.nix
./../hyprland.nix
./programs.nix ./programs.nix
./configuration.nix ./configuration.nix
./hardware-configuration.nix ./hardware-configuration.nix

View file

@ -43,7 +43,6 @@ in {
smartmontools smartmontools
python3 python3
rustdesk rustdesk
neovim
tmux tmux
kitty kitty
nextcloud-client nextcloud-client
@ -58,6 +57,7 @@ in {
webcord webcord
element-desktop element-desktop
swww swww
toipe
]; ];
}; };
} }

View file

@ -82,6 +82,7 @@ in {
java-language-server.enable = true; java-language-server.enable = true;
#pylyzer.enable = true; #pylyzer.enable = true;
rnix-lsp.enable = true; rnix-lsp.enable = true;
pyright.enable = true;
}; };
#onAttach = '' #onAttach = ''
# vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') # vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
@ -159,11 +160,36 @@ in {
enable = true; enable = true;
settings.theme = "dark"; settings.theme = "dark";
}; };
}; };
extraPlugins = with pkgs.vimPlugins; [ extraPlugins = with pkgs.vimPlugins; [
zen-mode-nvim zen-mode-nvim
lazygit-nvim
]; ];
keymaps = [
{
mode = "n";
key = "<leader>pv";
action = "<cmd>Explore<CR>";
}
{
mode = "n";
key = "<leader>w";
action = "<cmd>w<CR>";
}
{
mode = "n";
key = "<leader>qw";
action = "<cmd>q<CR>";
}
{
mode = "n";
key = "<leader>gg";
action = "<cmd>LazyGit<CR>";
}
];
}; };
}; };
}; };