diff options
Diffstat (limited to '')
| -rw-r--r-- | flake.lock | 296 | ||||
| -rw-r--r-- | flake.nix | 57 | ||||
| -rw-r--r-- | flake/default.nix | 3 | ||||
| -rw-r--r-- | sys/svcs/nix/default.nix | 7 |
4 files changed, 45 insertions, 318 deletions
diff --git a/flake.lock b/flake.lock index 08da51ed..e0f06e94 100644 --- a/flake.lock +++ b/flake.lock @@ -11,11 +11,11 @@ ] }, "locked": { - "lastModified": 1696775529, - "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=", + "lastModified": 1701216516, + "narHash": "sha256-jKSeJn+7hZ1dZdiH1L+NWUGT2i/BGomKAJ54B9kT06Q=", "owner": "ryantm", "repo": "agenix", - "rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4", + "rev": "13ac9ac6d68b9a0896e3d43a082947233189e247", "type": "github" }, "original": { @@ -57,11 +57,11 @@ ] }, "locked": { - "lastModified": 1700327093, - "narHash": "sha256-OgYvlBABxJYWhZ/HBd0bPVcIEkT+xDhDCpRYqtVhYWY=", + "lastModified": 1701622587, + "narHash": "sha256-o3XhxCCyrUHZ0tlta2W7/MuXzy+n0+BUt3rKFK3DIK4=", "owner": "ipetkov", "repo": "crane", - "rev": "ae7cd510e508ee03d792005c2f1c0a3ff25ecb80", + "rev": "c09d2cbe84cc2adfe1943cb2a0b55a71c835ca9a", "type": "github" }, "original": { @@ -99,11 +99,11 @@ ] }, "locked": { - "lastModified": 1699781810, - "narHash": "sha256-LD+PIUbm1yQmQmGIbSsc/PB1dtJtGqXFgxRc1C7LlfQ=", + "lastModified": 1701905325, + "narHash": "sha256-lda63LmEIlDMeCgWfjr3/wb487XPllBByfrGRieyEk4=", "owner": "nix-community", "repo": "disko", - "rev": "2d7d77878c5d70f66f3d676ff66708d8d4f9d7df", + "rev": "1144887c6f4d2dcbb2316a24364ef53e25b0fcfe", "type": "github" }, "original": { @@ -156,11 +156,11 @@ ] }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -312,11 +312,11 @@ ] }, "locked": { - "lastModified": 1700191623, - "narHash": "sha256-zRzcWxZ5zOgAF1/9hbOFNrZ2op085745FtFnq8iRBZE=", + "lastModified": 1701883666, + "narHash": "sha256-2GhA3ztnzw5wk35v8/URYl8JPWATh097PNC6J2T3464=", "owner": "nix-community", "repo": "haumea", - "rev": "75b07076cba41abe938671916067d46daf24f8d1", + "rev": "be70ace3588aa0811d6fcf13efb96bbba5a99c39", "type": "github" }, "original": { @@ -332,11 +332,11 @@ ] }, "locked": { - "lastModified": 1700847865, - "narHash": "sha256-uWaOIemGl9LF813MW0AEgCBpKwFo2t1Wv3BZc6e5Frw=", + "lastModified": 1702110948, + "narHash": "sha256-GzK0k5kFgZLbeaOPPoFS4C2BP8vZ0fAH36UtbFRnrWs=", "owner": "nix-community", "repo": "home-manager", - "rev": "8cedd63eede4c22deb192f1721dd67e7460e1ebe", + "rev": "efa36e896951bec8d96e38ea40a22c010bd1bd8f", "type": "github" }, "original": { @@ -427,137 +427,6 @@ "url": "https://codeberg.org/soispha/lf-rename.git" } }, - "my_flake": { - "inputs": { - "agenix": [ - "agenix" - ], - "beautysh": [ - "beautysh" - ], - "crane": [ - "crane" - ], - "disko": [ - "disko" - ], - "flake-compat": [ - "flake-compat" - ], - "flake-utils": [ - "flake-utils" - ], - "flake_update": [ - "flake_update" - ], - "flake_version_update": [ - "flake_version_update" - ], - "generate_firefox_extensions": [ - "generate_firefox_extensions" - ], - "gitignore": [ - "gitignore" - ], - "grades": [ - "grades" - ], - "haumea": [ - "haumea" - ], - "home-manager": [ - "home-manager" - ], - "impermanence": [ - "impermanence" - ], - "lanzaboote": [ - "lanzaboote" - ], - "lf_rename": [ - "lf_rename" - ], - "my_flake": [ - "agenix" - ], - "neovim_config": [ - "neovim_config" - ], - "nixNeovim": [ - "nixNeovim" - ], - "nixNeovimPlugins": [ - "nixNeovimPlugins" - ], - "nixVim": [ - "nixVim" - ], - "nixos-generators": [ - "nixos-generators" - ], - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": [ - "nixpkgs-stable" - ], - "poetry2nix": [ - "poetry2nix" - ], - "pre-commit-hooks": [ - "pre-commit-hooks" - ], - "ragenix": [ - "ragenix" - ], - "river_init_lesser": [ - "river_init_lesser" - ], - "rust-overlay": [ - "rust-overlay" - ], - "serverphone": [ - "serverphone" - ], - "shell_library": [ - "shell_library" - ], - "strip_js_comments": [ - "strip_js_comments" - ], - "systems": [ - "systems" - ], - "templates": [ - "templates" - ], - "user_js": [ - "user_js" - ], - "video_pause": [ - "video_pause" - ], - "yambar_cpu": [ - "yambar_cpu" - ], - "yambar_memory": [ - "yambar_memory" - ] - }, - "locked": { - "lastModified": 1700913998, - "narHash": "sha256-PAY//GQz2FvKm9E7oJk3C8/GWtxdwz436Tti2a/SPNY=", - "ref": "refs/heads/prime", - "rev": "35cde912adcf0269ff91fa43c212446132ebda2b", - "revCount": 1181, - "type": "git", - "url": "https://codeberg.org/soispha/nixos-config.git" - }, - "original": { - "type": "git", - "url": "https://codeberg.org/soispha/nixos-config.git" - } - }, "neovim_config": { "flake": false, "locked": { @@ -574,21 +443,6 @@ "url": "https://codeberg.org/soispha/neovim-config.git" } }, - "nix-flake-tests": { - "locked": { - "lastModified": 1677844186, - "narHash": "sha256-ErJZ/Gs1rxh561CJeWP5bohA2IcTq1rDneu1WT6CVII=", - "owner": "antifuchs", - "repo": "nix-flake-tests", - "rev": "bbd9216bd0f6495bb961a8eb8392b7ef55c67afb", - "type": "github" - }, - "original": { - "owner": "antifuchs", - "repo": "nix-flake-tests", - "type": "github" - } - }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -610,41 +464,6 @@ "type": "github" } }, - "nixNeovim": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "haumea": [ - "haumea" - ], - "home-manager": [ - "home-manager" - ], - "nix-flake-tests": "nix-flake-tests", - "nixneovimplugins": [ - "nixNeovimPlugins" - ], - "nixpkgs": [ - "nixpkgs" - ], - "nmd": "nmd", - "nmt": "nmt" - }, - "locked": { - "lastModified": 1700749313, - "narHash": "sha256-Dg2d3A0HAvleXFXb8kQQZzkGVHyMqDYckOiNOdgCypI=", - "owner": "nixNeovim", - "repo": "nixNeovim", - "rev": "76fca1e012c944d0cdaf7a40404c92f0af924ea5", - "type": "github" - }, - "original": { - "owner": "nixNeovim", - "repo": "nixNeovim", - "type": "github" - } - }, "nixNeovimPlugins": { "inputs": { "flake-utils": [ @@ -658,11 +477,11 @@ ] }, "locked": { - "lastModified": 1700749171, - "narHash": "sha256-cN4ghUPzPxeYygdcDASIzq78NcsoZBtce+Vjjr0yGkU=", + "lastModified": 1701958806, + "narHash": "sha256-U6K2t6Rck/4PTbtrAKUhYnIxG3K3t6pe2IRmygV5Rpk=", "owner": "nixNeovim", "repo": "nixNeovimPlugins", - "rev": "ece5be49c361c19eb615baaa07102b4f8a677213", + "rev": "5010b91eb03696574c3c293f072a090618227e87", "type": "github" }, "original": { @@ -673,9 +492,6 @@ }, "nixVim": { "inputs": { - "beautysh": [ - "beautysh" - ], "flake-utils": [ "flake-utils" ], @@ -687,11 +503,11 @@ ] }, "locked": { - "lastModified": 1700831612, - "narHash": "sha256-4rjt03g847UpPYshwItJqFqxHJ6l4aoXqDVT9CNOCu4=", + "lastModified": 1702118070, + "narHash": "sha256-R8aDOiCkjImFycO/VVmyIZBGBEPyPBYPGUc1t0nRNSg=", "owner": "nix-community", "repo": "nixvim", - "rev": "bacdae2c508defccdff1af8511e4d639d26d3d47", + "rev": "dc14748fe759cbf554330bd1379aad21b8fa05da", "type": "github" }, "original": { @@ -723,11 +539,11 @@ ] }, "locked": { - "lastModified": 1696058303, - "narHash": "sha256-eNqKWpF5zG0SrgbbtljFOrRgFgRzCc4++TMFADBMLnc=", + "lastModified": 1701689616, + "narHash": "sha256-ewnfgvRy73HoP5KnYmy1Rcr4m4yShvsb6TCCaKoW8pc=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "150f38bd1e09e20987feacb1b0d5991357532fb5", + "rev": "246219bc21b943c6f6812bb7744218ba0df08600", "type": "github" }, "original": { @@ -738,11 +554,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700612854, - "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", + "lastModified": 1701718080, + "narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", + "rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335", "type": "github" }, "original": { @@ -754,11 +570,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1700851152, - "narHash": "sha256-3PWITNJZyA3jz5IGREJRfSykM6xSLmD8u5A3WpBCyDM=", + "lastModified": 1701805708, + "narHash": "sha256-hh0S14E816Img0tPaNQSEKFvSscSIrvu1ypubtfh6M4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1216a5ba22a93a4a3a3bfdb4bff0f4727c576fcc", + "rev": "0561103cedb11e7554cf34cea81e5f5d578a4753", "type": "github" }, "original": { @@ -768,38 +584,6 @@ "type": "github" } }, - "nmd": { - "flake": false, - "locked": { - "lastModified": 1687627428, - "narHash": "sha256-7zGfXuNS5RHqhpEdz2fwrtqvF86JRo5U1hrxZSYgcm8=", - "owner": "~rycee", - "repo": "nmd", - "rev": "824a380546b5d0d0eb701ff8cd5dbafb360750ff", - "type": "sourcehut" - }, - "original": { - "owner": "~rycee", - "repo": "nmd", - "type": "sourcehut" - } - }, - "nmt": { - "flake": false, - "locked": { - "lastModified": 1694274695, - "narHash": "sha256-PufoLMSuBYkga8hTqYf/cIQzSuy2lfFj+cdKcp2nLEI=", - "owner": "jooooscha", - "repo": "nmt", - "rev": "29595267923b4a6ce766ff0d85afaa930842b88d", - "type": "github" - }, - "original": { - "owner": "jooooscha", - "repo": "nmt", - "type": "github" - } - }, "poetry2nix": { "inputs": { "flake-utils": [ @@ -815,11 +599,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1700890240, - "narHash": "sha256-AKbWnuDzDuXaYSXHXSj0Sa1DSmUm1KaFNJhf2MEhoS0=", + "lastModified": 1702073125, + "narHash": "sha256-vUCREr5o0/BebmjgIBxAo56zGJ6DfB0FvjB35rsu4aY=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "674fc0ef18bb62f3aea7684e09f20046a3cdfedf", + "rev": "c25a0f550aee8d15879ece3a5c3c8837f3effda7", "type": "github" }, "original": { @@ -942,9 +726,7 @@ "impermanence": "impermanence", "lanzaboote": "lanzaboote", "lf_rename": "lf_rename", - "my_flake": "my_flake", "neovim_config": "neovim_config", - "nixNeovim": "nixNeovim", "nixNeovimPlugins": "nixNeovimPlugins", "nixVim": "nixVim", "nixos-generators": "nixos-generators", @@ -976,11 +758,11 @@ ] }, "locked": { - "lastModified": 1700878361, - "narHash": "sha256-O30hSOliHJhSdhZw5T8JFtxlL309mNLI+agYffuccIo=", + "lastModified": 1702088052, + "narHash": "sha256-FkwIBTAMsxyceQce0Mbm+/+cOjj2r5IHBK4R/ekPNaw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0309d58c91c57e8d519de68312430074de3ef5f8", + "rev": "2cfb76b8e836a26efecd9f853bea78355a11c58a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index cf251beb..9f39d330 100644 --- a/flake.nix +++ b/flake.nix @@ -3,58 +3,8 @@ inputs = { # base - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # 7c9cc5a6e5d38010801741ac830a3f8fd667a7a0 - nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.05"; # 5550a85a087c04ddcace7f892b0bdc9d8bb080c8 - - my_flake = { - url = "git+https://codeberg.org/soispha/nixos-config.git"; - inputs = { - # HACK: This is a workaround to prevent a cyclic dependency, as this 'my_flake' - # can't follow itself. This would obviously cause weird bugs upon use, but, as - # 'my_flake' is only used in the nix-registry this should work <2023-10-22> - my_flake.follows = "agenix"; - - # My flake inputs {{{ - agenix.follows = "agenix"; - beautysh.follows = "beautysh"; - crane.follows = "crane"; - disko.follows = "disko"; - flake-compat.follows = "flake-compat"; - flake-utils.follows = "flake-utils"; - flake_update.follows = "flake_update"; - flake_version_update.follows = "flake_version_update"; - generate_firefox_extensions.follows = "generate_firefox_extensions"; - gitignore.follows = "gitignore"; - grades.follows = "grades"; - haumea.follows = "haumea"; - home-manager.follows = "home-manager"; - impermanence.follows = "impermanence"; - lanzaboote.follows = "lanzaboote"; - lf_rename.follows = "lf_rename"; - neovim_config.follows = "neovim_config"; - nixNeovim.follows = "nixNeovim"; - nixNeovimPlugins.follows = "nixNeovimPlugins"; - nixVim.follows = "nixVim"; - nixos-generators.follows = "nixos-generators"; - nixpkgs-stable.follows = "nixpkgs-stable"; - nixpkgs.follows = "nixpkgs"; - poetry2nix.follows = "poetry2nix"; - pre-commit-hooks.follows = "pre-commit-hooks"; - ragenix.follows = "ragenix"; - river_init_lesser.follows = "river_init_lesser"; - rust-overlay.follows = "rust-overlay"; - serverphone.follows = "serverphone"; - shell_library.follows = "shell_library"; - strip_js_comments.follows = "strip_js_comments"; - systems.follows = "systems"; - templates.follows = "templates"; - user_js.follows = "user_js"; - video_pause.follows = "video_pause"; - yambar_cpu.follows = "yambar_cpu"; - yambar_memory.follows = "yambar_memory"; - # }}} - }; - }; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.05"; # inputs for following systems = { @@ -336,7 +286,6 @@ # core self, nixpkgs, - my_flake, # modules home-manager, nixos-generators, @@ -374,7 +323,6 @@ }); # FIXME: this `nixpkgs` misses the configs applied to the other one nixpkgs_as_input = nixpkgs; - my_flake_as_input = my_flake; outputs = import ./flake { inherit # core @@ -383,7 +331,6 @@ system sysLib nixpkgs_as_input - my_flake_as_input # modules home-manager diff --git a/flake/default.nix b/flake/default.nix index 453c8682..9ee92021 100644 --- a/flake/default.nix +++ b/flake/default.nix @@ -5,7 +5,6 @@ system, sysLib, nixpkgs_as_input, - my_flake_as_input, # modules home-manager, nixNeovim, @@ -85,7 +84,7 @@ # nix registry nixpkgs_as_input - my_flake_as_input + self ; }; in { diff --git a/sys/svcs/nix/default.nix b/sys/svcs/nix/default.nix index 4faafc92..11bae56f 100644 --- a/sys/svcs/nix/default.nix +++ b/sys/svcs/nix/default.nix @@ -3,11 +3,10 @@ # flakes nixpkgs_as_input, templates, - my_flake_as_input, + self, ... }: let nixpkgs = nixpkgs_as_input; - my_flake = my_flake_as_input; in { nix = { package = pkgs.nixStable; @@ -18,8 +17,8 @@ in { t.flake = templates; - my_flake.flake = my_flake; - m.flake = my_flake; + my_flake.flake = self; + m.flake = self; }; gc = { |