diff options
| author | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2024-05-24 14:06:14 +0200 |
|---|---|---|
| committer | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2024-05-24 14:06:14 +0200 |
| commit | 636478286139184ebfa1ffd3610ce0ca482e04fa (patch) | |
| tree | 45e61147588ca73f0973ab410359f3d7c1f0e3d1 /flake | |
| parent | fix(modules/system/home-manager): Import soispha's hm config (diff) | |
| download | nixos-config-636478286139184ebfa1ffd3610ce0ca482e04fa.zip | |
feat(pkgs): Pull yambar-{cpu,memory} in tree
Diffstat (limited to '')
| -rw-r--r-- | flake.lock | 56 | ||||
| -rw-r--r-- | flake.nix | 20 | ||||
| -rw-r--r-- | flake/default.nix | 4 | ||||
| -rw-r--r-- | flake/nixosConfigurations/default.nix | 16 |
4 files changed, 7 insertions, 89 deletions
@@ -718,9 +718,7 @@ "systems": "systems", "templates": "templates", "treefmt-nix": "treefmt-nix", - "user_js": "user_js", - "yambar_cpu": "yambar_cpu", - "yambar_memory": "yambar_memory" + "user_js": "user_js" } }, "rust-overlay": { @@ -889,58 +887,6 @@ "repo": "user.js", "type": "github" } - }, - "yambar_cpu": { - "inputs": { - "crane": [ - "crane" - ], - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1678635450, - "narHash": "sha256-AER+dXb9YoFdTLtNRG8PSIFCPo5qiZBSrLHmLkbnanM=", - "ref": "refs/heads/prime", - "rev": "9668588173cbdffa325247a35de93f31e4511f9a", - "revCount": 5, - "type": "git", - "url": "https://codeberg.org/soispha/yambar_cpu.git" - }, - "original": { - "type": "git", - "url": "https://codeberg.org/soispha/yambar_cpu.git" - } - }, - "yambar_memory": { - "inputs": { - "crane": [ - "crane" - ], - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1678015290, - "narHash": "sha256-oEZzslefttctJHPhHLVOBPqRh59p51CTmgaKQC+MXn8=", - "ref": "refs/heads/prime", - "rev": "9b273d73f151e7f47cde5ed3feba38797b43619b", - "revCount": 3, - "type": "git", - "url": "https://codeberg.org/soispha/yambar_memory.git" - }, - "original": { - "type": "git", - "url": "https://codeberg.org/soispha/yambar_memory.git" - } } }, "root": "root", @@ -206,22 +206,6 @@ flake-compat.follows = "flake-compat"; }; }; - yambar_cpu = { - url = "git+https://codeberg.org/soispha/yambar_cpu.git"; - inputs = { - nixpkgs.follows = "nixpkgs"; - crane.follows = "crane"; - flake-utils.follows = "flake-utils"; - }; - }; - yambar_memory = { - url = "git+https://codeberg.org/soispha/yambar_memory.git"; - inputs = { - nixpkgs.follows = "nixpkgs"; - crane.follows = "crane"; - flake-utils.follows = "flake-utils"; - }; - }; # external resources user_js = { @@ -260,8 +244,6 @@ # my binaries shell_library, river_init_lesser, - yambar_memory, - yambar_cpu, ... }: let system = "x86_64-linux"; @@ -311,8 +293,6 @@ shell_library river_init_lesser - yambar_memory - yambar_cpu ; }; in diff --git a/flake/default.nix b/flake/default.nix index b54b5470..3bd0e6ba 100644 --- a/flake/default.nix +++ b/flake/default.nix @@ -25,8 +25,6 @@ # my binaries shell_library, river_init_lesser, - yambar_memory, - yambar_cpu, }: let treefmtEval = import ./treefmt.nix {inherit treefmt-nix pkgs;}; @@ -57,8 +55,6 @@ # bins river_init_lesser - yambar_cpu - yambar_memory # external user_js diff --git a/flake/nixosConfigurations/default.nix b/flake/nixosConfigurations/default.nix index 3895593f..92e1a41e 100644 --- a/flake/nixosConfigurations/default.nix +++ b/flake/nixosConfigurations/default.nix @@ -21,8 +21,6 @@ nix-index-database, # bins river_init_lesser, - yambar_cpu, - yambar_memory, # external user_js, }: let @@ -48,28 +46,26 @@ shell_library sysLib # extra information - + system # modules - + impermanence nix-index-database nixVim # nix registry - + nixpkgs_as_input self templates # bins - + # TODO: Integrate these into `pkgs/by-name` <2024-05-22> - + river_init_lesser serverphone - yambar_cpu - yambar_memory # external deps - + user_js ; }; |