From 01f47b02935d550005ef57126f0b7143eb144cee Mon Sep 17 00:00:00 2001
From: LarsZauberer <wasser.ian@gmail.com>
Date: Mon, 15 Apr 2024 10:50:56 +0200
Subject: [PATCH 1/4] Update config structure in lars

---
 hosts/lars/default.nix          | 9 +++++++++
 hosts/lars/dyonisos/default.nix | 2 --
 hosts/lars/kronos/default.nix   | 2 --
 hosts/lars/programs.nix         | 1 -
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/hosts/lars/default.nix b/hosts/lars/default.nix
index e2c5d9c..e1d3cb1 100644
--- a/hosts/lars/default.nix
+++ b/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 = {
diff --git a/hosts/lars/dyonisos/default.nix b/hosts/lars/dyonisos/default.nix
index 2d68268..22a270e 100644
--- a/hosts/lars/dyonisos/default.nix
+++ b/hosts/lars/dyonisos/default.nix
@@ -1,8 +1,6 @@
 _: {
     imports = [
       ../.
-      ./../programs.nix
-      ./../hyprland.nix
       ./programs.nix
       ./configuration.nix
       ./hardware-configuration.nix
diff --git a/hosts/lars/kronos/default.nix b/hosts/lars/kronos/default.nix
index 2d68268..22a270e 100644
--- a/hosts/lars/kronos/default.nix
+++ b/hosts/lars/kronos/default.nix
@@ -1,8 +1,6 @@
 _: {
     imports = [
       ../.
-      ./../programs.nix
-      ./../hyprland.nix
       ./programs.nix
       ./configuration.nix
       ./hardware-configuration.nix
diff --git a/hosts/lars/programs.nix b/hosts/lars/programs.nix
index ed7673c..aa06b8c 100644
--- a/hosts/lars/programs.nix
+++ b/hosts/lars/programs.nix
@@ -43,7 +43,6 @@ in {
             smartmontools
             python3
             rustdesk
-            neovim
             tmux
             kitty
             nextcloud-client

From 4ffa2095b1337af405eacbf220179ec098ef7c16 Mon Sep 17 00:00:00 2001
From: LarsZauberer <wasser.ian@gmail.com>
Date: Mon, 15 Apr 2024 10:51:11 +0200
Subject: [PATCH 2/4] added some things in neovim config

---
 modules/tui/neovim.nix | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/modules/tui/neovim.nix b/modules/tui/neovim.nix
index e87674d..1b99f54 100644
--- a/modules/tui/neovim.nix
+++ b/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,11 +160,36 @@ 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>q";
+                action = "<cmd>q<CR>";
+            }
+            {
+                mode = "n";
+                key = "<leader>gg";
+                action = "<cmd>LazyGit<CR>";
+            }
+		];
             };
         };
     };

From e33a1c11da1a5cc18d1cd975f9f6f95b0e9550eb Mon Sep 17 00:00:00 2001
From: LarsZauberer <wasser.ian@gmail.com>
Date: Mon, 15 Apr 2024 11:36:17 +0200
Subject: [PATCH 3/4] Added some programs

---
 hosts/lars/default.nix  | 3 +++
 hosts/lars/programs.nix | 1 +
 2 files changed, 4 insertions(+)

diff --git a/hosts/lars/default.nix b/hosts/lars/default.nix
index e1d3cb1..6915250 100644
--- a/hosts/lars/default.nix
+++ b/hosts/lars/default.nix
@@ -108,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"];
diff --git a/hosts/lars/programs.nix b/hosts/lars/programs.nix
index aa06b8c..ed152b6 100644
--- a/hosts/lars/programs.nix
+++ b/hosts/lars/programs.nix
@@ -56,6 +56,7 @@ in {
             xdg-utils # xdg-mime script
             webcord
             element-desktop
+            toipe
         ];
     };
 }

From 67d9bbee4e20d2f46439e5dd94b9cdfc2a424eaa Mon Sep 17 00:00:00 2001
From: LarsZauberer <wasser.ian@gmail.com>
Date: Mon, 15 Apr 2024 12:23:39 +0200
Subject: [PATCH 4/4] Fixed quit keymap in nvim

---
 modules/tui/neovim.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tui/neovim.nix b/modules/tui/neovim.nix
index 1b99f54..a05a53d 100644
--- a/modules/tui/neovim.nix
+++ b/modules/tui/neovim.nix
@@ -181,7 +181,7 @@ in {
             }
             {
                 mode = "n";
-                key = "<leader>q";
+                key = "<leader>qw";
                 action = "<cmd>q<CR>";
             }
             {