From db3341b3fef4b87b82bd9aea69b050218bcc8d57 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Sun, 19 Nov 2023 15:09:57 -0500 Subject: [PATCH] chore: prepare use of cachix --- common/default.nix | 10 ++--- common/home/neovim/default.nix | 4 +- flake.lock | 74 ++++++++++++++++++++++++++-------- flake.nix | 22 +++------- 4 files changed, 70 insertions(+), 40 deletions(-) diff --git a/common/default.nix b/common/default.nix index af150524..f61dd7f8 100644 --- a/common/default.nix +++ b/common/default.nix @@ -17,7 +17,7 @@ ./device-vars.nix home-manager.nixosModules.default - nh.nixosModules.default + #nh.nixosModules.default ./modules/programs.nix ./modules/locale.nix @@ -46,14 +46,14 @@ coc-stylelintplus.overlay ]; - nh = { + /*nh = { enable = true; # weekly cleanup clean = { enable = true; extraArgs = "--keep-since 30d"; }; - }; + };*/ environment.variables.FLAKE = "/home/matt/.nix"; services.xserver = { @@ -77,8 +77,8 @@ ]; home.packages = [ - nix-melt.packages.x86_64-linux.default - nurl.packages.x86_64-linux.default + #nix-melt.packages.x86_64-linux.default + #nurl.packages.x86_64-linux.default ] ++ (with config.nur.repos.rycee; [ diff --git a/common/home/neovim/default.nix b/common/home/neovim/default.nix index fda952f7..a179c793 100644 --- a/common/home/neovim/default.nix +++ b/common/home/neovim/default.nix @@ -49,8 +49,8 @@ in { nil ]; - extraPython3Packages = with pkgs.python311Packages; [ - pylint + extraPython3Packages = ps: [ + ps.pylint ]; coc = { diff --git a/flake.lock b/flake.lock index a70dc1af..ad95ed47 100644 --- a/flake.lock +++ b/flake.lock @@ -387,9 +387,7 @@ "inputs": { "flake-parts": "flake-parts_3", "nix-filter": "nix-filter", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1698826948, @@ -409,7 +407,7 @@ "inputs": { "flake-parts": "flake-parts_5", "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_6", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -444,7 +442,7 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1700417576, @@ -484,9 +482,7 @@ }, "nix-melt": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1700345962, @@ -574,7 +570,7 @@ "flake-compat": "flake-compat_2", "lib-aggregate": "lib-aggregate", "nix-eval-jobs": "nix-eval-jobs", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1700403207, @@ -591,6 +587,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1700204040, + "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1700108881, "narHash": "sha256-+Lqybl8kj0+nD/IlAWPPG/RDTa47gff9nbei0u7BntE=", @@ -606,7 +618,23 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { + "locked": { + "lastModified": 1700204040, + "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1700204040, "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", @@ -622,7 +650,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_6": { "locked": { "lastModified": 1699839047, "narHash": "sha256-FAoWKSDZ9vpd8sLeJYeVGUnSlOCqkSochTEvOA7+qeM=", @@ -638,7 +666,23 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_7": { + "locked": { + "lastModified": 1700204040, + "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { "locked": { "lastModified": 1700204040, "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", @@ -671,9 +715,7 @@ }, "nurl": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1700191567, @@ -700,7 +742,7 @@ "nh": "nh", "nix-gaming": "nix-gaming", "nix-melt": "nix-melt", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_5", "nixpkgs-wayland": "nixpkgs-wayland", "nur": "nur", "nurl": "nurl" diff --git a/flake.nix b/flake.nix index acc7fe22..c968d723 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,6 @@ }; hyprland.url = "github:hyprwm/Hyprland"; - hyprgrass = { url = "github:horriblename/hyprgrass"; inputs.hyprland.follows = "hyprland"; @@ -26,28 +25,17 @@ neovim-flake = { url = "github:nix-community/neovim-nightly-overlay"; + # to make sure plugins and nvim have same binaries inputs.nixpkgs.follows = "nixpkgs"; }; - - nh = { - url = "github:viperML/nh"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - nix-melt = { - url = "github:nix-community/nix-melt"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - nurl = { - url = "github:nix-community/nurl"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - coc-stylelintplus = { url = "github:matt1432/coc-stylelintplus"; inputs.nixpkgs.follows = "nixpkgs"; }; + + nh.url = "github:viperML/nh"; + nix-melt.url = "github:nix-community/nix-melt"; + nurl.url = "github:nix-community/nurl"; }; outputs = { self, nixpkgs, home-manager, nur, nix-gaming, ... }@attrs: let