diff options
| author | Soispha <soispha@vhack.eu> | 2023-04-29 17:31:00 +0200 |
|---|---|---|
| committer | Soispha <soispha@vhack.eu> | 2023-05-09 19:32:58 +0200 |
| commit | fb206f9be18b4936ef716935c2343531acaf92c2 (patch) | |
| tree | 88a86e5ae9f27a050d22397cc2d991a8b9e9b70b /flake | |
| parent | Docs(todo): Update (diff) | |
| download | nixos-config-fb206f9be18b4936ef716935c2343531acaf92c2.tar.gz nixos-config-fb206f9be18b4936ef716935c2343531acaf92c2.zip | |
Refactor(treewide): Use separate shell library
Diffstat (limited to '')
| -rw-r--r-- | flake.nix | 22 | ||||
| -rw-r--r-- | flake/default.nix | 24 | ||||
| -rw-r--r-- | flake/nixosConfigurations/default.nix | 2 | ||||
| -rw-r--r-- | flake/packages/default.nix | 11 |
4 files changed, 32 insertions, 27 deletions
diff --git a/flake.nix b/flake.nix index 0c4167d5..0923bd25 100644 --- a/flake.nix +++ b/flake.nix @@ -107,9 +107,13 @@ flake-utils.follows = "flake-utils"; }; }; - shell-library = { - url = "git+https://git.sils.li/ene/lib-sh.git"; - flake = false; + shell_library = { + url = "git+https://codeberg.org/soispha/shell_library.git"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + systems.follows = "systems"; + }; }; river_init_lesser = { url = "git+https://git.sils.li/ene/river-lesser-init.git"; @@ -165,14 +169,14 @@ # my binaries video_pause, strip_js_comments, - shell-library, + shell_library, river_init_lesser, yambar_memory, yambar_cpu, grades, ... }: let - sysLib = import ./lib {inherit pkgs shell-library;}; + sysLib = shell_library.lib.${system}; system = "x86_64-linux"; pkgs = import nixpkgs (import ./system/nixpkgs { inherit (nixpkgs) lib; @@ -187,23 +191,23 @@ sysLib nixpkgs # modules - + home-manager nixos-generators impermanence agenix ragenix # external dependencies - + neovim_config user_js snap-sync templates # my binaries - + video_pause strip_js_comments - shell-library + shell_library river_init_lesser yambar_memory yambar_cpu diff --git a/flake/default.nix b/flake/default.nix index 0af0c127..cb090466 100644 --- a/flake/default.nix +++ b/flake/default.nix @@ -19,7 +19,7 @@ # my binaries video_pause, strip_js_comments, - shell-library, + shell_library, river_init_lesser, yambar_memory, yambar_cpu, @@ -35,24 +35,24 @@ pkgs sysLib # extra information - + system # bins - + video_pause yambar_cpu yambar_memory strip_js_comments river_init_lesser grades - shell-library + shell_library # external deps - + user_js neovim_config snap-sync # modules - + impermanence ; }; @@ -83,32 +83,32 @@ in { nixpkgs sysLib # configs - + defaultModules defaultSpecialArgs # bins - + video_pause yambar_cpu yambar_memory strip_js_comments river_init_lesser grades - shell-library + shell_library # external deps - + user_js neovim_config snap-sync templates # modules - + impermanence home-manager agenix ; }; - packages."${system}" = import ./packages {inherit nixos-generators defaultSpecialArgs pkgs shell-library;}; + packages."${system}" = import ./packages {inherit nixos-generators defaultSpecialArgs pkgs sysLib;}; apps."${system}" = import ./apps {inherit self system;}; diff --git a/flake/nixosConfigurations/default.nix b/flake/nixosConfigurations/default.nix index 0698da76..0c7ada1a 100644 --- a/flake/nixosConfigurations/default.nix +++ b/flake/nixosConfigurations/default.nix @@ -14,7 +14,7 @@ strip_js_comments, river_init_lesser, grades, - shell-library, + shell_library, # external deps user_js, neovim_config, diff --git a/flake/packages/default.nix b/flake/packages/default.nix index 470ea05c..a7274aeb 100644 --- a/flake/packages/default.nix +++ b/flake/packages/default.nix @@ -1,8 +1,9 @@ +# vim: ts=2 { nixos-generators, defaultSpecialArgs, pkgs, - shell-library, + sysLib, ... }: { iso = nixos-generators.nixosGenerate { @@ -16,25 +17,25 @@ install = import ../../bootstrap/install { inherit pkgs - shell-library + sysLib ; }; activate = import ../../bootstrap/activate { inherit pkgs - shell-library + sysLib ; }; setup = import ../../bootstrap/setup { inherit pkgs - shell-library + sysLib ; }; config_setup = import ../../bootstrap/config_setup { inherit pkgs - shell-library + sysLib ; }; } |