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

flake.nix

@@ -1,80 +1,84 @@
 {
   description = "My awesome system config";
 
-  ##############
-  ### Inputs ###
-  ##############
-
+  /*
+     ╔══════════════════════════════════════════════════════════╗
+     ║                          Inputs                          ║
+     ╚══════════════════════════════════════════════════════════╝
+  */
   inputs = {
+    # Nix
     master.url = "github:nixos/nixpkgs";
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     stable.url = "github:nixos/nixpkgs/nixos-22.11";
 
-    pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
-
     flake-utils.url = "github:numtide/flake-utils";
-
     utils.url = "github:gytis-ivaskevicius/flake-utils-plus";
     utils.inputs.flake-utils.follows = "flake-utils";
 
-    agenix.url = "github:ryantm/agenix";
     agenix.inputs.nixpkgs.follows = "nixpkgs";
+    agenix.url = "github:ryantm/agenix";
 
-    home-manager.url = "github:nix-community/home-manager";
-    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;
-
-    arkenfox-userjs.url = "github:arkenfox/user.js";
-    arkenfox-userjs.flake = false;
-
-    howdy.url = "sourcehut:~moritzboehme/howdy";
-    howdy.inputs.nixpkgs.follows = "nixpkgs";
-
-    emacs.url = "git+ssh://git@gitea.moritzboeh.me/moritz/emacs.git?ref=main";
-
-    neovim.url = "github:neovim/neovim?dir=contrib";
-
-    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";
-
-    attic.url = "github:zhaofengli/attic";
-    attic.inputs.nixpkgs.follows = "nixpkgs";
-    attic.inputs.nixpkgs-stable.follows = "stable";
     attic.inputs.flake-utils.follows = "flake-utils";
+    attic.inputs.nixpkgs-stable.follows = "stable";
+    attic.inputs.nixpkgs.follows = "nixpkgs";
+    attic.url = "github:zhaofengli/attic";
 
-    nvim-treesitter-textsubjects.url = "github:RRethy/nvim-treesitter-textsubjects";
-    nvim-treesitter-textsubjects.flake = false;
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    home-manager.url = "github:nix-community/home-manager";
 
-    smartcolumn-nvim.url = "github:m4xshen/smartcolumn.nvim";
-    smartcolumn-nvim.flake = false;
+    nil.inputs.flake-utils.follows = "flake-utils";
+    nil.inputs.nixpkgs.follows = "nixpkgs";
+    nil.url = "github:oxalica/nil";
 
-    copilot-lua.url = "github:zbirenbaum/copilot.lua";
-    copilot-lua.flake = false;
+    pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
 
-    lspsaga-nvim.url = "github:glepnir/lspsaga.nvim";
-    lspsaga-nvim.flake = false;
+    # Neovim
+    neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
 
-    advanced-git-search-nvim.url = "github:aaronhallaert/advanced-git-search.nvim";
-    advanced-git-search-nvim.flake = false;
+    bufferline-nvim.flake = false;
+    bufferline-nvim.url = "github:akinsho/bufferline.nvim";
 
     cmp-async-path.url = "github:FelipeLema/cmp-async-path";
     cmp-async-path.flake = false;
+
+    comment-box-nvim.flake = false;
+    comment-box-nvim.url = "github:LudoPinelli/comment-box.nvim";
+
+    copilot-lua.flake = false;
+    copilot-lua.url = "github:zbirenbaum/copilot.lua";
+
+    gitignore-nvim.flake = false;
+    gitignore-nvim.url = "github:wintermute-cell/gitignore.nvim";
+
+    lspsaga-nvim.flake = false;
+    lspsaga-nvim.url = "github:glepnir/lspsaga.nvim";
+
+    nvim-treesitter-textsubjects.flake = false;
+    nvim-treesitter-textsubjects.url = "github:RRethy/nvim-treesitter-textsubjects";
+
+    smartcolumn-nvim.flake = false;
+    smartcolumn-nvim.url = "github:m4xshen/smartcolumn.nvim";
+
+    # Hyprland
+    hypr-contrib.url = "github:hyprwm/contrib";
+    hyprland.url = "github:hyprwm/Hyprland";
+    hyprpaper.url = "github:hyprwm/hyprpaper";
+
+    # Laptop
+    asus-touchpad-numpad-driver.url = "github:MoritzBoehme/asus-touchpad-numpad-driver/german-layout";
+    asus-touchpad-numpad-driver.flake = false;
+
+    # Firefox user.js
+    arkenfox-userjs.url = "github:arkenfox/user.js";
+    arkenfox-userjs.flake = false;
   };
 
+  /*
+     ╔══════════════════════════════════════════════════════════╗
+     ║                         Outputs                          ║
+     ╚══════════════════════════════════════════════════════════╝
+  */
   outputs =
     inputs@{ self, nixpkgs, utils, ... }:
     utils.lib.mkFlake {
@@ -85,22 +89,22 @@
       channelsConfig.allowUnfree = true;
 
       lib = nixpkgs.lib.extend
-        (self: super: { my = import ./lib { lib = self; }; });
-
-      ################
-      ### Overlays ###
-      ################
+        (self: _: { my = import ./lib { lib = self; }; });
 
+      /*
+         ╔══════════════════════════════════════════════════════════╗
+         ║                         Overlays                         ║
+         ╚══════════════════════════════════════════════════════════╝
+      */
       overlay = import ./overlays {
         inherit inputs;
         inherit (self) lib;
       };
 
-      channels.nixpkgs.overlaysBuilder = channels: [
-        inputs.emacs.overlays.default
-        inputs.howdy.overlays.default
+      channels.nixpkgs.overlaysBuilder = _: [
         inputs.hypr-contrib.overlays.default
         inputs.hyprland.overlays.default
+        inputs.neovim-nightly-overlay.overlay
         inputs.utils.overlay
         self.overlay
       ];
@@ -111,14 +115,16 @@
 
       overlays.default = self.overlay;
 
-      ###############
-      ### Modules ###
-      ###############
-
+      /*
+         ╔══════════════════════════════════════════════════════════╗
+         ║                         Modules                          ║
+         ╚══════════════════════════════════════════════════════════╝
+      */
       nixosModules = utils.lib.exportModules [
         ./modules/profiles/base.nix
         ./modules/profiles/gaming.nix
         ./modules/profiles/desktop.nix
+        ./modules/profiles/personal.nix
       ];
 
       hostDefaults.modules = [
@@ -132,9 +138,7 @@
             extraSpecialArgs = { inherit inputs self; };
           };
         }
-        inputs.hyprland.nixosModules.default
         inputs.agenix.nixosModules.age
-        inputs.howdy.nixosModules.default
       ];
 
 
@@ -142,6 +146,7 @@
         ./hosts/nixos-laptop
         self.nixosModules.desktop
         self.nixosModules.gaming
+        self.nixosModules.personal
       ];
 
 
@@ -149,12 +154,14 @@
         ./hosts/nixos-desktop
         self.nixosModules.desktop
         self.nixosModules.gaming
+        self.nixosModules.personal
       ];
 
-      ###############
-      ### Outputs ###
-      ###############
-
+      /*
+         ╔══════════════════════════════════════════════════════════╗
+         ║                      Other Outputs                       ║
+         ╚══════════════════════════════════════════════════════════╝
+      */
       outputsBuilder = channels:
         with channels.nixpkgs; {
           devShells.default = mkShell {