added nixvim

users/willifan/Anton/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   
-}
+}

users/willifan/Lenni/auto-cpufreq.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   services.auto-cpufreq = {
     enable = true;
@@ -13,4 +13,4 @@
       };
     };
   };
-}
+}

users/willifan/Lenni/default.nix

@@ -1,7 +1,7 @@
-{ pkgs, ... }:
+{ ... }:
 {
   imports = [
     ./auto-cpufreq.nix
     ./backlight.nix
   ];
-}
+}

users/willifan/Puenktchen/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   
-}
+}

users/willifan/common/default.nix

@@ -1,10 +1,11 @@
-{ pkgs, home-manager, ... }:
+{ ... }:
 {
   imports = [
     ./envvar.nix
     ./git.nix
     ./hyfetch.nix
     ./locales.nix
+    ./nixvim
     #./ssh.nix
     ./user.nix
     ./zsh.nix

users/willifan/common/envvar.nix

@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ ... }:
 {
-  environment.sessionVariables = rec {
+  environment.sessionVariables = {
     NIXOS_OZONE_WL = "1";
     XDG_CACHE_HOME  = "$HOME/.cache";
     XDG_CONFIG_HOME = "$HOME/.config";
@@ -13,4 +13,4 @@
     #  "${XDG_BIN_HOME}"
     #];
   };
-}
+}

users/willifan/common/git.nix

@@ -1,4 +1,4 @@
-{ pkgs, home-manager, ... }:
+{ pkgs, ... }:
 {
   home-manager.users.willifan = {
     programs.git = {
@@ -11,4 +11,4 @@
       };
     };
   };
-}
+}

users/willifan/common/hyfetch.nix

@@ -1,4 +1,4 @@
-{ pkgs, home-manager, ... }:
+{ ... }:
 
 {
   home-manager.users.willifan = {

users/willifan/common/locales.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   time.timeZone = "Europe/Berlin";
   i18n.defaultLocale = "en_US.UTF-8";
@@ -13,4 +13,4 @@
     LC_TELEPHONE = "de_DE.UTF-8";
     LC_TIME = "de_DE.UTF-8";
   };
-}
+}

users/willifan/common/nixvim/default.nix

@@ -0,0 +1,17 @@
+{ ... }:
+{
+
+  programs.nixvim = {
+    enable = true;
+  };
+
+  imports = [
+    ./gitsigns.nix
+    ./illuminate.nix
+    ./lsp.nix
+    ./navic.nix
+    ./neotree.nix
+    ./toggleterm.nix
+  ];
+
+}

users/willifan/common/nixvim/gitsigns.nix

@@ -0,0 +1,28 @@
+{ ... }:
+{
+  programs.nixvim.plugins.gitsigns = {
+    enable = true;
+    settings = {
+      signs = {
+        add = {
+          text = " ";
+        };
+        change = {
+          text = " ";
+        };
+        delete = {
+          text = " ";
+        };
+        untracked = {
+          text = "";
+        };
+        topdelete = {
+          text = "󱂥 ";
+        };
+        changedelete = {
+          text = "󱂧 ";
+        };
+      };
+    };
+  };
+}

users/willifan/common/nixvim/illuminate.nix

@@ -0,0 +1,18 @@
+{ ... }:
+{
+
+  programs.nixvim.plugins = {
+    illuminate = {
+      enable = true;
+      underCursor = false;
+      filetypesDenylist = [
+        "Outline"
+        "TelescopePrompt"
+        "alpha"
+        "harpoon"
+        "reason"
+      ];
+    };
+  };
+
+}

users/willifan/common/nixvim/lsp.nix

@@ -0,0 +1,99 @@
+{ ... }:
+{
+  programs.nixvim = {
+    plugins = {
+      lsp-lines = {enable = true;};
+      lsp-format = {enable = true;};
+      helm = {enable = true;};
+      lsp = {
+        enable = true;
+        inlayHints = true;
+        servers = {
+          html = {enable = true;};
+          lua-ls = {enable = true;};
+          nil-ls = {enable = true;};
+          marksman = {enable = true;};
+	  nixd = {enable = true;};
+          pyright = {enable = true;};
+          gopls = {enable = true;};
+          terraformls = {enable = true;};
+          ansiblels = {enable = true;};
+          jsonls = {enable = true;};
+          yamlls = {
+            enable = true;
+            extraOptions = {
+              settings = {
+                yaml = {
+                  schemas = {
+                    kubernetes = "'*.yaml";
+                    "http://json.schemastore.org/github-workflow" = ".github/workflows/*";
+                    "http://json.schemastore.org/github-action" = ".github/action.{yml,yaml}";
+                    "http://json.schemastore.org/ansible-stable-2.9" = "roles/tasks/*.{yml,yaml}";
+                    "http://json.schemastore.org/kustomization" = "kustomization.{yml,yaml}";
+                    "http://json.schemastore.org/ansible-playbook" = "*play*.{yml,yaml}";
+                    "http://json.schemastore.org/chart" = "Chart.{yml,yaml}";
+                    "https://json.schemastore.org/dependabot-v2" = ".github/dependabot.{yml,yaml}";
+                    "https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json" = "*docker-compose*.{yml,yaml}";
+                    "https://raw.githubusercontent.com/argoproj/argo-workflows/master/api/jsonschema/schema.json" = "*flow*.{yml,yaml}";
+                  };
+                };
+              };
+            };
+          };
+        };
+
+        keymaps = {
+          silent = true;
+          lspBuf = {
+            gd = {
+              action = "definition";
+              desc = "Goto Definition";
+            };
+            gr = {
+              action = "references";
+              desc = "Goto References";
+            };
+            gD = {
+              action = "declaration";
+              desc = "Goto Declaration";
+            };
+            gI = {
+              action = "implementation";
+              desc = "Goto Implementation";
+            };
+            gT = {
+              action = "type_definition";
+              desc = "Type Definition";
+            };
+            K = {
+              action = "hover";
+              desc = "Hover";
+            };
+            "<leader>cw" = {
+              action = "workspace_symbol";
+              desc = "Workspace Symbol";
+            };
+            "<leader>cr" = {
+              action = "rename";
+              desc = "Rename";
+            };
+          };
+          diagnostic = {
+            "<leader>cd" = {
+              action = "open_float";
+              desc = "Line Diagnostics";
+            };
+            "[d" = {
+              action = "goto_next";
+              desc = "Next Diagnostic";
+            };
+            "]d" = {
+              action = "goto_prev";
+              desc = "Previous Diagnostic";
+            };
+          };
+        };
+      };
+    };
+  };
+}

users/willifan/common/nixvim/navic.nix

@@ -0,0 +1,42 @@
+{ ... }:
+{
+  programs.nixvim.plugins = {
+    navic = {
+      enable = true;
+      settings = {
+        separator = "  ";
+        highlight = true;
+        lsp = {
+          autoAttach = true;
+        };
+        icons = {
+          Array = "󱃵  ";
+          Boolean = "  ";
+          Class = "  ";
+          Constant = "  ";
+          Constructor = "  ";
+          Enum = " ";
+          EnumMember = " ";
+          Event = " ";
+          Field = "󰽏 ";
+          File = " ";
+          Function = "󰡱 ";
+          Interface = " ";
+          Key = "  ";
+          Method = " ";
+          Module = "󰕳 ";
+          Namespace = " ";
+          Null = "󰟢 ";
+          Number = " ";
+          Object = "  ";
+          Operator = " ";
+          Package = "󰏖 ";
+          String = " ";
+          Struct = " ";
+          TypeParameter = " ";
+          Variable = " ";
+        };
+      };
+    };
+  };
+}

users/willifan/common/nixvim/neotree.nix

@@ -0,0 +1,42 @@
+{ ... }:
+{
+  programs.nixvim = {
+    plugins = {
+      neo-tree = {
+        enable = true;
+        sources = ["filesystem" "buffers" "git_status" "document_symbols"];
+        addBlankLineAtTop = false;
+
+        filesystem = {
+          bindToCwd = false;
+          followCurrentFile = {
+            enabled = true;
+          };
+        };
+
+        defaultComponentConfigs = {
+          indent = {
+            withExpanders = true;
+            expanderCollapsed = "󰅂";
+            expanderExpanded = "󰅀";
+            expanderHighlight = "NeoTreeExpander";
+          };
+
+          gitStatus = {
+            symbols = {
+              added = " ";
+              conflict = "󰩌 ";
+              deleted = "󱂥";
+              ignored = " ";
+              modified = " ";
+              renamed = "󰑕";
+              staged = "󰩍";
+              unstaged = "";
+              untracked = " ";
+            };
+          };
+	};
+      };
+    };
+  };
+}

users/willifan/common/nixvim/toggleterm.nix

@@ -0,0 +1,11 @@
+{ ... }:
+{
+  programs.nixvim.plugins = {
+    toggleterm = {
+      enable = true;
+      settings = {
+        size = 10;
+      };
+    };
+  };
+}

users/willifan/common/ssh.nix

@@ -1,6 +1,6 @@
-{ pkgs, home-manager, ... }:
+{ ... }:
 {
   home-manager.users.willifan = {
     
   };
-}
+}

users/willifan/common/user.nix

@@ -1,10 +1,9 @@
-{ pkgs, ... }:
+{ ... }:
 {
   users.users.willifan = {
     isNormalUser = true;
     description = "willifan";
     extraGroups = [ "networkmanager" "wheel" ];
-    packages = with pkgs; [];
   };
 
-}
+}

users/willifan/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, hostname, type, ... }:
+{ hostname, type, ... }:
 {
   imports = [
     ./common

users/willifan/desktop/autologin.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   services.greetd = {
     enable = true;
@@ -10,4 +10,4 @@
       default_session = initial_session;
     };
   };
-}
+}

users/willifan/desktop/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 
 {
 

users/willifan/desktop/dev/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 
 {
   imports = [

users/willifan/desktop/dev/embedded.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   services.udev.extraRules = ''
 

users/willifan/desktop/dev/vscodium.nix

@@ -1,4 +1,4 @@
-{ pkgs, home-manager, ... }:
+{ pkgs, ... }:
 
 {
   home-manager.users.willifan = {

users/willifan/desktop/games/ROG_Pugio_II_fixes.nix

@@ -11,7 +11,7 @@
 
   services.ratbagd = {
     enable = true;
-    package = pkgs.libratbag.overrideAttrs (previousAttrs: rec {
+    package = pkgs.libratbag.overrideAttrs (previousAttrs: {
       postInstall = ''
         # Ensure the target directory exists
         mkdir -p $out/share/libratbag/
@@ -34,4 +34,4 @@ EOF
       '';
     });
   };
-}
+}

users/willifan/desktop/games/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
 
   imports = [

users/willifan/desktop/games/mangohud.nix

@@ -1,6 +1,6 @@
-{ pkgs, homa-manager, ... }:
+{ pkgs, ... }:
 {
   environment.systemPackages = with pkgs; [
     mangohud
   ];
-}
+}

users/willifan/desktop/games/steam.nix

@@ -1,4 +1,4 @@
-{ pkgs, home-manager, ... }:
+{ ... }:
 {
   programs.steam = {
     enable = true;
@@ -13,4 +13,4 @@
     SUBSYSTEM=="tty", ATTRS{idVendor}=="28de", ATTRS{idProduct}=="2102", MODE="0660", TAG+="uaccess"
   '';
   
-}
+}

users/willifan/desktop/hyprland/Lenni/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 
 {
   imports = [

users/willifan/desktop/hyprland/common/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 
 {
   programs.hyprland.enable = true;

users/willifan/desktop/hyprland/common/hyprland.nix

@@ -1,4 +1,4 @@
-{ pkgs, home-manager, ...}:
+{ pkgs, ...}:
 {
   home-manager.users.willifan = {
     wayland.windowManager.hyprland = {

users/willifan/desktop/hyprland/common/hyprpaper.nix

@@ -1,14 +1,10 @@
-{ pkgs, home-manager, ...}:
+{ ...}:
 {
   home-manager.users.willifan = {
     services.hyprpaper = {
       enable = true;
       settings = {
 
-#        preload = "/home/willifan/.config/desktop-utils/images/Bob Ross.png";
-
-#        wallpaper = ",/home/willifan/.config/desktop-utils/images/Bob Ross.png";
-
         splash = true;
 
         ipc = "off";
@@ -16,4 +12,4 @@
       };
     };
   };
-}
+}

users/willifan/desktop/hyprland/common/mako.nix

@@ -1,13 +1,11 @@
-{ pkgs, home-manager, ... }:
+{ ... }:
 {
   home-manager.users.willifan = {
     services.mako = {
       enable = true;
-#      backgroundColor = "#191724bb";
-#      borderColor = "#ffa44bee";
       borderRadius = 10;
       borderSize = 2;
 
     };
   };
-}
+}

users/willifan/desktop/hyprland/common/pipewire.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   security.rtkit.enable = true;
   services.pipewire = {
@@ -10,4 +10,4 @@
     # If you want to use JACK applications, uncomment this
     #jack.enable = true;
   };
-}
+}

users/willifan/desktop/hyprland/common/utils.nix

@@ -1,4 +1,4 @@
-{ pkgs, home-manager, ... }:
+{ pkgs, ... }:
 {
   environment.systemPackages = with pkgs; [
     
@@ -19,4 +19,4 @@
     papirus-icon-theme
     eww
   ];
-}
+}

users/willifan/desktop/hyprland/common/wlogout.nix

@@ -1,4 +1,4 @@
-{ pkgs, home-manager, ...}:
+{ ...}:
 {
   home-manager.users.willifan = {
     programs.wlogout = {
@@ -80,4 +80,4 @@
       '';
     };
   };
-}
+}

users/willifan/desktop/hyprland/common/wofi.nix

@@ -1,4 +1,4 @@
-{ pkgs, home-manager, ... }:
+{ ... }:
 {
   home-manager.users.willifan = {
     programs.wofi = {
@@ -9,11 +9,6 @@
         halign = "fill";
 
       };
-#      style = ''
-#        window {
-#	        border-radius: 10px;
-#        }
-#      '';
     };
   };
 }

users/willifan/desktop/hyprland/default.nix

@@ -1,7 +1,7 @@
-{ pkgs, hostname, ... }:
+{ hostname, ... }:
 {
   imports = [
     ./common
     ./${hostname}
   ];
-}
+}

users/willifan/desktop/kitty.nix

@@ -1,16 +1,11 @@
-{ pkgs, home-manager, ... }:
+{ ... }:
 {
   home-manager.users.willifan = {
     programs.kitty = {
       enable = true;
-#      font = {
-#        name = "HackNerdFontMono-Regular";
-#        package =pkgs.nerdfonts;
-#      };
       settings = {
-#        background_opacity = "0.85";
         enable_audio_bell = false;
       };
     };
   };
-}
+}

users/willifan/desktop/theme/cursor.nix

@@ -1,17 +0,0 @@
-{ pkgs, home-manager, ... }:
-{
-
-  environment.sessionVariables = {
-    XCURSOR_SIZE = "18";
-    HYPRCURSOR_SIZE = "18";
-  };
-
-  home-manager.users.willifan = {
-    home.pointerCursor = {
-      gtk.enable = true;
-      name = "Bibata-Modern-Classic";
-      package = pkgs.bibata-cursors;
-      size = 18;
-    };
-  };
-}

users/willifan/desktop/theme/default.nix

@@ -1,11 +1,7 @@
-{ pkgs, ... }:
+{ ... }:
 
 {
   imports = [
-    #./cursor.nix
-    #./font.nix
-    #./gtk.nix
-    #./qt.nix
     ./stylix.nix
   ];
-}
+}

users/willifan/desktop/theme/font.nix

@@ -1,14 +0,0 @@
-{ pkgs, home-manager, ...}:
-{
-  home-manager.users.willifan = {
-    fonts.fontconfig = {
-      enable = true;
-      defaultFonts = {
-        monospace = [ "JetBrains Mono" ];
-        serif = [ "" ];
-        sansSerif = [ "" ];
-        emoji = [ "" ];
-      };
-    };
-  };
-}

users/willifan/desktop/theme/gtk.nix

@@ -1,46 +0,0 @@
-{ pkgs, home-manager, ... }:
-
-{
-  home-manager.users.willifan = {
-    gtk = {
-      enable = true;
-      font = {
-        name = "JetBrains Mono";
-        package = pkgs.jetbrains-mono;
-      };
-
-      theme = {
-        name = "rose-pine";
-        package = pkgs.rose-pine-gtk-theme;
-      };
-
-      iconTheme = {
-        name = "Papirus-Dark";
-        package = pkgs.papirus-icon-theme;
-      };
-
-      #TODO add ascendancy cursor pack
-      #cursortTheme.name = "";
-      #cursortTheme.package = ;
-
-      gtk3.extraConfig = {
-        Settings = ''
-          gtk-application-prefer-dark-theme=1
-        '';
-      };
-      gtk4 = {
-        extraConfig = {
-          Settings = ''
-            gtk-application-prefer-dark-theme=1
-          '';
-        };
-        extraCss = ''
-          .sidebar-pane {
-            background-color: rgb(25, 23, 36);
-          }
-        '';
-
-      };
-    };
-  };
-}

users/willifan/desktop/theme/qt.nix

@@ -1,23 +0,0 @@
-{ pkgs, home-manager, ... }:
-{
-
-  environment.systemPackages = with pkgs; [
-    qalculate-qt
-  ];
-
-  home-manager.users.willifan = {
-    qt = {
-      enable = true;
-      style = {
-        name = "gtk2";
-        package = pkgs.libsForQt5.qtstyleplugins;
-      };
-      platformTheme.name = "gtk";
-    };
-  };
-  #qt = {
-  #    enable = true;
-  #    platformTheme = "gtk2";
-  #    style = "gtk2";
-  #  };
-}

users/willifan/desktop/theme/stylix.nix

@@ -1,4 +1,4 @@
-{ pkgs, home-manager, ... }:
+{ pkgs, ... }:
 {
 
   stylix = {

users/willifan/desktop/thunar.nix

@@ -1,4 +1,4 @@
-{ pkgs, home-manager, ... }:
+{ pkgs, ... }:
 {
   services.gvfs.enable = true;
 
@@ -16,4 +16,4 @@
   };
 
 
-}
+}

users/willifan/desktop/web/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
 
   imports = [
@@ -8,4 +8,4 @@
 
   ];
   
-}
+}

users/willifan/desktop/web/firefox.nix

@@ -1,4 +1,4 @@
-{ pkgs, home-manager, ... }:
+{ ... }:
 {
   home-manager.users.willifan = {
     programs.firefox = {

users/willifan/desktop/web/thunderbird.nix

@@ -1,4 +1,4 @@
-{ pkgs, home-manager, ... }:
+{ ... }:
 {
   home-manager.users.willifan = {
     programs.thunderbird = {

users/willifan/server/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   
-}
+}