diff --git a/flake.lock b/flake.lock index 1d19408..43599e9 100644 --- a/flake.lock +++ b/flake.lock @@ -202,11 +202,11 @@ ] }, "locked": { - "lastModified": 1737501704, - "narHash": "sha256-yhbvqVZLT/KFJAOKINvWFYnODeKU8o2hDD5OLUGdZQ8=", + "lastModified": 1737502356, + "narHash": "sha256-IF8rpMs63pPu+EvLRQ1mfyc1EZHP7BNeK3dN048tf1U=", "owner": "rasmus-kirk", "repo": "website-builder", - "rev": "5a3ce8d33bb6fa1ecf3fff07e029c41f6d7af8e8", + "rev": "d9fc8c15f297fa7a588b3ca251ef77e1f0c6ebb5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f0d5628..5b482ef 100644 --- a/flake.nix +++ b/flake.nix @@ -49,7 +49,7 @@ nixosModules.default = import ./modules/nixos; homeManagerModules.default = { - imports = [ ./modules/home-manager ]; + imports = [./modules/home-manager]; config._module.args = {inherit inputs;}; }; @@ -63,23 +63,37 @@ }); packages = forAllSystems ({pkgs}: let - website = website-builder.lib { - pkgs = pkgs; - src = ./.; - headerTitle = "Rasmus Kirk"; - standalonePages = [{ + website = website-builder.lib { + pkgs = pkgs; + src = ./.; + headerTitle = "Rasmus Kirk"; + standalonePages = [ + { inputFile = ./docs/index.md; title = "Kirk Modules - Option Documentation"; - }]; - navbar = [ - { title = "Home"; location = "/"; } - { title = "Nixos"; location = "/nixos-options"; } - { title = "Home Manager"; location = "/home-manager-options"; } - { title = "Github"; location = "https://github.com/rasmus-kirk/nix-config"; } - ]; - homemanagerModules = ./modules/home-manager; - nixosModules = ./modules/nixos; - }; + } + ]; + navbar = [ + { + title = "Home"; + location = "/"; + } + { + title = "Nixos"; + location = "/nixos-options"; + } + { + title = "Home Manager"; + location = "/home-manager-options"; + } + { + title = "Github"; + location = "https://github.com/rasmus-kirk/nix-config"; + } + ]; + homemanagerModules = ./modules/home-manager; + nixosModules = ./modules/nixos; + }; in { default = website.package; debug = website.loop; diff --git a/modules/home-manager/homeManagerScripts/default.nix b/modules/home-manager/homeManagerScripts/default.nix index d783dc4..5518e17 100644 --- a/modules/home-manager/homeManagerScripts/default.nix +++ b/modules/home-manager/homeManagerScripts/default.nix @@ -14,7 +14,7 @@ with lib; let hm = pkgs.writeShellApplication { name = "hm"; - runtimeInputs = with pkgs; [ fzf git ]; + runtimeInputs = with pkgs; [fzf git]; text = '' command="''${1:-}" # Check if a parameter is provided @@ -163,7 +163,10 @@ in { # Use the pinned nixpkgs version that is already used, when using `nix shell nixpkgs#package` nix.registry.nixpkgs = { - from = { id = "nixpkgs"; type = "indirect"; }; + from = { + id = "nixpkgs"; + type = "indirect"; + }; flake = inputs.nixpkgs; }; diff --git a/modules/home-manager/yazi/default.nix b/modules/home-manager/yazi/default.nix index 8f2646a..e566c11 100644 --- a/modules/home-manager/yazi/default.nix +++ b/modules/home-manager/yazi/default.nix @@ -126,7 +126,7 @@ in { desc = "Create a new terminal with yazi open"; } { - on = [ "2" ]; + on = ["2"]; run = "plugin switch-create-tab --args=1"; } # Selection