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

hosts/lars/default.nix

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

hosts/lars/dyonisos/default.nix

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

hosts/lars/kronos/default.nix

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

hosts/lars/programs.nix

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

modules/tui/neovim.nix

@@ -82,6 +82,7 @@ in {
                             java-language-server.enable = true;
                             #pylyzer.enable = true;
                             rnix-lsp.enable = true;
+			                pyright.enable = true;
                         };
                         #onAttach = ''
                         #    vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
@@ -159,10 +160,35 @@ in {
                         enable = true;
                         settings.theme = "dark";
                     };
+
                 };
 
                 extraPlugins = with pkgs.vimPlugins; [
                     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>";
+            }
 		];
             };
         };