From bd2f7250299f8af49a35773be6775ca078e0d248 Mon Sep 17 00:00:00 2001
From: Martin Berg Alstad <git@martials.no>
Date: Sun, 2 Feb 2025 13:16:51 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=AA=9B=20Comments,=20git=20safe=20dir,=20?=
 =?UTF-8?q?moved=20nixvim=20import?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Moved nixvim import to nixvim directory
- Added git safe directory to /etc/nixos
---
 home-manager/default.nix                    | 1 -
 home-manager/development/git.nix            | 1 +
 home-manager/development/nixvim/default.nix | 6 ++++++
 home-manager/fish.nix                       | 1 +
 modules/hyprland/default.nix                | 1 +
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/home-manager/default.nix b/home-manager/default.nix
index 5a4534e..1ca2fe1 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -11,7 +11,6 @@ in
 {
   imports = [
     inputs.catppuccin.homeManagerModules.catppuccin
-    inputs.nixvim.homeManagerModules.nixvim
     ./btop.nix
     ./cava
     ./cursors.nix
diff --git a/home-manager/development/git.nix b/home-manager/development/git.nix
index 8c55920..943009f 100644
--- a/home-manager/development/git.nix
+++ b/home-manager/development/git.nix
@@ -11,6 +11,7 @@
 
     extraConfig = {
       push.autoSetupRemote = true;
+      safe.directory = "/etc/nixos";
     };
   };
 }
diff --git a/home-manager/development/nixvim/default.nix b/home-manager/development/nixvim/default.nix
index 518ec13..1bccf09 100644
--- a/home-manager/development/nixvim/default.nix
+++ b/home-manager/development/nixvim/default.nix
@@ -1,5 +1,11 @@
 # Neovim configuration for Nix
+{ inputs, ... }:
+
 {
+  imports = [
+    inputs.nixvim.homeManagerModules.nixvim
+  ];
+
   catppuccin.nvim.enable = true;
 
   home.sessionVariables.EDITOR = "nvim";
diff --git a/home-manager/fish.nix b/home-manager/fish.nix
index 8293327..7e8beac 100644
--- a/home-manager/fish.nix
+++ b/home-manager/fish.nix
@@ -20,6 +20,7 @@ in
       plugins = [
         {
           # !! to get the previous command
+          # https://github.com/BrewingWeasel/fishbang
           name = "fishbang";
           src = pkgs.fetchFromGitHub {
             owner = "BrewingWeasel";
diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix
index 15d19c8..64f7865 100644
--- a/modules/hyprland/default.nix
+++ b/modules/hyprland/default.nix
@@ -6,6 +6,7 @@
     xdg-desktop-portal-hyprland
     hyprpolkitagent # Auth deamon providing modals for password auth
     hyprshot # Screenshots
+    # unstable.hyprsysteminfo TODO requires flake update
   ];
 
   programs = {