From ebfe5f8dd23a1463434a49d273395f3b623f35a1 Mon Sep 17 00:00:00 2001 From: dadada Date: Sat, 4 Mar 2023 12:03:11 +0100 Subject: [PATCH] remove some flake inputs --- flake.lock | 682 +++++---------------------------------- flake.nix | 27 +- home/home/pkgs.nix | 1 - hydra-jobs.nix | 2 +- nixos/configurations.nix | 4 +- outputs.nix | 13 +- pkgs/default.nix | 4 +- 7 files changed, 93 insertions(+), 640 deletions(-) diff --git a/flake.lock b/flake.lock index 4c1feef..d810d52 100644 --- a/flake.lock +++ b/flake.lock @@ -3,7 +3,7 @@ "agenix": { "inputs": { "nixpkgs": [ - "myNixpkgs" + "nixpkgs" ] }, "locked": { @@ -24,11 +24,11 @@ "crane": { "flake": false, "locked": { - "lastModified": 1654444508, - "narHash": "sha256-4OBvQ4V7jyt7afs6iKUvRzJ1u/9eYnKzVQbeQdiamuY=", + "lastModified": 1661875961, + "narHash": "sha256-f1h/2c6Teeu1ofAHWzrS8TwBPcnN+EEu+z1sRVmMQTk=", "owner": "ipetkov", "repo": "crane", - "rev": "db5482bf225acc3160899124a1df5a617cfa27b5", + "rev": "d9f394e4e20e97c2a60c3ad82c2b6ef99be19e24", "type": "github" }, "original": { @@ -41,15 +41,15 @@ "inputs": { "flake-utils": "flake-utils", "nixpkgs": [ - "myNixpkgs" + "nixpkgs" ] }, "locked": { - "lastModified": 1677576895, - "narHash": "sha256-EtV2sOcIxqZUVijAb5HyCIq7Oft72bgQ3Me8YlKd5jE=", + "lastModified": 1677856503, + "narHash": "sha256-TW8my47VpavO/PXA5hIumUcX80cj0AufojjUTdUonLw=", "owner": "numtide", "repo": "devshell", - "rev": "05a1e4a4b02cb7bfc8d031064f9d5a2cc27c8847", + "rev": "643d1857fea4e71e7f251cb574f59b1d63778085", "type": "github" }, "original": { @@ -61,11 +61,11 @@ "devshell_2": { "flake": false, "locked": { - "lastModified": 1655976588, - "narHash": "sha256-VreHyH6ITkf/1EX/8h15UqhddJnUleb0HgbC3gMkAEQ=", + "lastModified": 1667210711, + "narHash": "sha256-IoErjXZAkzYWHEpQqwu/DeRNJGFdR7X2OGbkhMqMrpw=", "owner": "numtide", "repo": "devshell", - "rev": "899ca4629020592a13a46783587f6e674179d1db", + "rev": "96a9dd12b8a447840cc246e17a47b81a4268bba7", "type": "github" }, "original": { @@ -74,94 +74,58 @@ "type": "github" } }, - "doom-emacs": { - "flake": false, - "locked": { - "lastModified": 1662497747, - "narHash": "sha256-4n7E1fqda7cn5/F2jTkOnKw1juG6XMS/FI9gqODL3aU=", - "owner": "doomemacs", - "repo": "doomemacs", - "rev": "3853dff5e11655e858d0bfae64b70cb12ef685ac", - "type": "github" - }, - "original": { - "owner": "doomemacs", - "repo": "doomemacs", - "rev": "3853dff5e11655e858d0bfae64b70cb12ef685ac", - "type": "github" - } - }, - "doom-snippets": { - "flake": false, - "locked": { - "lastModified": 1676839496, - "narHash": "sha256-1Ay9zi0u1lycmEeFqIxr0RWH+JvH9BnzgRzkPeWEAYY=", - "owner": "doomemacs", - "repo": "snippets", - "rev": "fe4003014ae00b866f117cb193f711fd9d72fd11", - "type": "github" - }, - "original": { - "owner": "doomemacs", - "repo": "snippets", - "type": "github" - } - }, "dream2nix": { "inputs": { "alejandra": [ "helix", - "nixCargoIntegration", - "nixpkgs" + "nci" + ], + "all-cabal-json": [ + "helix", + "nci" ], "crane": "crane", "devshell": [ "helix", - "nixCargoIntegration", + "nci", "devshell" ], "flake-utils-pre-commit": [ "helix", - "nixCargoIntegration", - "nixpkgs" + "nci" + ], + "ghc-utils": [ + "helix", + "nci" ], "gomod2nix": [ "helix", - "nixCargoIntegration", - "nixpkgs" + "nci" ], "mach-nix": [ "helix", - "nixCargoIntegration", - "nixpkgs" + "nci" ], "nixpkgs": [ "helix", - "nixCargoIntegration", - "nixpkgs" - ], - "node2nix": [ - "helix", - "nixCargoIntegration", + "nci", "nixpkgs" ], "poetry2nix": [ "helix", - "nixCargoIntegration", - "nixpkgs" + "nci" ], "pre-commit-hooks": [ "helix", - "nixCargoIntegration", - "nixpkgs" + "nci" ] }, "locked": { - "lastModified": 1655975833, - "narHash": "sha256-g8sdfuglIZ24oWVbntVzniNTJW+Z3n9DNL9w9Tt+UCE=", + "lastModified": 1668851003, + "narHash": "sha256-X7RCQQynbxStZR2m7HW38r/msMQwVl3afD6UXOCtvx4=", "owner": "nix-community", "repo": "dream2nix", - "rev": "4e75e665ec3a1cddae5266bed0dd72fce0b74a23", + "rev": "c77e8379d8fe01213ba072e40946cbfb7b58e628", "type": "github" }, "original": { @@ -170,135 +134,6 @@ "type": "github" } }, - "emacs-overlay": { - "flake": false, - "locked": { - "lastModified": 1676366521, - "narHash": "sha256-i4UAY8t9Au9SJtsgYppa3NHSVf1YkV6yqnNIQd+Km4g=", - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "c16be6de78ea878aedd0292aa5d4a1ee0a5da501", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "c16be6de78ea878aedd0292aa5d4a1ee0a5da501", - "type": "github" - } - }, - "emacs-so-long": { - "flake": false, - "locked": { - "lastModified": 1575031854, - "narHash": "sha256-xIa5zO0ZaToDrec1OFjBK6l39AbA4l/CE4LInVu2hi0=", - "owner": "hlissner", - "repo": "emacs-so-long", - "rev": "ed666b0716f60e8988c455804de24b55919e71ca", - "type": "github" - }, - "original": { - "owner": "hlissner", - "repo": "emacs-so-long", - "type": "github" - } - }, - "evil-escape": { - "flake": false, - "locked": { - "lastModified": 1588439096, - "narHash": "sha256-aB2Ge5o/93B18tPf4fN1c+O46CNh/nOqwLJbox4c8Gw=", - "owner": "hlissner", - "repo": "evil-escape", - "rev": "819f1ee1cf3f69a1ae920e6004f2c0baeebbe077", - "type": "github" - }, - "original": { - "owner": "hlissner", - "repo": "evil-escape", - "type": "github" - } - }, - "evil-markdown": { - "flake": false, - "locked": { - "lastModified": 1626852210, - "narHash": "sha256-HBBuZ1VWIn6kwK5CtGIvHM1+9eiNiKPH0GUsyvpUVN8=", - "owner": "Somelauw", - "repo": "evil-markdown", - "rev": "8e6cc68af83914b2fa9fd3a3b8472573dbcef477", - "type": "github" - }, - "original": { - "owner": "Somelauw", - "repo": "evil-markdown", - "type": "github" - } - }, - "evil-org-mode": { - "flake": false, - "locked": { - "lastModified": 1607203864, - "narHash": "sha256-JxwqVYDN6OIJEH15MVI6XOZAPtUWUhJQWHyzcrUvrFg=", - "owner": "hlissner", - "repo": "evil-org-mode", - "rev": "a9706da260c45b98601bcd72b1d2c0a24a017700", - "type": "github" - }, - "original": { - "owner": "hlissner", - "repo": "evil-org-mode", - "type": "github" - } - }, - "evil-quick-diff": { - "flake": false, - "locked": { - "lastModified": 1575189609, - "narHash": "sha256-oGzl1ayW9rIuq0haoiFS7RZsS8NFMdEA7K1BSozgnJU=", - "owner": "rgrinberg", - "repo": "evil-quick-diff", - "rev": "69c883720b30a892c63bc89f49d4f0e8b8028908", - "type": "github" - }, - "original": { - "owner": "rgrinberg", - "repo": "evil-quick-diff", - "type": "github" - } - }, - "explain-pause-mode": { - "flake": false, - "locked": { - "lastModified": 1595842060, - "narHash": "sha256-++znrjiDSx+cy4okFBBXUBkRFdtnE2x+trkmqjB3Njs=", - "owner": "lastquestion", - "repo": "explain-pause-mode", - "rev": "2356c8c3639cbeeb9751744dbe737267849b4b51", - "type": "github" - }, - "original": { - "owner": "lastquestion", - "repo": "explain-pause-mode", - "type": "github" - } - }, - "flake-compat": { - "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": 1642700792, @@ -331,11 +166,11 @@ }, "flake-utils_3": { "locked": { - "lastModified": 1637014545, - "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { @@ -345,36 +180,6 @@ } }, "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": 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_6": { "locked": { "lastModified": 1623875721, "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", @@ -389,55 +194,25 @@ "type": "github" } }, - "flake-utils_7": { - "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "format-all": { - "flake": false, - "locked": { - "lastModified": 1581716637, - "narHash": "sha256-ul7LCe60W8TIvUmUtZtZRo8489TK9iTPDsLHmzxY57M=", - "owner": "lassik", - "repo": "emacs-format-all-the-code", - "rev": "47d862d40a088ca089c92cd393c6dca4628f87d3", - "type": "github" - }, - "original": { - "owner": "lassik", - "repo": "emacs-format-all-the-code", - "rev": "47d862d40a088ca089c92cd393c6dca4628f87d3", - "type": "github" - } - }, "helix": { "inputs": { - "nixCargoIntegration": "nixCargoIntegration", - "nixpkgs": "nixpkgs", + "nci": "nci", + "nixpkgs": [ + "nixpkgs" + ], "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1662052066, - "narHash": "sha256-tMO4wFXVRE/TPxOtaEpgu95Hff8PekqXZPt4e+5Di78=", + "lastModified": 1670381690, + "narHash": "sha256-0VPEA2XixJ+5NGS0zcnntcDWDByUQD4EFuoSSE+Q7yk=", "owner": "helix-editor", "repo": "helix", - "rev": "66276ce630cead06c84394768927fe20490d0638", + "rev": "96ff64a84a4948b0aa85a453276cb0091fb9c792", "type": "github" }, "original": { "owner": "helix-editor", - "ref": "22.08.1", + "ref": "22.12", "repo": "helix", "type": "github" } @@ -445,16 +220,16 @@ "home-manager": { "inputs": { "nixpkgs": [ - "myNixpkgs" + "nixpkgs" ], "utils": "utils" }, "locked": { - "lastModified": 1677711157, - "narHash": "sha256-6/c88G/5i/SzjTcGix4e9d60aIRDlTZ0aVJ2iXSO/DA=", + "lastModified": 1677757546, + "narHash": "sha256-tA1ukoluctzLVyWRaKtD4KlTwgXbUsGB5vcyni1OJ9I=", "owner": "nix-community", "repo": "home-manager", - "rev": "a7d3f51e9e01cecebe9e00bf417bc2111c2a9202", + "rev": "86bb69b0b1e10d99a30c4352f230f03106dd0f8a", "type": "github" }, "original": { @@ -467,7 +242,7 @@ "homePage": { "inputs": { "hugo-theme-anubis": "hugo-theme-anubis", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1655227494, @@ -499,83 +274,7 @@ "type": "github" } }, - "myNixpkgs": { - "locked": { - "lastModified": 1677624842, - "narHash": "sha256-4DF9DbDuK4/+KYx0L6XcPBeDHUFVCtzok2fWtwXtb5w=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d70f5cd5c3bef45f7f52698f39e7cc7a89daa7f0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nix-doom-emacs": { - "inputs": { - "doom-emacs": "doom-emacs", - "doom-snippets": "doom-snippets", - "emacs-overlay": "emacs-overlay", - "emacs-so-long": "emacs-so-long", - "evil-escape": "evil-escape", - "evil-markdown": "evil-markdown", - "evil-org-mode": "evil-org-mode", - "evil-quick-diff": "evil-quick-diff", - "explain-pause-mode": "explain-pause-mode", - "flake-compat": "flake-compat", - "flake-utils": "flake-utils_4", - "format-all": "format-all", - "nix-straight": "nix-straight", - "nixpkgs": [ - "myNixpkgs" - ], - "nose": "nose", - "ob-racket": "ob-racket", - "org": "org", - "org-contrib": "org-contrib", - "org-yt": "org-yt", - "php-extras": "php-extras", - "revealjs": "revealjs", - "rotate-text": "rotate-text", - "sln-mode": "sln-mode", - "ts-fold": "ts-fold", - "ws-butler": "ws-butler" - }, - "locked": { - "lastModified": 1677326276, - "narHash": "sha256-dfKLWggIQ6F0/WXa52ZBO6NGrCpwVKU4WcLvZwbOHJg=", - "owner": "nix-community", - "repo": "nix-doom-emacs", - "rev": "c283bcf19b64aba8c50d5618cb58457967f6cdb7", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-doom-emacs", - "type": "github" - } - }, - "nix-straight": { - "flake": false, - "locked": { - "lastModified": 1666982610, - "narHash": "sha256-xjgIrmUsekVTE+MpZb5DMU8DQf9DJ/ZiR0o30L9/XCc=", - "owner": "nix-community", - "repo": "nix-straight.el", - "rev": "ad10364d64f472c904115fd38d194efe1c3f1226", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-straight.el", - "type": "github" - } - }, - "nixCargoIntegration": { + "nci": { "inputs": { "devshell": "devshell_2", "dream2nix": "dream2nix", @@ -589,11 +288,11 @@ ] }, "locked": { - "lastModified": 1656453541, - "narHash": "sha256-ZCPVnS6zJOZJvIlwU3rKR8MBVm6A3F4/0mA7G1lQ3D0=", + "lastModified": 1669011203, + "narHash": "sha256-Lymj4HktNEFmVXtwI0Os7srDXHZbZW0Nzw3/+5Hf8ko=", "owner": "yusdacra", "repo": "nix-cargo-integration", - "rev": "9eb74345b30cd2e536d9dac9d4435d3c475605c7", + "rev": "c5133b91fc1d549087c91228bd213f2518728a4b", "type": "github" }, "original": { @@ -604,11 +303,11 @@ }, "nixlib": { "locked": { - "lastModified": 1636849918, - "narHash": "sha256-nzUK6dPcTmNVrgTAC1EOybSMsrcx+QrVPyqRdyKLkjA=", + "lastModified": 1677373009, + "narHash": "sha256-kxhz4QUP8tXa/yVSpEzDDZSEp9FvhzRqZzb+SeUaekw=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "28a5b0557f14124608db68d3ee1f77e9329e9dd5", + "rev": "c9d4f2476046c6a7a2ce3c2118c48455bf0272ea", "type": "github" }, "original": { @@ -625,11 +324,11 @@ ] }, "locked": { - "lastModified": 1676297861, - "narHash": "sha256-YECUmK34xzg0IERpnbCnaO6z6YgfecJlstMWX7dqOZ8=", + "lastModified": 1677834279, + "narHash": "sha256-JHKdz4+KtDcCuIxt7jl03/wv3gMVCN5cHuED7SYS75c=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "1e0a05219f2a557d4622bc38f542abb360518795", + "rev": "59d63c5bb0574048d3519c268fccf73e57220bf5", "type": "github" }, "original": { @@ -655,22 +354,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1655624069, - "narHash": "sha256-7g1zwTdp35GMTERnSzZMWJ7PG3QdDE8VOX3WsnOkAtM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "0d68d7c857fe301d49cdcd56130e0beea4ecd5aa", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1629226339, "narHash": "sha256-szvgmQcUJM3Kv/wNyIn+wtMrrvsks0bk9JOqI2Ij8Ao=", @@ -683,6 +366,22 @@ "type": "indirect" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1677779205, + "narHash": "sha256-6DBjL9wjq86p2GczmwnHtFRnWPBPItc67gapWENBgX8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "96e18717904dfedcd884541e5a92bf9ff632cf39", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_3": { "locked": { "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", @@ -694,126 +393,9 @@ "type": "indirect" } }, - "nose": { - "flake": false, - "locked": { - "lastModified": 1400604510, - "narHash": "sha256-daEi8Kta1oGaDEmUUDDQMahTTPOpvNpDKk22rlr7cB0=", - "owner": "emacsattic", - "repo": "nose", - "rev": "f8528297519eba911696c4e68fa88892de9a7b72", - "type": "github" - }, - "original": { - "owner": "emacsattic", - "repo": "nose", - "type": "github" - } - }, - "nvd": { - "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": [ - "myNixpkgs" - ] - }, - "locked": { - "lastModified": 1665876905, - "narHash": "sha256-rZJuhvO7hIPezbwFESOEdGm+ZJldrEiPIvyhICJ6xoQ=", - "ref": "refs/heads/master", - "rev": "f87f29530beb039d283530ab533d700c53120b83", - "revCount": 25, - "type": "git", - "url": "https://gitlab.com/khumba/nvd.git" - }, - "original": { - "type": "git", - "url": "https://gitlab.com/khumba/nvd.git" - } - }, - "ob-racket": { - "flake": false, - "locked": { - "lastModified": 1584656173, - "narHash": "sha256-rBUYDDCXb+3D4xTPQo9UocbTPZ32kWV1Uya/1DmZknU=", - "owner": "xchrishawk", - "repo": "ob-racket", - "rev": "83457ec9e1e96a29fd2086ed19432b9d75787673", - "type": "github" - }, - "original": { - "owner": "xchrishawk", - "repo": "ob-racket", - "type": "github" - } - }, - "org": { - "flake": false, - "locked": { - "lastModified": 1677145298, - "narHash": "sha256-r5hCcLiBYspW7mTK1cHyLktcPMRTVs8FYI44iK85A0o=", - "owner": "emacs-straight", - "repo": "org-mode", - "rev": "351279ffaead08398002fd29801eaad688ccf239", - "type": "github" - }, - "original": { - "owner": "emacs-straight", - "repo": "org-mode", - "type": "github" - } - }, - "org-contrib": { - "flake": false, - "locked": { - "lastModified": 1675694242, - "narHash": "sha256-4Fn33CTVTCqh5TyVAggSr8Fm8/hB8Xgl+hkxh3WCrI8=", - "owner": "emacsmirror", - "repo": "org-contrib", - "rev": "fff6c888065588527b1c1d7dd7e41c29ef767e17", - "type": "github" - }, - "original": { - "owner": "emacsmirror", - "repo": "org-contrib", - "type": "github" - } - }, - "org-yt": { - "flake": false, - "locked": { - "lastModified": 1527381913, - "narHash": "sha256-dzQ6B7ryzatHCTLyEnRSbWO0VUiX/FHYnpHTs74aVUs=", - "owner": "TobiasZawada", - "repo": "org-yt", - "rev": "40cc1ac76d741055cbefa13860d9f070a7ade001", - "type": "github" - }, - "original": { - "owner": "TobiasZawada", - "repo": "org-yt", - "type": "github" - } - }, - "php-extras": { - "flake": false, - "locked": { - "lastModified": 1573312690, - "narHash": "sha256-r4WyVbzvT0ra4Z6JywNBOw5RxOEYd6Qe2IpebHXkj1U=", - "owner": "arnested", - "repo": "php-extras", - "rev": "d410c5af663c30c01d461ac476d1cbfbacb49367", - "type": "github" - }, - "original": { - "owner": "arnested", - "repo": "php-extras", - "type": "github" - } - }, "recipemd": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs_3" }, "locked": { @@ -831,22 +413,6 @@ "type": "github" } }, - "revealjs": { - "flake": false, - "locked": { - "lastModified": 1677036091, - "narHash": "sha256-mHAl+kWxSVfYTQjwbhAHuxAwnm4gAPb4plHIn12gXcg=", - "owner": "hakimel", - "repo": "reveal.js", - "rev": "cd019514f3d4924bae6caaaf5383a068cc1320d7", - "type": "github" - }, - "original": { - "owner": "hakimel", - "repo": "reveal.js", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -855,32 +421,10 @@ "helix": "helix", "home-manager": "home-manager", "homePage": "homePage", - "myNixpkgs": "myNixpkgs", - "nix-doom-emacs": "nix-doom-emacs", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": [ - "myNixpkgs" - ], - "nvd": "nvd", - "recipemd": "recipemd", - "scripts": "scripts" - } - }, - "rotate-text": { - "flake": false, - "locked": { - "lastModified": 1322962747, - "narHash": "sha256-SOeOgSlcEIsKhUiYDJv0p+mLUb420s9E2BmvZQvZ0wk=", - "owner": "debug-ito", - "repo": "rotate-text.el", - "rev": "48f193697db996855aee1ad2bc99b38c6646fe76", - "type": "github" - }, - "original": { - "owner": "debug-ito", - "repo": "rotate-text.el", - "type": "github" + "nixpkgs": "nixpkgs_2", + "recipemd": "recipemd" } }, "rust-overlay": { @@ -892,11 +436,11 @@ ] }, "locked": { - "lastModified": 1655779671, - "narHash": "sha256-6feeiGa6fb7ZPVHR71uswkmN1701TAJpwYQA8QffmRk=", + "lastModified": 1668998422, + "narHash": "sha256-G/BklIplCHZEeDIabaaxqgITdIXtMolRGlwxn9jG2/Q=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8159585609a772b041cce6019d5c21d240709244", + "rev": "68ab029c93f8f8eed4cf3ce9a89a9fd4504b2d6e", "type": "github" }, "original": { @@ -905,60 +449,6 @@ "type": "github" } }, - "scripts": { - "inputs": { - "flake-utils": "flake-utils_7", - "nixpkgs": [ - "myNixpkgs" - ] - }, - "locked": { - "lastModified": 1627838887, - "narHash": "sha256-Ew4I0VynDGTmB+b4ScYcHyt+Vtcvx5L3dSCee0hxvP8=", - "ref": "main", - "rev": "c73d546857270e0e039939df4b09914a3a6d5ae1", - "revCount": 6, - "type": "git", - "url": "https://git.dadada.li/dadada/scripts.git" - }, - "original": { - "ref": "main", - "type": "git", - "url": "https://git.dadada.li/dadada/scripts.git" - } - }, - "sln-mode": { - "flake": false, - "locked": { - "lastModified": 1423727528, - "narHash": "sha256-XqkqPyEJuTtFslOz1fpTf/Klbd/zA7IGpzpmum/MGao=", - "owner": "sensorflo", - "repo": "sln-mode", - "rev": "0f91d1b957c7d2a7bab9278ec57b54d57f1dbd9c", - "type": "github" - }, - "original": { - "owner": "sensorflo", - "repo": "sln-mode", - "type": "github" - } - }, - "ts-fold": { - "flake": false, - "locked": { - "lastModified": 1677013151, - "narHash": "sha256-ssKzQ4VBeE2IBz8NZ35u3tnLMABdpBOQ8TCUWsYt3nE=", - "owner": "jcs-elpa", - "repo": "ts-fold", - "rev": "9d9e0c5cf7b5397e06571bb6bf497598dc8796a8", - "type": "github" - }, - "original": { - "owner": "jcs-elpa", - "repo": "ts-fold", - "type": "github" - } - }, "utils": { "locked": { "lastModified": 1667395993, @@ -973,22 +463,6 @@ "repo": "flake-utils", "type": "github" } - }, - "ws-butler": { - "flake": false, - "locked": { - "lastModified": 1634511126, - "narHash": "sha256-c0y0ZPtxxICPk+eaNbbQf6t+FRCliNY54CCz9QHQ8ZI=", - "owner": "hlissner", - "repo": "ws-butler", - "rev": "572a10c11b6cb88293de48acbb59a059d36f9ba5", - "type": "github" - }, - "original": { - "owner": "hlissner", - "repo": "ws-butler", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index b484b51..228de40 100644 --- a/flake.nix +++ b/flake.nix @@ -2,26 +2,13 @@ description = "dadada's nix flake"; inputs = { - myNixpkgs.url = github:NixOS/nixpkgs/nixos-22.11; + nixpkgs.url = github:NixOS/nixpkgs/nixos-22.11; flake-utils.url = github:numtide/flake-utils; home-manager = { url = github:nix-community/home-manager/release-22.11; - inputs.nixpkgs.follows = "myNixpkgs"; - }; - nix-doom-emacs = { - url = github:nix-community/nix-doom-emacs; - inputs.nixpkgs.follows = "myNixpkgs"; + inputs.nixpkgs.follows = "nixpkgs"; }; nixos-hardware.url = github:NixOS/nixos-hardware/master; - nixpkgs.follows = "myNixpkgs"; - nvd = { - url = git+https://gitlab.com/khumba/nvd.git; - inputs.nixpkgs.follows = "myNixpkgs"; - }; - scripts = { - url = git+https://git.dadada.li/dadada/scripts.git?ref=main; - inputs.nixpkgs.follows = "myNixpkgs"; - }; homePage = { url = github:dadada/dadada.li; }; @@ -30,14 +17,16 @@ }; agenix = { url = github:ryantm/agenix/0.13.0; - inputs.nixpkgs.follows = "myNixpkgs"; + inputs.nixpkgs.follows = "nixpkgs"; }; devshell = { url = github:numtide/devshell; - inputs.nixpkgs.follows = "myNixpkgs"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + helix = { + url = github:helix-editor/helix/22.12; + inputs.nixpkgs.follows = "nixpkgs"; }; - helix.url = github:helix-editor/helix/22.08.1; - nixos-generators = { url = "github:nix-community/nixos-generators"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/home/pkgs.nix b/home/home/pkgs.nix index e9b752a..aa2d17f 100644 --- a/home/home/pkgs.nix +++ b/home/home/pkgs.nix @@ -90,7 +90,6 @@ with pkgs; [ nix-index nmap nmon - nvd obs-studio openscad openssl diff --git a/hydra-jobs.nix b/hydra-jobs.nix index 135b95e..86205e7 100644 --- a/hydra-jobs.nix +++ b/hydra-jobs.nix @@ -2,4 +2,4 @@ (nixpkgs.lib.mapAttrs' (name: config: nixpkgs.lib.nameValuePair name config.config.system.build.toplevel) self.nixosConfigurations -) // self.checks.x86_64-linux +) diff --git a/nixos/configurations.nix b/nixos/configurations.nix index 9eb2b1e..9c32756 100644 --- a/nixos/configurations.nix +++ b/nixos/configurations.nix @@ -4,8 +4,6 @@ , home-manager , homePage , nixos-hardware -, nvd -, scripts , recipemd , helix , nixos-generators @@ -28,7 +26,7 @@ in { nixpkgs.overlays = nixpkgs.lib.attrValues self.overlays; dadada.pkgs = (getDefaultPkgs system { - inherit scripts nvd recipemd; + inherit recipemd; }) // self.packages.${system}; # Add flakes to registry and nix path. diff --git a/outputs.nix b/outputs.nix index 1e10599..960cb90 100644 --- a/outputs.nix +++ b/outputs.nix @@ -4,10 +4,7 @@ , homePage , nixpkgs , home-manager -, nix-doom-emacs , nixos-hardware -, nvd -, scripts , recipemd , agenix , devshell @@ -16,9 +13,7 @@ } @ inputs: (flake-utils.lib.eachDefaultSystem (system: let - pkgs = nixpkgs.legacyPackages.${system}; - selfPkgs = self.packages.${system}; - formatter = self.formatter.${system}; + pkgs = import nixpkgs { inherit system; }; in { devShells.default = @@ -34,7 +29,7 @@ in import ./devshell.nix { inherit pkgs extraModules; }; - formatter = nixpkgs.legacyPackages."${system}".nixpkgs-fmt; + formatter = pkgs.nixpkgs-fmt; jobsets = (import ./jobsets.nix { inherit pkgs; @@ -47,13 +42,13 @@ }; nixpkgs = { type = "git"; - value = "git://github.com/NixOS/nixpkgs.git nixpkgs-22.05"; + value = "git://github.com/NixOS/nixpkgs.git nixpkgs-22.11"; emailresponsible = false; }; }; }); - packages = import ./pkgs (inputs // { inherit pkgs; }); + packages = import ./pkgs { inherit pkgs; }; })) // { diff --git a/pkgs/default.nix b/pkgs/default.nix index a7ce200..a9983e9 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,6 +1,4 @@ -{ pkgs -, ... -} @ inputs: +{ pkgs }: { map = pkgs.callPackage ./map.nix { }; }