diff options
| -rw-r--r-- | flake.lock | 226 | ||||
| -rw-r--r-- | flake.nix | 55 |
2 files changed, 1 insertions, 280 deletions
diff --git a/flake.lock b/flake.lock index 34c02fe..7dc4441 100644 --- a/flake.lock +++ b/flake.lock @@ -72,30 +72,6 @@ "type": "github" } }, - "crane_2": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "yambar_memory", - "nixpkgs" - ], - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1677642623, - "narHash": "sha256-GlRa6/HWg8mIxPM29ZuTP2dP8y9sQ6BdbrjzCO8JgAo=", - "owner": "ipetkov", - "repo": "crane", - "rev": "f3f763e4d9f156ec0c37f39b0f77e2d62213b296", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -112,22 +88,6 @@ "type": "github" } }, - "flake-compat_2": { - "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-parts": { "inputs": { "nixpkgs-lib": [ @@ -168,50 +128,6 @@ "type": "github" } }, - "flake-utils_2": { - "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_version_update": { - "inputs": { - "flake-utils": [ - "shell_library", - "flake-utils" - ], - "nixpkgs": [ - "shell_library", - "nixpkgs" - ], - "systems": [ - "shell_library", - "systems" - ] - }, - "locked": { - "lastModified": 1685288691, - "narHash": "sha256-oP6h34oJ8rm6KlUpyZrX+ww3hnoWny2ecrEXxkU7F3c=", - "ref": "refs/heads/prime", - "rev": "e9a97e01eca780bd16e1dbdbd8856b59558f4959", - "revCount": 5, - "type": "git", - "url": "https://codeberg.org/soispha/flake_version_update.git" - }, - "original": { - "type": "git", - "url": "https://codeberg.org/soispha/flake_version_update.git" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -585,38 +501,6 @@ "type": "github" } }, - "river_init_lesser": { - "inputs": { - "crane": [ - "crane" - ], - "flake-compat": [ - "flake-compat" - ], - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": [ - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1683353540, - "narHash": "sha256-tOf9gfFzWjZxIF/2BAU64aH55xfic6SapKsFqVn6U/8=", - "ref": "refs/heads/prime", - "rev": "aedd2bf8863802443d7b6df94646c239d67b2796", - "revCount": 10, - "type": "git", - "url": "https://codeberg.org/soispha/river_keymap_init.git" - }, - "original": { - "type": "git", - "url": "https://codeberg.org/soispha/river_keymap_init.git" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -641,15 +525,11 @@ "pre-commit-hooks-nix": "pre-commit-hooks-nix", "prismlauncher": "prismlauncher", "ragenix": "ragenix", - "river_init_lesser": "river_init_lesser", "rust-overlay": "rust-overlay", - "shell_library": "shell_library", "sops-nix": "sops-nix", "systems": "systems_2", "treefmt-nix": "treefmt-nix", - "wl-togglescreens": "wl-togglescreens", - "yambar_cpu": "yambar_cpu", - "yambar_memory": "yambar_memory" + "wl-togglescreens": "wl-togglescreens" } }, "rust-overlay": { @@ -675,60 +555,6 @@ "type": "github" } }, - "rust-overlay_2": { - "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": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "flake_version_update": "flake_version_update", - "nixpkgs": [ - "nixpkgs" - ], - "systems": [ - "systems" - ] - }, - "locked": { - "lastModified": 1698240928, - "narHash": "sha256-jUjaDJguM2x0yTWTdgsHd7nHTgIa2gvjjJ8wYXcALfI=", - "ref": "refs/heads/prime", - "rev": "faa6d3ff98e820ee7d815f88926d4fecf00a0644", - "revCount": 107, - "type": "git", - "url": "https://codeberg.org/soispha/shell_library.git" - }, - "original": { - "type": "git", - "url": "https://codeberg.org/soispha/shell_library.git" - } - }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -821,56 +647,6 @@ "type": "git", "url": "https://git.project-insanity.org/onny/wl-togglescreens.git" } - }, - "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_2", - "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", diff --git a/flake.nix b/flake.nix index 02452ee..5c47601 100644 --- a/flake.nix +++ b/flake.nix @@ -139,49 +139,6 @@ flake-utils.follows = "flake-utils"; }; }; - - 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://codeberg.org/soispha/river_keymap_init.git"; - inputs = { - nixpkgs.follows = "nixpkgs"; - crane.follows = "crane"; - flake-utils.follows = "flake-utils"; - rust-overlay.follows = "rust-overlay"; - 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"; - flake-utils.follows = "flake-utils"; - }; - }; - #grades = { - # url = "git+https://codeberg.org/soispha/grades.git"; - # inputs = { - # nixpkgs.follows = "unstable"; - # crane.follows = "crane"; - # flake-utils.follows = "flake-utils"; - # rust-overlay.follows = "rust-overlay"; - # }; - # }; prismlauncher = { url = "github:PrismLauncher/PrismLauncher"; inputs = { @@ -210,11 +167,6 @@ self, nixpkgs, home-manager, - shell_library, - river_init_lesser, - yambar_cpu, - yambar_memory, - #grades, prismlauncher, lanzaboote, nixvim, @@ -231,7 +183,6 @@ inherit system; overlays = [nixvim.overlays.default]; }; - sysLib = shell_library.lib.${system}; nixVimConfig = import ./users/sils/nixvim/config.nix; nvim = nixvim.legacyPackages."${system}".makeNixvim nixVimConfig; in { @@ -264,12 +215,6 @@ self nixpkgs home-manager - shell_library - river_init_lesser - yambar_cpu - yambar_memory - #grades, - prismlauncher lanzaboote nixvim |