Merge remote-tracking branch 'origin/nixos' into nixos-work

flake.nix

@@ -1,10 +1,11 @@
 {
   description = "My awesome system config";
 
-  ##############
-  ### Inputs ###
-  ##############
-
+  /*
+     ╔══════════════════════════════════════════════════════════╗
+     ║                          Inputs                          ║
+     ╚══════════════════════════════════════════════════════════╝
+  */
   inputs = {
     master.url = "github:nixos/nixpkgs";
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
@@ -24,11 +25,6 @@
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     home-manager.inputs.utils.follows = "flake-utils";
 
-    # Zsh specific
-    forgit-git.url = "github:wfxr/forgit";
-    forgit-git.flake = false;
-
-    # Laptop Touchpad
     asus-touchpad-numpad-driver.url = "github:MoritzBoehme/asus-touchpad-numpad-driver/german-layout";
     asus-touchpad-numpad-driver.flake = false;
 
@@ -40,13 +36,12 @@
 
     emacs.url = "git+ssh://git@gitea.moritzboeh.me/moritz/emacs.git?ref=main";
 
-    neovim.url = "github:neovim/neovim?dir=contrib";
+    neovim.url = "github:neovim/neovim/83bfd94d1df5eecb8e4069a227c7d24598636d63?dir=contrib"; # HACK to fix neovim not building at the moment
 
     nil.url = "github:oxalica/nil";
     nil.inputs.nixpkgs.follows = "nixpkgs";
     nil.inputs.flake-utils.follows = "flake-utils";
 
-    # Hyprland
     hyprland.url = "github:hyprwm/Hyprland";
     hyprpaper.url = "github:hyprwm/hyprpaper";
     hypr-contrib.url = "github:hyprwm/contrib";
@@ -66,12 +61,20 @@
     advanced-git-search-nvim.url = "github:aaronhallaert/advanced-git-search.nvim";
     advanced-git-search-nvim.flake = false;
 
+    comment-box-nvim.url = "github:LudoPinelli/comment-box.nvim";
+    comment-box-nvim.flake = false;
+
     attic.url = "github:zhaofengli/attic";
     attic.inputs.nixpkgs.follows = "nixpkgs";
     attic.inputs.nixpkgs-stable.follows = "stable";
     attic.inputs.flake-utils.follows = "flake-utils";
   };
 
+  /*
+     ╔══════════════════════════════════════════════════════════╗
+     ║                         Outputs                          ║
+     ╚══════════════════════════════════════════════════════════╝
+  */
   outputs =
     inputs@{ self, nixpkgs, utils, ... }:
     utils.lib.mkFlake {
@@ -84,10 +87,11 @@
       lib = nixpkgs.lib.extend
         (self: super: { my = import ./lib { lib = self; }; });
 
-      ################
-      ### Overlays ###
-      ################
-
+      /*
+         ╔══════════════════════════════════════════════════════════╗
+         ║                         Overlays                         ║
+         ╚══════════════════════════════════════════════════════════╝
+      */
       overlay = import ./overlays {
         inherit inputs;
         inherit (self) lib;
@@ -108,10 +112,11 @@
 
       overlays.default = self.overlay;
 
-      ###############
-      ### Modules ###
-      ###############
-
+      /*
+         ╔══════════════════════════════════════════════════════════╗
+         ║                         Modules                          ║
+         ╚══════════════════════════════════════════════════════════╝
+      */
       nixosModules = utils.lib.exportModules [
         ./modules/profiles/base.nix
         ./modules/profiles/gaming.nix
@@ -154,10 +159,11 @@
         self.nixosModules.work
       ];
 
-      ###############
-      ### Outputs ###
-      ###############
-
+      /*
+         ╔══════════════════════════════════════════════════════════╗
+         ║                      Other Outputs                       ║
+         ╚══════════════════════════════════════════════════════════╝
+      */
       outputsBuilder = channels:
         with channels.nixpkgs; {
           devShells.default = mkShell {