diff options
| -rw-r--r-- | flake.lock | 410 | ||||
| -rw-r--r-- | flake.nix | 6 | ||||
| -rw-r--r-- | flake/nixosConfigurations/default.nix | 1 | ||||
| -rw-r--r-- | home-manager/config/grades/default.nix | 8 |
4 files changed, 412 insertions, 13 deletions
@@ -26,17 +26,17 @@ "flake-compat": "flake-compat", "flake-utils": "flake-utils", "nixpkgs": [ - "river_init_lesser", + "grades", "nixpkgs" ], "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1676846788, - "narHash": "sha256-XLsHLgXyMdliMeAXuzdGP+TXBaV44kG1RPTUHNOs6Jk=", + "lastModified": 1677892403, + "narHash": "sha256-/Wi0L1spSWLFj+UQxN3j0mPYMoc7ZoAujpUF/juFVII=", "owner": "ipetkov", "repo": "crane", - "rev": "953b70da2813fb882c39890f2514e7db76fc8843", + "rev": "105e27adb70a9890986b6d543a67761cbc1964a2", "type": "github" }, "original": { @@ -50,10 +50,34 @@ "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_3", "nixpkgs": [ + "river_init_lesser", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_3" + }, + "locked": { + "lastModified": 1676846788, + "narHash": "sha256-XLsHLgXyMdliMeAXuzdGP+TXBaV44kG1RPTUHNOs6Jk=", + "owner": "ipetkov", + "repo": "crane", + "rev": "953b70da2813fb882c39890f2514e7db76fc8843", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_3": { + "inputs": { + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_5", + "nixpkgs": [ "strip_js_comments", "nixpkgs" ], - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay_4" }, "locked": { "lastModified": 1675902425, @@ -69,6 +93,54 @@ "type": "github" } }, + "crane_4": { + "inputs": { + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_7", + "nixpkgs": [ + "yambar_cpu", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_5" + }, + "locked": { + "lastModified": 1677892403, + "narHash": "sha256-/Wi0L1spSWLFj+UQxN3j0mPYMoc7ZoAujpUF/juFVII=", + "owner": "ipetkov", + "repo": "crane", + "rev": "105e27adb70a9890986b6d543a67761cbc1964a2", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_5": { + "inputs": { + "flake-compat": "flake-compat_5", + "flake-utils": "flake-utils_9", + "nixpkgs": [ + "yambar_memory", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_6" + }, + "locked": { + "lastModified": 1677642623, + "narHash": "sha256-GlRa6/HWg8mIxPM29ZuTP2dP8y9sQ6BdbrjzCO8JgAo=", + "owner": "ipetkov", + "repo": "crane", + "rev": "f3f763e4d9f156ec0c37f39b0f77e2d62213b296", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -123,6 +195,54 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1676283394, @@ -138,6 +258,21 @@ "type": "github" } }, + "flake-utils_10": { + "locked": { + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flake-utils_2": { "locked": { "lastModified": 1676283394, @@ -155,6 +290,36 @@ }, "flake-utils_3": { "locked": { + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "locked": { + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { + "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", @@ -168,7 +333,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_6": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -183,6 +348,74 @@ "type": "github" } }, + "flake-utils_7": { + "locked": { + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_8": { + "locked": { + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_9": { + "locked": { + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "grades": { + "inputs": { + "crane": "crane", + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1677941759, + "narHash": "sha256-IM+J8Mz8iaJ70yAVbPVdhVA5vc4sg3DFJzF50Jsl1tM=", + "ref": "refs/heads/prime", + "rev": "40b6da5ec6eb88cd92c8fad832cce5aa04a54b8c", + "revCount": 21, + "type": "git", + "url": "https://codeberg.org/ene/Grades.git" + }, + "original": { + "type": "git", + "url": "https://codeberg.org/ene/Grades.git" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -254,8 +487,8 @@ }, "river_init_lesser": { "inputs": { - "crane": "crane", - "flake-utils": "flake-utils_2", + "crane": "crane_2", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ] @@ -277,6 +510,7 @@ "root": { "inputs": { "agenix": "agenix", + "grades": "grades", "home-manager": "home-manager", "impermanence": "impermanence", "neovim_config": "neovim_config", @@ -285,12 +519,66 @@ "shell-library": "shell-library", "snap-sync": "snap-sync", "strip_js_comments": "strip_js_comments", - "user_js": "user_js" + "user_js": "user_js", + "yambar_cpu": "yambar_cpu", + "yambar_memory": "yambar_memory" } }, "rust-overlay": { "inputs": { "flake-utils": [ + "grades", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "grades", + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1677812689, + "narHash": "sha256-EakqhgRnjVeYJv5+BJx/NZ7/eFTMBxc4AhICUNquhUg=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "e53e8853aa7b0688bc270e9e6a681d22e01cf299", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { + "inputs": { + "flake-utils": [ + "grades", + "flake-utils" + ], + "nixpkgs": [ + "grades", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1677896940, + "narHash": "sha256-F4YW6/+35dwctY4Ogb/vvMfvA6O0UwhDbXE7urDhk4A=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "c25d3e1951863ac0061d47a3fabf9aa7c91db5e5", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_3": { + "inputs": { + "flake-utils": [ "river_init_lesser", "crane", "flake-utils" @@ -315,7 +603,7 @@ "type": "github" } }, - "rust-overlay_2": { + "rust-overlay_4": { "inputs": { "flake-utils": [ "strip_js_comments", @@ -342,6 +630,60 @@ "type": "github" } }, + "rust-overlay_5": { + "inputs": { + "flake-utils": [ + "yambar_cpu", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "yambar_cpu", + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1677812689, + "narHash": "sha256-EakqhgRnjVeYJv5+BJx/NZ7/eFTMBxc4AhICUNquhUg=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "e53e8853aa7b0688bc270e9e6a681d22e01cf299", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_6": { + "inputs": { + "flake-utils": [ + "yambar_memory", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "yambar_memory", + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1676437770, + "narHash": "sha256-mhJye91Bn0jJIE7NnEywGty/U5qdELfsT8S+FBjTdG4=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "a619538647bd03e3ee1d7b947f7c11ff289b376e", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "shell-library": { "flake": false, "locked": { @@ -376,8 +718,8 @@ }, "strip_js_comments": { "inputs": { - "crane": "crane_2", - "flake-utils": "flake-utils_4", + "crane": "crane_3", + "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs" ], @@ -443,6 +785,50 @@ "repo": "flake-utils", "type": "github" } + }, + "yambar_cpu": { + "inputs": { + "crane": "crane_4", + "flake-utils": "flake-utils_8", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1677938079, + "narHash": "sha256-uTm1qgyLJDCqTGM/1+wlq/ynm+CyRi+zZWqrt/iPctk=", + "ref": "refs/heads/prime", + "rev": "8c4f15cc73cdb1965abf41514365d439e7613a79", + "revCount": 2, + "type": "git", + "url": "https://git.sils.li/ene/yambar_cpu.git" + }, + "original": { + "type": "git", + "url": "https://git.sils.li/ene/yambar_cpu.git" + } + }, + "yambar_memory": { + "inputs": { + "crane": "crane_5", + "flake-utils": "flake-utils_10", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1677938113, + "narHash": "sha256-GuM0agXQ5+hdDNImFKxB8kOerewePa5fh4PvWaRSn+o=", + "ref": "refs/heads/prime", + "rev": "7837d89b943e23d494ea28e0e207c9455c201fc5", + "revCount": 2, + "type": "git", + "url": "https://git.sils.li/ene/yambar_memory.git" + }, + "original": { + "type": "git", + "url": "https://git.sils.li/ene/yambar_memory.git" + } } }, "root": "root", @@ -22,6 +22,10 @@ flake = false; }; + grades = { + url = "git+https://codeberg.org/ene/Grades.git"; + inputs.nixpkgs.follows = "nixpkgs"; + }; strip_js_comments = { url = "git+https://codeberg.org/ene/strip_js_comments.git"; inputs.nixpkgs.follows = "nixpkgs"; @@ -71,6 +75,7 @@ river_init_lesser, yambar_memory, yambar_cpu, + grades, ... } @ inputs: let sysLib = import ./lib {inherit pkgs shell-library;}; @@ -95,6 +100,7 @@ river_init_lesser yambar_memory yambar_cpu + grades ; }; packages."${system}" = { diff --git a/flake/nixosConfigurations/default.nix b/flake/nixosConfigurations/default.nix index 0d49a8f4..670b7a2c 100644 --- a/flake/nixosConfigurations/default.nix +++ b/flake/nixosConfigurations/default.nix @@ -23,6 +23,7 @@ strip_js_comments river_init_lesser + grades # external deps user_js diff --git a/home-manager/config/grades/default.nix b/home-manager/config/grades/default.nix index 22c5a6d4..64af8a63 100644 --- a/home-manager/config/grades/default.nix +++ b/home-manager/config/grades/default.nix @@ -1,3 +1,9 @@ -{config, ...}: { +{ + config, + grades, + ... +}: { xdg.configFile."grades/config.yaml".source = ./config.yaml; + + home.packages = [grades]; } |