From f2fbadc255cc446bd9120208037a4d7d23016f5a Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Sun, 10 Mar 2024 22:24:59 -0500 Subject: [PATCH] Move a ton of programs to Common.nix. --- flake.lock | 1651 +---------------------------- flake.nix | 9 - home-manager/durincore.nix | 80 -- home-manager/este.nix | 91 +- home-manager/gandalf.nix | 95 +- nixos/common.nix | 92 +- nixos/durincore/configuration.nix | 2 +- 7 files changed, 124 insertions(+), 1896 deletions(-) diff --git a/flake.lock b/flake.lock index 70024fd..cba8484 100644 --- a/flake.lock +++ b/flake.lock @@ -1,21 +1,5 @@ { "nodes": { - "HTTP": { - "flake": false, - "locked": { - "lastModified": 1451647621, - "narHash": "sha256-oHIyw3x0iKBexEo49YeUDV1k74ZtyYKGR2gNJXXRxts=", - "owner": "phadej", - "repo": "HTTP", - "rev": "9bc0996d412fef1787449d841277ef663ad9a915", - "type": "github" - }, - "original": { - "owner": "phadej", - "repo": "HTTP", - "type": "github" - } - }, "atuin": { "inputs": { "flake-compat": "flake-compat", @@ -38,108 +22,6 @@ "type": "github" } }, - "bird-nix-lib": { - "inputs": { - "nixfmt": "nixfmt", - "nixpkgs-lib": "nixpkgs-lib", - "systems": "systems_5" - }, - "locked": { - "lastModified": 1695271472, - "narHash": "sha256-fORCFxsGTIGPNtKAxjbC+CmMj5RxWKddnCRj+3y/0t0=", - "owner": "spikespaz", - "repo": "bird-nix-lib", - "rev": "515844f26efca333d48d3b05e607a50dcedca55f", - "type": "github" - }, - "original": { - "owner": "spikespaz", - "repo": "bird-nix-lib", - "type": "github" - } - }, - "blank": { - "locked": { - "lastModified": 1625557891, - "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", - "owner": "divnix", - "repo": "blank", - "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "blank", - "type": "github" - } - }, - "cabal-32": { - "flake": false, - "locked": { - "lastModified": 1603716527, - "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=", - "owner": "haskell", - "repo": "cabal", - "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "3.2", - "repo": "cabal", - "type": "github" - } - }, - "cabal-34": { - "flake": false, - "locked": { - "lastModified": 1645834128, - "narHash": "sha256-wG3d+dOt14z8+ydz4SL7pwGfe7SiimxcD/LOuPCV6xM=", - "owner": "haskell", - "repo": "cabal", - "rev": "5ff598c67f53f7c4f48e31d722ba37172230c462", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "3.4", - "repo": "cabal", - "type": "github" - } - }, - "cabal-36": { - "flake": false, - "locked": { - "lastModified": 1669081697, - "narHash": "sha256-I5or+V7LZvMxfbYgZATU4awzkicBwwok4mVoje+sGmU=", - "owner": "haskell", - "repo": "cabal", - "rev": "8fd619e33d34924a94e691c5fea2c42f0fc7f144", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "3.6", - "repo": "cabal", - "type": "github" - } - }, - "cardano-shell": { - "flake": false, - "locked": { - "lastModified": 1608537748, - "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", - "owner": "input-output-hk", - "repo": "cardano-shell", - "rev": "9392c75087cb9a3d453998f4230930dea3a95725", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "cardano-shell", - "type": "github" - } - }, "deploy-rs": { "inputs": { "flake-compat": "flake-compat_2", @@ -162,95 +44,6 @@ "type": "github" } }, - "deploy-rs_2": { - "inputs": { - "flake-compat": "flake-compat_5", - "nixpkgs": "nixpkgs_5", - "utils": "utils_2" - }, - "locked": { - "lastModified": 1648475189, - "narHash": "sha256-gAGAS6IagwoUr1B0ohE3iR6sZ8hP4LSqzYLC8Mq3WGU=", - "owner": "serokell", - "repo": "deploy-rs", - "rev": "83e0c78291cd08cb827ba0d553ad9158ae5a95c3", - "type": "github" - }, - "original": { - "id": "deploy-rs", - "type": "indirect" - } - }, - "devshell": { - "inputs": { - "flake-utils": [ - "hyprland-nix", - "nixfmt", - "serokell-nix", - "haskell-nix", - "tullia", - "std", - "flake-utils" - ], - "nixpkgs": [ - "hyprland-nix", - "nixfmt", - "serokell-nix", - "haskell-nix", - "tullia", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1663445644, - "narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=", - "owner": "numtide", - "repo": "devshell", - "rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "dmerge": { - "inputs": { - "nixlib": [ - "hyprland-nix", - "nixfmt", - "serokell-nix", - "haskell-nix", - "tullia", - "std", - "nixpkgs" - ], - "yants": [ - "hyprland-nix", - "nixfmt", - "serokell-nix", - "haskell-nix", - "tullia", - "std", - "yants" - ] - }, - "locked": { - "lastModified": 1659548052, - "narHash": "sha256-fzI2gp1skGA8mQo/FBFrUAtY0GQkAIAaV/V127TJPyY=", - "owner": "divnix", - "repo": "data-merge", - "rev": "d160d18ce7b1a45b88344aa3f13ed1163954b497", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "data-merge", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -283,105 +76,9 @@ "type": "github" } }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1648199409, - "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_6": { - "flake": false, - "locked": { - "lastModified": 1627913399, - "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", - "type": "github" - }, - "original": { - "id": "flake-compat", - "type": "indirect" - } - }, - "flake-compat_7": { - "flake": false, - "locked": { - "lastModified": 1672831974, - "narHash": "sha256-z9k3MfslLjWQfnjBtEtJZdq3H7kyi2kQtUThfTgdRk0=", - "owner": "input-output-hk", - "repo": "flake-compat", - "rev": "45f2638735f8cdc40fe302742b79f248d23eb368", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "hkm/gitlab-fix", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_8": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" + "nixpkgs-lib": "nixpkgs-lib" }, "locked": { "lastModified": 1698882062, @@ -415,224 +112,6 @@ "type": "github" } }, - "flake-utils_2": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "locked": { - "lastModified": 1631561581, - "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", - "type": "github" - }, - "original": { - "id": "flake-utils", - "type": "indirect" - } - }, - "flake-utils_5": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_7": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "get-tested-src": { - "flake": false, - "locked": { - "lastModified": 1687355864, - "narHash": "sha256-yQ4coxfnp2Jsw1kvwf2/Zn72Kltze2WrfHN54eLR070=", - "owner": "Sereja313", - "repo": "get-tested", - "rev": "455bbd047374ed907900b49641a4ea7f0a905709", - "type": "github" - }, - "original": { - "owner": "Sereja313", - "ref": "issue-8-emit-ghc-versions", - "repo": "get-tested", - "type": "github" - } - }, - "ghc-8.6.5-iohk": { - "flake": false, - "locked": { - "lastModified": 1600920045, - "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", - "owner": "input-output-hk", - "repo": "ghc", - "rev": "95713a6ecce4551240da7c96b6176f980af75cae", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "release/8.6.5-iohk", - "repo": "ghc", - "type": "github" - } - }, - "gitignore-nix": { - "flake": false, - "locked": { - "lastModified": 1611672876, - "narHash": "sha256-qHu3uZ/o9jBHiA3MEKHJ06k7w4heOhA+4HCSIvflRxo=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "211907489e9f198594c0eb0ca9256a1949c9d412", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gomod2nix": { - "inputs": { - "nixpkgs": "nixpkgs_7", - "utils": "utils_3" - }, - "locked": { - "lastModified": 1655245309, - "narHash": "sha256-d/YPoQ/vFn1+GTmSdvbSBSTOai61FONxB4+Lt6w/IVI=", - "owner": "tweag", - "repo": "gomod2nix", - "rev": "40d32f82fc60d66402eb0972e6e368aeab3faf58", - "type": "github" - }, - "original": { - "owner": "tweag", - "repo": "gomod2nix", - "type": "github" - } - }, - "hackage": { - "flake": false, - "locked": { - "lastModified": 1678926579, - "narHash": "sha256-5t1QRBTsEM2wREtDf3xrHp9Kphs+AdQZKAEltaylIJQ=", - "owner": "input-output-hk", - "repo": "hackage.nix", - "rev": "fb58b0ba5773c5f0211f284b0fae061426cf8267", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "hackage.nix", - "type": "github" - } - }, - "haskell-nix": { - "inputs": { - "HTTP": "HTTP", - "cabal-32": "cabal-32", - "cabal-34": "cabal-34", - "cabal-36": "cabal-36", - "cardano-shell": "cardano-shell", - "flake-compat": "flake-compat_7", - "flake-utils": "flake-utils_5", - "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", - "hackage": "hackage", - "hpc-coveralls": "hpc-coveralls", - "hydra": "hydra", - "iserv-proxy": "iserv-proxy", - "nixpkgs": [ - "hyprland-nix", - "nixfmt", - "serokell-nix", - "haskell-nix", - "nixpkgs-unstable" - ], - "nixpkgs-2003": "nixpkgs-2003", - "nixpkgs-2105": "nixpkgs-2105", - "nixpkgs-2111": "nixpkgs-2111", - "nixpkgs-2205": "nixpkgs-2205", - "nixpkgs-2211": "nixpkgs-2211", - "nixpkgs-unstable": "nixpkgs-unstable", - "old-ghc-nix": "old-ghc-nix", - "stackage": "stackage", - "tullia": "tullia" - }, - "locked": { - "lastModified": 1678950661, - "narHash": "sha256-lvL54W90BTvwLVnFjPYmFVmgHyaGcFrt5FBy1F0rro8=", - "owner": "input-output-hk", - "repo": "haskell.nix", - "rev": "fce554bc6a41d12f7a18a0e8290bf43f925d7a29", - "type": "github" - }, - "original": { - "id": "haskell-nix", - "type": "indirect" - } - }, "home-manager-stable": { "inputs": { "nixpkgs": [ @@ -675,22 +154,6 @@ "type": "github" } }, - "hpc-coveralls": { - "flake": false, - "locked": { - "lastModified": 1607498076, - "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", - "type": "github" - }, - "original": { - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "type": "github" - } - }, "hy3": { "inputs": { "hyprland": "hyprland" @@ -710,32 +173,6 @@ "type": "github" } }, - "hydra": { - "inputs": { - "nix": "nix", - "nixpkgs": [ - "hyprland-nix", - "nixfmt", - "serokell-nix", - "haskell-nix", - "hydra", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1671755331, - "narHash": "sha256-hXsgJj0Cy0ZiCiYdW2OdBz5WmFyOMKuw4zyxKpgUKm4=", - "owner": "NixOS", - "repo": "hydra", - "rev": "f48f00ee6d5727ae3e488cbf9ce157460853fea8", - "type": "github" - }, - "original": { - "id": "hydra", - "type": "indirect" - } - }, "hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols", @@ -784,35 +221,6 @@ "type": "github" } }, - "hyprland-nix": { - "inputs": { - "bird-nix-lib": "bird-nix-lib", - "hyprland": "hyprland_2", - "hyprland-protocols": [ - "hyprland-protocols-git" - ], - "hyprland-xdph": [ - "hyprland-xdph-git" - ], - "hyprlang": "hyprlang_4", - "nixfmt": "nixfmt_2", - "nixpkgs": "nixpkgs_11", - "systems": "systems_6" - }, - "locked": { - "lastModified": 1709595810, - "narHash": "sha256-pwOhYvZPELHWoHsxpc/aAwHrXzBkQ36MjIwvsTTDjJY=", - "owner": "hyprland-community", - "repo": "hyprland-nix", - "rev": "c6bbbe5efd1724f8b24620a740c80c1948b66b26", - "type": "github" - }, - "original": { - "owner": "hyprland-community", - "repo": "hyprland-nix", - "type": "github" - } - }, "hyprland-protocols": { "inputs": { "nixpkgs": [ @@ -842,8 +250,8 @@ }, "hyprland-protocols-git": { "inputs": { - "nixpkgs": "nixpkgs_12", - "systems": "systems_7" + "nixpkgs": "nixpkgs_3", + "systems": "systems_5" }, "locked": { "lastModified": 1691753796, @@ -885,33 +293,6 @@ } }, "hyprland-protocols_3": { - "inputs": { - "nixpkgs": [ - "hyprland-nix", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland-nix", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-protocols_4": { "inputs": { "nixpkgs": [ "hyprland-xdph-git", @@ -938,10 +319,10 @@ }, "hyprland-xdph-git": { "inputs": { - "hyprland-protocols": "hyprland-protocols_4", - "hyprlang": "hyprlang_5", - "nixpkgs": "nixpkgs_13", - "systems": "systems_9" + "hyprland-protocols": "hyprland-protocols_3", + "hyprlang": "hyprlang_3", + "nixpkgs": "nixpkgs_4", + "systems": "systems_7" }, "locked": { "lastModified": 1709299639, @@ -957,35 +338,6 @@ "type": "github" } }, - "hyprland_2": { - "inputs": { - "hyprland-protocols": "hyprland-protocols_3", - "hyprlang": "hyprlang_3", - "nixpkgs": [ - "hyprland-nix", - "nixpkgs" - ], - "systems": [ - "hyprland-nix", - "systems" - ], - "wlroots": "wlroots_3", - "xdph": "xdph_3" - }, - "locked": { - "lastModified": 1708870181, - "narHash": "sha256-SRgG4MR7GXzZxgP0rMHxIkGp0yLEoVCV50nL8TKe+mA=", - "owner": "hyprwm", - "repo": "hyprland", - "rev": "54a8329936d31537411c7a1a4d1815820b98316a", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland", - "type": "github" - } - }, "hyprlang": { "inputs": { "nixpkgs": [ @@ -1034,64 +386,12 @@ } }, "hyprlang_3": { - "inputs": { - "nixpkgs": [ - "hyprland-nix", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland-nix", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1708681732, - "narHash": "sha256-ULZZLZ9C33G13IaXLuAc4oTzHUvnATI8Fj2u6gzMfT0=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "f4466367ef0a92a6425d482050dc2b8840c0e644", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_4": { - "inputs": { - "nixpkgs": [ - "hyprland-nix", - "nixpkgs" - ], - "systems": [ - "hyprland-nix", - "systems" - ] - }, - "locked": { - "lastModified": 1708787654, - "narHash": "sha256-7ACgM3ZuAhPqurXHUvR2nWMRcnmzGGPjLK6q4DSTelI=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "0fce791ba2334aca183f2ed42399518947550d0d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_5": { "inputs": { "nixpkgs": [ "hyprland-xdph-git", "nixpkgs" ], - "systems": "systems_8" + "systems": "systems_6" }, "locked": { "lastModified": 1708681732, @@ -1107,137 +407,6 @@ "type": "github" } }, - "incl": { - "inputs": { - "nixlib": [ - "hyprland-nix", - "nixfmt", - "serokell-nix", - "haskell-nix", - "tullia", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1669263024, - "narHash": "sha256-E/+23NKtxAqYG/0ydYgxlgarKnxmDbg6rCMWnOBqn9Q=", - "owner": "divnix", - "repo": "incl", - "rev": "ce7bebaee048e4cd7ebdb4cee7885e00c4e2abca", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "incl", - "type": "github" - } - }, - "iserv-proxy": { - "flake": false, - "locked": { - "lastModified": 1670983692, - "narHash": "sha256-avLo34JnI9HNyOuauK5R69usJm+GfW3MlyGlYxZhTgY=", - "ref": "hkm/remote-iserv", - "rev": "50d0abb3317ac439a4e7495b185a64af9b7b9300", - "revCount": 10, - "type": "git", - "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" - }, - "original": { - "ref": "hkm/remote-iserv", - "type": "git", - "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" - } - }, - "lowdown-src": { - "flake": false, - "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", - "type": "github" - }, - "original": { - "owner": "kristapsdz", - "repo": "lowdown", - "type": "github" - } - }, - "lowdown-src_2": { - "flake": false, - "locked": { - "lastModified": 1632468475, - "narHash": "sha256-NNOm9CbdA8cuwbvaBHslGbPTiU6bh1Ao+MpEPx4rSGo=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "6bd668af3fd098bdd07a1bedd399564141e275da", - "type": "github" - }, - "original": { - "owner": "kristapsdz", - "repo": "lowdown", - "type": "github" - } - }, - "n2c": { - "inputs": { - "flake-utils": [ - "hyprland-nix", - "nixfmt", - "serokell-nix", - "haskell-nix", - "tullia", - "std", - "flake-utils" - ], - "nixpkgs": [ - "hyprland-nix", - "nixfmt", - "serokell-nix", - "haskell-nix", - "tullia", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1665039323, - "narHash": "sha256-SAh3ZjFGsaCI8FRzXQyp56qcGdAqgKEfJWPCQ0Sr7tQ=", - "owner": "nlewo", - "repo": "nix2container", - "rev": "b008fe329ffb59b67bf9e7b08ede6ee792f2741a", - "type": "github" - }, - "original": { - "owner": "nlewo", - "repo": "nix2container", - "type": "github" - } - }, - "nix": { - "inputs": { - "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_6", - "nixpkgs-regression": "nixpkgs-regression" - }, - "locked": { - "lastModified": 1661606874, - "narHash": "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ=", - "owner": "NixOS", - "repo": "nix", - "rev": "11e45768b34fdafdcf019ddbd337afa16127ff0f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "2.11.0", - "repo": "nix", - "type": "github" - } - }, "nix-fast-build": { "inputs": { "flake-parts": "flake-parts", @@ -1260,174 +429,6 @@ "type": "github" } }, - "nix-nomad": { - "inputs": { - "flake-compat": "flake-compat_8", - "flake-utils": [ - "hyprland-nix", - "nixfmt", - "serokell-nix", - "haskell-nix", - "tullia", - "nix2container", - "flake-utils" - ], - "gomod2nix": "gomod2nix", - "nixpkgs": [ - "hyprland-nix", - "nixfmt", - "serokell-nix", - "haskell-nix", - "tullia", - "nixpkgs" - ], - "nixpkgs-lib": [ - "hyprland-nix", - "nixfmt", - "serokell-nix", - "haskell-nix", - "tullia", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1658277770, - "narHash": "sha256-T/PgG3wUn8Z2rnzfxf2VqlR1CBjInPE0l1yVzXxPnt0=", - "owner": "tristanpemble", - "repo": "nix-nomad", - "rev": "054adcbdd0a836ae1c20951b67ed549131fd2d70", - "type": "github" - }, - "original": { - "owner": "tristanpemble", - "repo": "nix-nomad", - "type": "github" - } - }, - "nix2container": { - "inputs": { - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_8" - }, - "locked": { - "lastModified": 1658567952, - "narHash": "sha256-XZ4ETYAMU7XcpEeAFP3NOl9yDXNuZAen/aIJ84G+VgA=", - "owner": "nlewo", - "repo": "nix2container", - "rev": "60bb43d405991c1378baf15a40b5811a53e32ffa", - "type": "github" - }, - "original": { - "owner": "nlewo", - "repo": "nix2container", - "type": "github" - } - }, - "nix_2": { - "inputs": { - "lowdown-src": "lowdown-src_2", - "nixpkgs": "nixpkgs_10" - }, - "locked": { - "lastModified": 1633098935, - "narHash": "sha256-UtuBczommNLwUNEnfRI7822z4vPA7OoRKsgAZ8zsHQI=", - "owner": "nixos", - "repo": "nix", - "rev": "4f496150eb4e0012914c11f0a3ff4df2412b1d09", - "type": "github" - }, - "original": { - "id": "nix", - "type": "indirect" - } - }, - "nixago": { - "inputs": { - "flake-utils": [ - "hyprland-nix", - "nixfmt", - "serokell-nix", - "haskell-nix", - "tullia", - "std", - "flake-utils" - ], - "nixago-exts": [ - "hyprland-nix", - "nixfmt", - "serokell-nix", - "haskell-nix", - "tullia", - "std", - "blank" - ], - "nixpkgs": [ - "hyprland-nix", - "nixfmt", - "serokell-nix", - "haskell-nix", - "tullia", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1661824785, - "narHash": "sha256-/PnwdWoO/JugJZHtDUioQp3uRiWeXHUdgvoyNbXesz8=", - "owner": "nix-community", - "repo": "nixago", - "rev": "8c1f9e5f1578d4b2ea989f618588d62a335083c3", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixago", - "type": "github" - } - }, - "nixfmt": { - "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_3", - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1686898707, - "narHash": "sha256-HevtbM+imtT46wgZWvpHRKRDQ8dCCK8A4I4pJFgcXMw=", - "owner": "serokell", - "repo": "nixfmt", - "rev": "b3ac0a82870775972c035b426e7503d391b21339", - "type": "github" - }, - "original": { - "owner": "serokell", - "repo": "nixfmt", - "type": "github" - } - }, - "nixfmt_2": { - "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable_2", - "serokell-nix": "serokell-nix" - }, - "locked": { - "lastModified": 1696878571, - "narHash": "sha256-BvphIsOuxV0mJgf68BTJaZy69ejP40gDo/0e+bGrmnU=", - "owner": "serokell", - "repo": "nixfmt", - "rev": "6e6385f06a5e8474a86b3036e0d2f4c9beb54700", - "type": "github" - }, - "original": { - "owner": "serokell", - "repo": "nixfmt", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1709479366, @@ -1444,102 +445,7 @@ "type": "github" } }, - "nixpkgs-2003": { - "locked": { - "lastModified": 1620055814, - "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-20.03-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2105": { - "locked": { - "lastModified": 1659914493, - "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2111": { - "locked": { - "lastModified": 1659446231, - "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.11-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2205": { - "locked": { - "lastModified": 1672580127, - "narHash": "sha256-3lW3xZslREhJogoOkjeZtlBtvFMyxHku7I/9IVehhT8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0874168639713f547c05947c76124f78441ea46c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-22.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2211": { - "locked": { - "lastModified": 1675730325, - "narHash": "sha256-uNvD7fzO5hNlltNQUAFBPlcEjNG5Gkbhl/ROiX+GZU4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b7ce17b1ebf600a72178f6302c77b6382d09323f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-22.11-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-lib": { - "locked": { - "lastModified": 1694911725, - "narHash": "sha256-8YqI+YU1DGclEjHsnrrGfqsQg3Wyga1DfTbJrN3Ud0c=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "819180647f428a3826bfc917a54449da1e532ce0", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-lib_2": { "locked": { "dir": "lib", "lastModified": 1698611440, @@ -1557,55 +463,7 @@ "type": "github" } }, - "nixpkgs-regression": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, "nixpkgs-stable": { - "locked": { - "lastModified": 1672580127, - "narHash": "sha256-3lW3xZslREhJogoOkjeZtlBtvFMyxHku7I/9IVehhT8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0874168639713f547c05947c76124f78441ea46c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1672580127, - "narHash": "sha256-3lW3xZslREhJogoOkjeZtlBtvFMyxHku7I/9IVehhT8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0874168639713f547c05947c76124f78441ea46c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_3": { "locked": { "lastModified": 1709569716, "narHash": "sha256-iOR44RU4jQ+YPGrn+uQeYAp7Xo7Z/+gT+wXJoGxxLTY=", @@ -1621,7 +479,7 @@ "type": "github" } }, - "nixpkgs-stable_4": { + "nixpkgs-stable_2": { "locked": { "lastModified": 1709428628, "narHash": "sha256-//ZCCnpVai/ShtO2vPjh3AWgo8riXCaret6V9s7Hew4=", @@ -1638,22 +496,6 @@ } }, "nixpkgs-unstable": { - "locked": { - "lastModified": 1675758091, - "narHash": "sha256-7gFSQbSVAFUHtGCNHPF7mPc5CcqDk9M2+inlVPZSneg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "747927516efcb5e31ba03b7ff32f61f6d47e7d87", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable_2": { "locked": { "lastModified": 1709479366, "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", @@ -1669,69 +511,6 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1632864508, - "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-21.05-small", - "type": "indirect" - } - }, - "nixpkgs_11": { - "locked": { - "lastModified": 1697723726, - "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_12": { - "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_13": { - "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1708807242, @@ -1750,75 +529,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1667292599, - "narHash": "sha256-7ISOUI1aj6UKMPIL+wwthENL22L3+A9V+jS8Is3QsRo=", + "lastModified": 1708475490, + "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ef2f213d9659a274985778bff4ca322f3ef3ac68", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1667292599, - "narHash": "sha256-7ISOUI1aj6UKMPIL+wwthENL22L3+A9V+jS8Is3QsRo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ef2f213d9659a274985778bff4ca322f3ef3ac68", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1648219316, - "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1657693803, - "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.05-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1653581809, - "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", + "rev": "0e74ca98a74bc7270d28838369593635a5db3260", "type": "github" }, "original": { @@ -1828,69 +543,22 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_4": { "locked": { - "lastModified": 1654807842, - "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", + "lastModified": 1708475490, + "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", + "rev": "0e74ca98a74bc7270d28838369593635a5db3260", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1665087388, - "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nosys": { - "locked": { - "lastModified": 1667881534, - "narHash": "sha256-FhwJ15uPLRsvaxtt/bNuqE/ykMpNAPF0upozFKhTtXM=", - "owner": "divnix", - "repo": "nosys", - "rev": "2d0d5207f6a230e9d0f660903f8db9807b54814f", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "nosys", - "type": "github" - } - }, - "old-ghc-nix": { - "flake": false, - "locked": { - "lastModified": 1631092763, - "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=", - "owner": "angerman", - "repo": "old-ghc-nix", - "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8", - "type": "github" - }, - "original": { - "owner": "angerman", - "ref": "master", - "repo": "old-ghc-nix", - "type": "github" - } - }, "root": { "inputs": { "atuin": "atuin", @@ -1899,50 +567,20 @@ "home-manager-unstable": "home-manager-unstable", "hy3": "hy3", "hyprland-git": "hyprland-git", - "hyprland-nix": "hyprland-nix", "hyprland-protocols-git": "hyprland-protocols-git", "hyprland-xdph-git": "hyprland-xdph-git", "nix-fast-build": "nix-fast-build", - "nixpkgs-stable": "nixpkgs-stable_3", - "nixpkgs-unstable": "nixpkgs-unstable_2", + "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix" } }, - "serokell-nix": { - "inputs": { - "deploy-rs": "deploy-rs_2", - "flake-compat": "flake-compat_6", - "flake-utils": "flake-utils_4", - "get-tested-src": "get-tested-src", - "gitignore-nix": "gitignore-nix", - "haskell-nix": "haskell-nix", - "nix": "nix_2", - "nixpkgs": [ - "hyprland-nix", - "nixfmt", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1695391091, - "narHash": "sha256-vYBB7s9bJxgmMQXFg4XWSd3VW4CYjnBRy7mkv1QXsiE=", - "owner": "serokell", - "repo": "serokell.nix", - "rev": "567820afeec19e53b134038a3f307171eaa6668f", - "type": "github" - }, - "original": { - "owner": "serokell", - "repo": "serokell.nix", - "type": "github" - } - }, "sops-nix": { "inputs": { "nixpkgs": [ "nixpkgs-stable" ], - "nixpkgs-stable": "nixpkgs-stable_4" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1709711091, @@ -1958,76 +596,6 @@ "type": "github" } }, - "stackage": { - "flake": false, - "locked": { - "lastModified": 1678925630, - "narHash": "sha256-rl8qnpAUJl4tRZpaZ5DpgSueNfreArW09t4zTnOaoYA=", - "owner": "input-output-hk", - "repo": "stackage.nix", - "rev": "bf29b23fb77017e78c6e7b199b2c7bfb5079c4cd", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "stackage.nix", - "type": "github" - } - }, - "std": { - "inputs": { - "arion": [ - "hyprland-nix", - "nixfmt", - "serokell-nix", - "haskell-nix", - "tullia", - "std", - "blank" - ], - "blank": "blank", - "devshell": "devshell", - "dmerge": "dmerge", - "flake-utils": "flake-utils_7", - "incl": "incl", - "makes": [ - "hyprland-nix", - "nixfmt", - "serokell-nix", - "haskell-nix", - "tullia", - "std", - "blank" - ], - "microvm": [ - "hyprland-nix", - "nixfmt", - "serokell-nix", - "haskell-nix", - "tullia", - "std", - "blank" - ], - "n2c": "n2c", - "nixago": "nixago", - "nixpkgs": "nixpkgs_9", - "nosys": "nosys", - "yants": "yants" - }, - "locked": { - "lastModified": 1674526466, - "narHash": "sha256-tMTaS0bqLx6VJ+K+ZT6xqsXNpzvSXJTmogkraBGzymg=", - "owner": "divnix", - "repo": "std", - "rev": "516387e3d8d059b50e742a2ff1909ed3c8f82826", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "std", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -2090,16 +658,16 @@ }, "systems_5": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -2133,36 +701,6 @@ "type": "github" } }, - "systems_8": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_9": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -2184,33 +722,6 @@ "type": "github" } }, - "tullia": { - "inputs": { - "nix-nomad": "nix-nomad", - "nix2container": "nix2container", - "nixpkgs": [ - "hyprland-nix", - "nixfmt", - "serokell-nix", - "haskell-nix", - "nixpkgs" - ], - "std": "std" - }, - "locked": { - "lastModified": 1675695930, - "narHash": "sha256-B7rEZ/DBUMlK1AcJ9ajnAPPxqXY6zW2SBX+51bZV0Ac=", - "owner": "input-output-hk", - "repo": "tullia", - "rev": "621365f2c725608f381b3ad5b57afef389fd4c31", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "tullia", - "type": "github" - } - }, "utils": { "inputs": { "systems": "systems_2" @@ -2229,36 +740,6 @@ "type": "github" } }, - "utils_2": { - "locked": { - "lastModified": 1648297722, - "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_3": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "wlroots": { "flake": false, "locked": { @@ -2297,25 +778,6 @@ "type": "gitlab" } }, - "wlroots_3": { - "flake": false, - "locked": { - "host": "gitlab.freedesktop.org", - "lastModified": 1708558866, - "narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=", - "owner": "wlroots", - "repo": "wlroots", - "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", - "type": "gitlab" - }, - "original": { - "host": "gitlab.freedesktop.org", - "owner": "wlroots", - "repo": "wlroots", - "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", - "type": "gitlab" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ @@ -2385,69 +847,6 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } - }, - "xdph_3": { - "inputs": { - "hyprland-protocols": [ - "hyprland-nix", - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "hyprland-nix", - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland-nix", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland-nix", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1708696469, - "narHash": "sha256-shh5wmpeYy3MmsBfkm4f76yPsBDGk6OLYRVG+ARy2F0=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "1b713911c2f12b96c2574474686e4027ac4bf826", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } - }, - "yants": { - "inputs": { - "nixpkgs": [ - "hyprland-nix", - "nixfmt", - "serokell-nix", - "haskell-nix", - "tullia", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1667096281, - "narHash": "sha256-wRRec6ze0gJHmGn6m57/zhz/Kdvp9HS4Nl5fkQ+uIuA=", - "owner": "divnix", - "repo": "yants", - "rev": "d18f356ec25cb94dc9c275870c3a7927a10f8c3c", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "yants", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index f9f00a1..1a0edfd 100644 --- a/flake.nix +++ b/flake.nix @@ -66,15 +66,6 @@ # hyprland-protocols hyprland-protocols-git.url = "github:hyprwm/hyprland-protocols"; - - # hyprland-community nix - hyprland-nix = { - url = "github:hyprland-community/hyprland-nix"; - inputs = { - hyprland-xdph.follows = "hyprland-xdph-git"; - hyprland-protocols.follows = "hyprland-protocols-git"; - }; - }; }; # The `@` syntax here is used to alias the attribute set of the diff --git a/home-manager/durincore.nix b/home-manager/durincore.nix index 36870c9..8c1cd25 100644 --- a/home-manager/durincore.nix +++ b/home-manager/durincore.nix @@ -140,7 +140,6 @@ }; }; - # please change the username & home direcotry to your own home.username = "jahanson"; home.homeDirectory = "/home/jahanson"; @@ -158,8 +157,6 @@ }; }; - # exa replacement, ls replacement. - programs.lsd.enable = true; programs.fish = { enable = true; shellAliases = { @@ -196,31 +193,13 @@ # here is some command line tools I use frequently # feel free to add your own or remove some of them - # terminal file managers - nnn - ranger - yazi - # Hyprland must haves xfce.thunar # gui file manager wofi # Run Menu waybar # Wayland bar for Sway and Wlroots based compositors dunst # A lightweight replacement for the notification-daemons provided by most desktop environments - # archives - zip - xz - unzip - p7zip - # utils - go-task - ripgrep # recursively searches directories for a regex pattern - jq # A lightweight and flexible command-line JSON processor - yq-go # yaml processer https://github.com/mikefarah/yq - fzf # A command-line fuzzy finder - age # sops-age encryption - sops direnv # shell environment management pre-commit # Pre-commit tasks for git minio-client # S3 management @@ -230,15 +209,6 @@ _1password-gui _1password - # networking tools - iperf3 - dnsutils # `dig` + `nslookup` - ldns # replacement of `dig`, it provide the command `drill` - aria2 # A lightweight multi-protocol & multi-source command-line download utility - socat # replacement of openbsd-netcat - nmap # A utility for network discovery and security auditing - ipcalc # it is a calculator for the IPv4/v6 addresses - # kubernetes k9s kubectl @@ -251,16 +221,6 @@ lens # misc - fastfetch - cowsay - file - which - tree - gnused - gnutar - gawk - zstd - gnupg fira-code-nerdfont # nix related @@ -271,24 +231,8 @@ nixd # nix lsp server # productivity - hugo # static site generator glow # markdown previewer in terminal - btop # replacement of htop/nmon - iotop # io monitoring - iftop # network monitoring - - # system call monitoring - strace # system call monitoring - ltrace # library call monitoring - lsof # list open files - - # system tools - sysstat - lm_sensors # for `sensors` command - ethtool - pciutils # lspci - usbutils # lsusb rtx # rtx package manager # Browsers @@ -302,32 +246,8 @@ # Dev vscode termius - atuin ]; - # starship - an customizable prompt for any shell - programs.starship = { - enable = true; - # custom settings - settings = { - add_newline = false; - aws.disabled = true; - gcloud.disabled = true; - line_break.disabled = true; - username = { - disabled = false; - show_always = true; - format = "[$user]($style)@"; - }; - hostname ={ - disabled = false; - ssh_only = false; - format = "[$hostname]($style) "; - ssh_symbol = ""; - }; - }; - }; - # alacritty - a cross-platform, GPU-accelerated terminal emulator programs.alacritty = { enable = true; diff --git a/home-manager/este.nix b/home-manager/este.nix index 4b18fc2..d9c9d19 100644 --- a/home-manager/este.nix +++ b/home-manager/este.nix @@ -16,9 +16,6 @@ userEmail = "joe@veri.dev"; }; - # exa replacement, ls replacement. - programs.lsd.enable = true; - # Fish configuration programs.fish = { enable = true; @@ -40,6 +37,9 @@ direnv hook fish | source set -gx PATH $PATH $HOME/.krew/bin ''; + interactiveShellInit = '' + atuin init fish | source + ''; functions = { fish_greeting = { description = "Set the fish greeting"; @@ -48,102 +48,17 @@ }; }; - # starship - an customizable prompt for any shell - programs.starship = { - enable = true; - # custom settings - settings = { - add_newline = false; - aws.disabled = true; - gcloud.disabled = true; - line_break.disabled = true; - username = { - disabled = false; - show_always = true; - format = "[$user]($style)@"; - }; - hostname ={ - disabled = false; - ssh_only = false; - format = "[$hostname]($style) "; - }; - }; - }; - # Packages that should be installed to the user profile. home.packages = with pkgs; [ # here is some command line tools I use frequently # feel free to add your own or remove some of them - fastfetch - go-task - - # terminal file managers - nnn - ranger - yazi - - # archives - zip - xz - unzip - p7zip - - # utils - ripgrep # recursively searches directories for a regex pattern - jq # A lightweight and flexible command-line JSON processor - yq-go # yaml processer https://github.com/mikefarah/yq - fzf # A command-line fuzzy finder - age # sops-age encryption - sops - direnv # shell environment management - pre-commit # Pre-commit tasks for git - minio-client # S3 management - shellcheck - envsubst - - # networking tools - mtr # A network diagnostic tool - iperf3 - dnsutils # `dig` + `nslookup` - ldns # replacement of `dig`, it provide the command `drill` - aria2 # A lightweight multi-protocol & multi-source command-line download utility - socat # replacement of openbsd-netcat - nmap # A utility for network discovery and security auditing - ipcalc # it is a calculator for the IPv4/v6 addresses - - # misc - cowsay - file - which - tree - gnused - gnutar - gawk - zstd - gnupg - # nix related # # it provides the command `nom` works just like `nix` # with more details log output nix-output-monitor - btop # replacement of htop/nmon - iotop # io monitoring - iftop # network monitoring - - # system call monitoring - strace # system call monitoring - ltrace # library call monitoring - lsof # list open files - - # system tools - sysstat - lm_sensors # for `sensors` command - ethtool - pciutils # lspci - usbutils # lsusb ]; home.stateVersion = "23.11"; diff --git a/home-manager/gandalf.nix b/home-manager/gandalf.nix index f1a978e..6c1a2d1 100644 --- a/home-manager/gandalf.nix +++ b/home-manager/gandalf.nix @@ -9,39 +9,13 @@ homeDirectory = "/home/jahanson"; }; - # basic configuration of git, please change to your own + # basic configuration of git, please change to your own programs.git = { enable = true; userName = "Joseph Hanson"; userEmail = "joe@veri.dev"; }; - # starship - an customizable prompt for any shell - programs.starship = { - enable = true; - # custom settings - settings = { - add_newline = false; - aws.disabled = true; - gcloud.disabled = true; - line_break.disabled = true; - username = { - disabled = false; - show_always = true; - format = "[$user]($style)@"; - }; - hostname ={ - disabled = false; - ssh_only = false; - format = "[$hostname]($style) "; - ssh_symbol = ""; - }; - }; - }; - - # exa replacement, ls replacement. - programs.lsd.enable = true; - # Fish configuration programs.fish = { enable = true; @@ -66,6 +40,9 @@ direnv hook fish | source set -gx PATH $PATH $HOME/.krew/bin ''; + interactiveShellInit = '' + atuin init fish | source + ''; functions = { fish_greeting = { description = "Set the fish greeting"; @@ -79,75 +56,11 @@ # here is some command line tools I use frequently # feel free to add your own or remove some of them - fastfetch - go-task - - # terminal file managers - nnn - ranger - yazi - - # archives - zip - xz - unzip - p7zip - - # utils - ripgrep # recursively searches directories for a regex pattern - jq # A lightweight and flexible command-line JSON processor - yq-go # yaml processer https://github.com/mikefarah/yq - fzf # A command-line fuzzy finder - age # sops-age encryption - sops - direnv # shell environment management - pre-commit # Pre-commit tasks for git - minio-client # S3 management - shellcheck - envsubst - - # networking tools - mtr # A network diagnostic tool - iperf3 - dnsutils # `dig` + `nslookup` - ldns # replacement of `dig`, it provide the command `drill` - aria2 # A lightweight multi-protocol & multi-source command-line download utility - socat # replacement of openbsd-netcat - nmap # A utility for network discovery and security auditing - ipcalc # it is a calculator for the IPv4/v6 addresses - - # misc - cowsay - file - which - tree - gnused - gnutar - gawk - zstd - gnupg - # nix related # # it provides the command `nom` works just like `nix` # with more details log output nix-output-monitor - - btop # replacement of htop/nmon - iotop # io monitoring - iftop # network monitoring - - # system call monitoring - strace # system call monitoring - ltrace # library call monitoring - lsof # list open files - - # system tools - sysstat - lm_sensors # for `sensors` command - ethtool - pciutils # lspci - usbutils # lsusb ]; home.stateVersion = "23.11"; diff --git a/nixos/common.nix b/nixos/common.nix index d8aab32..5ba0531 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -88,10 +88,100 @@ nfs-utils borgbackup borgmatic - ]; + #utils + ripgrep # recursively searches directories for a regex pattern + jq # A lightweight and flexible command-line JSON processor + yq-go # yaml processer https://github.com/mikefarah/yq + fzf # A command-line fuzzy finder + age # sops-age encryption + sops + lsd + + #misc + cowsay + file + which + tree + gnused + gnutar + gawk + zstd + gnupg + fastfetch + atuin + go-task + + # archives + zip + xz + unzip + p7zip + + # terminal file managers + nnn + ranger + yazi + + # networking tools + iperf3 + dnsutils # `dig` + `nslookup` + ldns # replacement of `dig`, it provide the command `drill` + aria2 # A lightweight multi-protocol & multi-source command-line download utility + socat # replacement of openbsd-netcat + nmap # A utility for network discovery and security auditing + ipcalc # it is a calculator for the IPv4/v6 addresses + + # system tools + sysstat + lm_sensors # for `sensors` command + ethtool + pciutils # lspci + usbutils # lsusb + + # system call monitoring + strace # system call monitoring + ltrace # library call monitoring + lsof # list open files + + btop # replacement of htop/nmon + iotop # io monitoring + iftop # network monitoring + + # utils + direnv # shell environment management + pre-commit # Pre-commit tasks for git + minio-client # S3 management + shellcheck + envsubst + + ]; + # my traceroute programs.mtr.enable = true; + # starship - an customizable prompt for any shell + programs.starship = { + enable = true; + # custom settings + settings = { + add_newline = false; + aws.disabled = true; + gcloud.disabled = true; + line_break.disabled = true; + username = { + disabled = false; + show_always = true; + format = "[$user]($style)@"; + }; + hostname ={ + disabled = false; + ssh_only = false; + format = "[$hostname]($style) "; + ssh_symbol = ""; + }; + }; + }; + # Enable/Start Tailscale service services.tailscale.enable = true; diff --git a/nixos/durincore/configuration.nix b/nixos/durincore/configuration.nix index 98de12c..4db8b8d 100644 --- a/nixos/durincore/configuration.nix +++ b/nixos/durincore/configuration.nix @@ -87,7 +87,7 @@ # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "23.11"; # Did you read the comment? + system.stateVersion = "24.05"; # Did you read the comment? # Register app image as an executable and run it with appimage-run boot.binfmt.registrations.appimage = {