From 65aae73568fd8ded39a1a59f6f301ff1615adf38 Mon Sep 17 00:00:00 2001 From: cnst Date: Mon, 12 Aug 2024 17:22:44 +0200 Subject: [PATCH] removing clean from NH, using gc. Also fixing imports for adampad --- flake.lock | 98 +++++++++++++++---------------- system/default.nix | 2 +- system/nix/nh/adampad/default.nix | 2 - system/nix/nh/cnix/default.nix | 4 -- system/nix/nh/toothpc/default.nix | 2 - 5 files changed, 50 insertions(+), 58 deletions(-) diff --git a/flake.lock b/flake.lock index 703d7108..741f9f48 100644 --- a/flake.lock +++ b/flake.lock @@ -81,12 +81,12 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1723215873, - "narHash": "sha256-LuSdVL3GztsIERwdJdr4EeBP9Ris8jbdyL+AlIn8G48=", - "rev": "d756ef86407a02a6749cf4231acbc4cbf7448c61", - "revCount": 1331, + "lastModified": 1723330979, + "narHash": "sha256-OSwb8PTMfnK36trpBS2JShw5HiC2/c6ghT6CpzUJ/y0=", + "rev": "e389756159d7ccfb7cf00645db5b86d94641718c", + "revCount": 1332, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1331%2Brev-d756ef86407a02a6749cf4231acbc4cbf7448c61/019137ae-e116-7d93-871f-03a1793a36a4/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1332%2Brev-e389756159d7ccfb7cf00645db5b86d94641718c/01913e88-a178-7f95-b225-f95a10f0dba4/source.tar.gz" }, "original": { "type": "tarball", @@ -180,11 +180,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1723262595, - "narHash": "sha256-IPMyBC2oLn4ZnpKpfm4QAZhUM1/84CU4ukWNNKFP1is=", + "lastModified": 1723349009, + "narHash": "sha256-nzdTzcDyD8JyQDy30g2rcsrpsN5Qp8CEhtJamKq9Tq8=", "owner": "rycee", "repo": "nur-expressions", - "rev": "e281296c5bb98af6c67bfdc873acfd5bd4a5a07d", + "rev": "ef2d6f05865029005b1e9821ba142935e86dc3fe", "type": "gitlab" }, "original": { @@ -205,11 +205,11 @@ ] }, "locked": { - "lastModified": 1723292846, - "narHash": "sha256-jKATsR783ufImd6pJolhGSa+F6vNMN+bx5VMneMsbeM=", + "lastModified": 1723382313, + "narHash": "sha256-7cB8t9jg02WKLAeoHiZpywVPscuqg4u18F396aamogg=", "owner": "nix-community", "repo": "flake-firefox-nightly", - "rev": "6fc55de16cdbe194dd95cdf10c7727e813e265ff", + "rev": "5489a2d5a212c69f8126af908f82ddaf726a2903", "type": "github" }, "original": { @@ -463,11 +463,11 @@ ] }, "locked": { - "lastModified": 1722857853, - "narHash": "sha256-3Zx53oz/MSIyevuWO/SumxABkrIvojnB7g9cimxkhiE=", + "lastModified": 1723202784, + "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "06939f6b7ec4d4f465bf3132a05367cccbbf64da", + "rev": "c7012d0c18567c889b948781bc74a501e92275d1", "type": "github" }, "original": { @@ -609,11 +609,11 @@ ] }, "locked": { - "lastModified": 1722630065, - "narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=", + "lastModified": 1723015306, + "narHash": "sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA=", "owner": "nix-community", "repo": "home-manager", - "rev": "afc892db74d65042031a093adb6010c4c3378422", + "rev": "b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e", "type": "github" }, "original": { @@ -663,11 +663,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1723241066, - "narHash": "sha256-et+BwLETF5e/9jBHK2GnVh6WGjRztRBThtllMezCvcM=", + "lastModified": 1723322565, + "narHash": "sha256-iwTi2QEc1H6s65Uv7V/Tro/vkvg8WCnpdjzX01mDp7g=", "ref": "refs/heads/main", - "rev": "4fdc0d55e4b44bb5300679025d2378fb6de0cae4", - "revCount": 5074, + "rev": "01ff5fdf6a00a9231bd3b56400d8bcab378c4257", + "revCount": 5076, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -889,11 +889,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1722773431, - "narHash": "sha256-puSEio9yjWojIBDBts4BSGZ43rv1LzIevdYOKmW/Mjg=", + "lastModified": 1723378259, + "narHash": "sha256-8JZVHJAoDgbAk9nn7blBB+wnQbgCq1lIxBsyT7qgeI8=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "04a4b4d84e02590715e753da3d35fb03cddc6425", + "rev": "8834c9b308bf4d9d448dd73be5f9782f4635d4ca", "type": "github" }, "original": { @@ -968,11 +968,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1722734656, - "narHash": "sha256-3Fk8o9WR1oVroPx3hDhmLguzhaFz0OifsIpLXLbef/Q=", + "lastModified": 1723339533, + "narHash": "sha256-WDjDc/5ghWcuD72Wm7UzR9YMe2wi2LCuU5vVFg183nY=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "88aa6c5d59424d979741bc7fc817f02f5b200c08", + "rev": "e8ef080c3f3f307fd94c1e699be66abfcf6677f8", "type": "github" }, "original": { @@ -1046,11 +1046,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1722732880, - "narHash": "sha256-do2Mfm3T6SR7a5A804RhjQ+JTsF5hk4JTPGjCTRM/m8=", + "lastModified": 1723337705, + "narHash": "sha256-znSU0DeNDPt7+LMAfFkvKloMaeQ6yl/U5SqV/ktl1vA=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "8bebd4c74f368aacb047f0141db09ec6b339733c", + "rev": "ace7856d327b618d3777e31b1f224b3ab57ed71a", "type": "github" }, "original": { @@ -1061,11 +1061,11 @@ }, "nixpkgs-small": { "locked": { - "lastModified": 1723274555, - "narHash": "sha256-gDCMNBju0BwYHUPp6RVVnqE0VnbXl53VMk21OT9fkFw=", + "lastModified": 1723316219, + "narHash": "sha256-2B9qh8QBvw3kV/8cHc7ZJcrbVsRwP8wKjkwPXTSz76Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "33c40979a7ccf487d6c0e1a420ecf8e4ac2b676e", + "rev": "bef98989a27429e1cb9e3d9c25701ba2da742af2", "type": "github" }, "original": { @@ -1188,11 +1188,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1722813957, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "lastModified": 1723175592, + "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", + "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", "type": "github" }, "original": { @@ -1215,11 +1215,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1723230145, - "narHash": "sha256-FyjcuYZMqXdiKOXkHaIC2ubag+TPV9Z12urC/sdVI6A=", + "lastModified": 1723323133, + "narHash": "sha256-g3wit604jFhBvjDBziJgulDUXDl/ApafMXq7o7ioMxo=", "owner": "nix-community", "repo": "nixvim", - "rev": "4852f94f8ccae551514df0092a077014bafb95ca", + "rev": "f13bdef0bc697261c51eab686c28c7e2e7b7db3c", "type": "github" }, "original": { @@ -1237,11 +1237,11 @@ ] }, "locked": { - "lastModified": 1722772237, - "narHash": "sha256-3eCYmzeLngX8eutIsTZAG8DIvT/0DWQQxiszTQz8n0s=", + "lastModified": 1723134722, + "narHash": "sha256-wknII7R6ewALIxIKYtqeahjUk/ZrFj1ZtSpNBaHDCyg=", "owner": "NuschtOS", "repo": "search", - "rev": "aa5f6246565cc9b1e697d2c9d6ed2c842b17fff6", + "rev": "1016f4620e321c12ff1dbcd464e9de889e302d1c", "type": "github" }, "original": { @@ -1459,11 +1459,11 @@ ] }, "locked": { - "lastModified": 1722330636, - "narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=", + "lastModified": 1723303070, + "narHash": "sha256-krGNVA30yptyRonohQ+i9cnK+CfCpedg6z3qzqVJcTs=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "768acdb06968e53aa1ee8de207fd955335c754b7", + "rev": "14c092e0326de759e16b37535161b3cb9770cea3", "type": "github" }, "original": { @@ -1481,11 +1481,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1722710858, - "narHash": "sha256-PzMKVcp5ffL4v8+ukuTZRp78DI3kmjUBJUo0Vz5OYC4=", + "lastModified": 1723319758, + "narHash": "sha256-4WYwxNzH/95Vj0IqR2xh4gyiSn8H9bGnBECFWy4vjIk=", "ref": "refs/heads/main", - "rev": "babc7214d9bc5007eb6c0d59a720dea59fa694ac", - "revCount": 696, + "rev": "74656e9da4008f75f3b1d136dbaf1172bf6c232f", + "revCount": 697, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" diff --git a/system/default.nix b/system/default.nix index 24115bf6..2e38e28b 100644 --- a/system/default.nix +++ b/system/default.nix @@ -12,7 +12,7 @@ let adampad = shared ++ [ - ./bin/android + ./opt/android ./srv/blueman ]; cnix = diff --git a/system/nix/nh/adampad/default.nix b/system/nix/nh/adampad/default.nix index b5cfc4fe..e08a19c3 100644 --- a/system/nix/nh/adampad/default.nix +++ b/system/nix/nh/adampad/default.nix @@ -3,8 +3,6 @@ programs = { nh = { enable = true; - clean.enable = true; - clean.extraArgs = "--keep-since 4d --keep 3"; flake = "/home/adam/.nix-config"; }; }; diff --git a/system/nix/nh/cnix/default.nix b/system/nix/nh/cnix/default.nix index 985142b1..f017d427 100644 --- a/system/nix/nh/cnix/default.nix +++ b/system/nix/nh/cnix/default.nix @@ -4,10 +4,6 @@ nh = { enable = true; flake = "/home/cnst/.nix-config"; - # clean = { - # enable = true; - # extraArgs = "--keep-since 4d --keep 3"; - # }; }; }; } diff --git a/system/nix/nh/toothpc/default.nix b/system/nix/nh/toothpc/default.nix index f843c30c..0b9b7627 100644 --- a/system/nix/nh/toothpc/default.nix +++ b/system/nix/nh/toothpc/default.nix @@ -3,8 +3,6 @@ programs = { nh = { enable = true; - clean.enable = true; - clean.extraArgs = "--keep-since 4d --keep 3"; flake = "/home/toothpick/.nix-config"; }; };