From b1f3baee7d67d498afc3e80b0872fc056cc2a8d7 Mon Sep 17 00:00:00 2001
From: Alex van de Sandt <alex@avandesa.dev>
Date: Mon, 24 Nov 2025 22:28:58 -0600
Subject: [PATCH] Fix nix file formatting

---
 configuration.nix | 30 ++++++++++++++++++------------
 flake.nix         | 14 +++++++++++++-
 git.nix           |  1 -
 kitty.nix         |  8 ++++++--
 shell/bash.nix    | 13 +++++++++++--
 shell/default.nix |  8 ++++++--
 shell/zsh.nix     |  7 ++++++-
 ssh.nix           |  8 ++++++--
 8 files changed, 66 insertions(+), 23 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 1d26757..8538c3b 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,10 +1,11 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-{ config
-, pkgs
-, hyprland
-, ...
+{
+  config,
+  pkgs,
+  hyprland,
+  ...
 }:
 {
   imports = [
@@ -63,7 +64,6 @@
     wayland.enable = true;
   };
 
-
   # Configure keymap in X11
   services.xserver.xkb = {
     layout = "us";
@@ -89,7 +89,6 @@
     package = config.boot.kernelPackages.nvidiaPackages.stable;
   };
 
-
   # Enable CUPS to print documents.
   services.printing.enable = true;
 
@@ -163,7 +162,10 @@
     nerd-fonts.iosevka
   ];
   fonts.fontconfig.defaultFonts = {
-    monospace = [ "Berkeley Mono" "iosevka" ];
+    monospace = [
+      "Berkeley Mono"
+      "iosevka"
+    ];
   };
 
   # Lets zsh completions work
@@ -177,11 +179,15 @@
 
   security.polkit.enable = true;
 
-  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (pkgs.lib.getName pkg) [
-    "1password"
-    "1password-cli"
-  ];
-  programs._1password = { enable = true; };
+  nixpkgs.config.allowUnfreePredicate =
+    pkg:
+    builtins.elem (pkgs.lib.getName pkg) [
+      "1password"
+      "1password-cli"
+    ];
+  programs._1password = {
+    enable = true;
+  };
   programs._1password-gui = {
     enable = true;
     polkitPolicyOwners = [ "igneous" ];
diff --git a/flake.nix b/flake.nix
index a184a11..9ebd36f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,6 +4,7 @@
   inputs = {
     # Specify the source of Home Manager and Nixpkgs.
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -12,11 +13,21 @@
       url = "github:hyprwm/Hyprland";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    nixvim = {
+      url = "github:nix-community/nixvim";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     _1password-shell-plugins.url = "github:1Password/shell-plugins";
   };
 
   outputs =
-    inputs@{ nixpkgs, home-manager, hyprland, ... }:
+    inputs@{
+      nixpkgs,
+      home-manager,
+      hyprland,
+      nixvim,
+      ...
+    }:
     let
       system = "x86_64-linux";
       pkgs = nixpkgs.legacyPackages.${system};
@@ -39,6 +50,7 @@
         # the path to your home.nix.
         modules = [
           ./home.nix
+          nixvim.homeModules.nixvim
           op-shell.hmModules.default
         ];
 
diff --git a/git.nix b/git.nix
index 39952ad..0799eaf 100644
--- a/git.nix
+++ b/git.nix
@@ -20,4 +20,3 @@
     };
   };
 }
-
diff --git a/kitty.nix b/kitty.nix
index 315eff7..e4e61ad 100644
--- a/kitty.nix
+++ b/kitty.nix
@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 {
   programs.kitty = {
@@ -38,4 +43,3 @@
     };
   };
 }
-
diff --git a/shell/bash.nix b/shell/bash.nix
index e65e25a..28bee36 100644
--- a/shell/bash.nix
+++ b/shell/bash.nix
@@ -1,8 +1,17 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 {
   programs.bash = {
     enable = true;
     historyFile = ".bashhistfile";
-    historyIgnore = [ "ls" "cd" "exit" ];
+    historyIgnore = [
+      "ls"
+      "cd"
+      "exit"
+    ];
   };
 }
diff --git a/shell/default.nix b/shell/default.nix
index d0a4d71..ebb1332 100644
--- a/shell/default.nix
+++ b/shell/default.nix
@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 {
   imports = [
     ./bash.nix
@@ -36,4 +41,3 @@
     enable = true;
   };
 }
-
diff --git a/shell/zsh.nix b/shell/zsh.nix
index 0129c7c..35013bb 100644
--- a/shell/zsh.nix
+++ b/shell/zsh.nix
@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 let
   completions = builtins.readFile ./completions.zsh;
   keybindings = builtins.readFile ./keybindings.zsh;
diff --git a/ssh.nix b/ssh.nix
index 5ebf6c0..d6f94ca 100644
--- a/ssh.nix
+++ b/ssh.nix
@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 {
   programs.ssh = {
     enable = true;
@@ -18,4 +23,3 @@
     };
   };
 }
-
-- 
2.51.2