diff --git a/flake.lock b/flake.lock index 88a2d0e..59d4ac4 100644 --- a/flake.lock +++ b/flake.lock @@ -53,38 +53,6 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.0.1.tar.gz" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-schemas": { "locked": { "narHash": "sha256-j8SR19V1SRysyJwpOBF4TLuAvAjF5t+gMiboN4gYQDU=", @@ -116,42 +84,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -331,62 +263,6 @@ "type": "github" } }, - "lean4-mode": { - "flake": false, - "locked": { - "lastModified": 1709737301, - "narHash": "sha256-uT9JN2kLNKJK9c/S/WxLjiHmwijq49EgLb+gJUSDpz0=", - "owner": "leanprover", - "repo": "lean4-mode", - "rev": "f1f24c15134dee3754b82c9d9924866fe6bc6b9f", - "type": "github" - }, - "original": { - "owner": "leanprover", - "repo": "lean4-mode", - "type": "github" - } - }, - "leanpkgs": { - "inputs": { - "flake-utils": "flake-utils_2", - "lean4-mode": "lean4-mode", - "nix": "nix", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-old": "nixpkgs-old" - }, - "locked": { - "lastModified": 1719054319, - "narHash": "sha256-BSMOUiv5DeGNePtXlJPJGrn0lg+e5w8b01fiPRHtXGs=", - "owner": "leanprover", - "repo": "lean4", - "rev": "d7da45cbe6b743a633ae2168e0394c7cd1759cfe", - "type": "github" - }, - "original": { - "owner": "leanprover", - "repo": "lean4", - "type": "github" - } - }, - "libgit2": { - "flake": false, - "locked": { - "lastModified": 1697646580, - "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", - "owner": "libgit2", - "repo": "libgit2", - "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", - "type": "github" - }, - "original": { - "owner": "libgit2", - "repo": "libgit2", - "type": "github" - } - }, "naersk": { "inputs": { "nixpkgs": [ @@ -407,27 +283,6 @@ "url": "https://flakehub.com/f/nix-community/naersk/0.1.335.tar.gz" } }, - "nix": { - "inputs": { - "flake-compat": "flake-compat_2", - "libgit2": "libgit2", - "nixpkgs": "nixpkgs_3", - "nixpkgs-regression": "nixpkgs-regression" - }, - "locked": { - "lastModified": 1711102798, - "narHash": "sha256-CXOIJr8byjolqG7eqCLa+Wfi7rah62VmLoqSXENaZnw=", - "owner": "NixOS", - "repo": "nix", - "rev": "a22328066416650471c3545b0b138669ea212ab4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nix", - "type": "github" - } - }, "nixlib": { "locked": { "lastModified": 1712450863, @@ -477,39 +332,6 @@ "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.514192.tar.gz" } }, - "nixpkgs-old": { - "flake": false, - "locked": { - "lastModified": 1581379743, - "narHash": "sha256-i1XCn9rKuLjvCdu2UeXKzGLF6IuQePQKFt4hEKRU5oc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "34c7eb7545d155cc5b6f499b23a7cb1c96ab4d59", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-19.03", - "repo": "nixpkgs", - "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_2": { "locked": { "lastModified": 1718530797, @@ -527,22 +349,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1709083642, - "narHash": "sha256-7kkJQd4rZ+vFrzWu8sTRtta5D1kBG0LSRYAfhtmMlSo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b550fe4b4776908ac2a861124307045f8e717c8e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1718983919, "narHash": "sha256-+1xgeIow4gJeiwo4ETvMRvWoircnvb0JOt7NS9kUhoM=", @@ -585,11 +391,9 @@ "flake-utils": "flake-utils", "home-manager": "home-manager", "hyprland": "hyprland", - "leanpkgs": "leanpkgs", "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs_4", - "pesterchum": "pesterchum", - "zig": "zig" + "nixpkgs": "nixpkgs_3", + "pesterchum": "pesterchum" } }, "rust-analyzer-src": { @@ -639,36 +443,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": "hyprland-protocols", @@ -698,28 +472,6 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } - }, - "zig": { - "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_3", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719188778, - "narHash": "sha256-eDOJ5IDiMvgVHsoo7fDO6FzYvFkFRxprtNoOij/xzsQ=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "9adfab2de763981ca5267fe09a5e9f14e731f13e", - "type": "github" - }, - "original": { - "owner": "mitchellh", - "repo": "zig-overlay", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 0f45690..9df056e 100644 --- a/flake.nix +++ b/flake.nix @@ -19,12 +19,6 @@ pesterchum.url = "git+https://g.pyrope.net/pesterchum"; pesterchum.inputs.nixpkgs.follows = "nixpkgs"; - leanpkgs.url = "github:leanprover/lean4"; - leanpkgs.inputs.nixpkgs.follows = "nixpkgs"; - - zig.url = "github:mitchellh/zig-overlay"; - zig.inputs.nixpkgs.follows = "nixpkgs"; - # for l8r :::;) #homeage.url = "github:jordanisaacs/homeage"; #homeage.inputs.nixpkgs.follows = "nixpkgs"; @@ -39,8 +33,6 @@ hyprland, fh, pesterchum, - leanpkgs, - zig, ... }: let @@ -55,10 +47,8 @@ home-manager.useUserPackages = true; home-manager.users.mbk = (import ./home.nix) { inherit conf; - leanpkgs = leanpkgs.packages.x86_64-linux; more-packages = [ pesterchum.packages.x86_64-linux.default - zig.packages.x86_64-linux."0.13.0" ]; }; } diff --git a/home.nix b/home.nix index 1221c7a..e7a541b 100644 --- a/home.nix +++ b/home.nix @@ -1,4 +1,4 @@ -{ conf, more-packages ? [], leanpkgs }: +{ conf, more-packages ? [] }: { config, pkgs, ... }: let wm = conf.wm; @@ -74,7 +74,6 @@ in idris2 # might as well use it consistently - leanpkgs.lean-all # (builtins.foldl' (a: b: "${a} ${b}") "" (builtins.attrNames leanpkgs)) haskell-language-server typst @@ -336,7 +335,6 @@ in package = pkgs.emacs29-pgtk; extraPackages = epkgs: with epkgs; [ lsp-mode - leanpkgs.lean4-mode markdown-mode yaml-mode json-mode