From fb3183055c3d8e5cffd5a3564a90d639ca2f40d4 Mon Sep 17 00:00:00 2001 From: jolheiser Date: Tue, 5 Sep 2023 16:23:08 -0500 Subject: [PATCH] chore: tidy flake Signed-off-by: jolheiser --- apps/gui/default.nix | 10 +-- apps/nogui/default.nix | 6 +- apps/nogui/nushell.nix | 18 ++-- flake.lock | 173 ++++++-------------------------------- flake.nix | 31 +++++-- machines/chai/default.nix | 4 +- 6 files changed, 67 insertions(+), 175 deletions(-) diff --git a/apps/gui/default.nix b/apps/gui/default.nix index 1550be5..101e25f 100644 --- a/apps/gui/default.nix +++ b/apps/gui/default.nix @@ -27,11 +27,11 @@ # IDEs jetbrains.goland - # Personal NUR - nur.repos.jolheiser.gomodinit - nur.repos.jolheiser.imp - nur.repos.jolheiser.kv - nur.repos.jolheiser.tmpl + # Flake overlays + jolheiser.gomodinit + jolheiser.imp + jolheiser.kv + jolheiser.tmpl ]; }; } diff --git a/apps/nogui/default.nix b/apps/nogui/default.nix index 0de7a0d..63c2148 100644 --- a/apps/nogui/default.nix +++ b/apps/nogui/default.nix @@ -40,9 +40,9 @@ alejandra gofumpt - # Personal NUR - nur.repos.jolheiser.git-age - nur.repos.jolheiser.tclip + # Flake overlays + jolheiser.git-age + tclip ]; activation.report-changes = config.lib.dag.entryAnywhere '' ${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff $oldGenPath $newGenPath diff --git a/apps/nogui/nushell.nix b/apps/nogui/nushell.nix index e10870e..bdc3972 100644 --- a/apps/nogui/nushell.nix +++ b/apps/nogui/nushell.nix @@ -15,16 +15,16 @@ ll = "ls -al"; nix-shell = "nix-shell --run nu"; }; - extraConfig = '' - use ${pkgs.nu_scripts}/share/nu_scripts/custom-completions/bitwarden-cli/bitwarden-cli-completions.nu * - use ${pkgs.nu_scripts}/share/nu_scripts/custom-completions/btm/btm-completions.nu * - use ${pkgs.nu_scripts}/share/nu_scripts/custom-completions/git/git-completions.nu * - use ${pkgs.nu_scripts}/share/nu_scripts/custom-completions/glow/glow-completions.nu * - use ${pkgs.nu_scripts}/share/nu_scripts/custom-completions/just/just-completions.nu * - use ${pkgs.nu_scripts}/share/nu_scripts/custom-completions/nix/nix-completions.nu * + extraConfig = with pkgs; '' + use ${nu_scripts}/share/nu_scripts/custom-completions/bitwarden-cli/bitwarden-cli-completions.nu * + use ${nu_scripts}/share/nu_scripts/custom-completions/btm/btm-completions.nu * + use ${nu_scripts}/share/nu_scripts/custom-completions/git/git-completions.nu * + use ${nu_scripts}/share/nu_scripts/custom-completions/glow/glow-completions.nu * + use ${nu_scripts}/share/nu_scripts/custom-completions/just/just-completions.nu * + use ${nu_scripts}/share/nu_scripts/custom-completions/nix/nix-completions.nu * - use ${pkgs.nur.repos.jolheiser.kv}/share/kv-completions.nu * - use ${pkgs.nur.repos.jolheiser.tmpl}/share/tmpl-completions.nu * + use ${jolheiser.kv}/share/kv-completions.nu * + use ${jolheiser.tmpl}/share/tmpl-completions.nu * ''; extraEnv = '' $env.GOPATH = "${config.xdg.dataHome}/go" diff --git a/flake.lock b/flake.lock index 0f4200a..3b52f69 100644 --- a/flake.lock +++ b/flake.lock @@ -3,7 +3,7 @@ "agenix": { "inputs": { "darwin": [], - "home-manager": "home-manager", + "home-manager": [], "nixpkgs": [ "nixpkgs" ] @@ -40,28 +40,14 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "golink": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs" + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1689362244, @@ -103,27 +89,6 @@ } }, "home-manager": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1682203081, - "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -145,7 +110,9 @@ }, "jolheiser-nur": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1692850752, @@ -163,17 +130,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1682929865, - "narHash": "sha256-jxVrgnf5QNjO+XoxDxUWtN2G5xyJSGZ5SWDQFxMuHxc=", - "owner": "NixOS", + "lastModified": 1693060755, + "narHash": "sha256-KNsbfqewEziFJEpPR0qvVz4rx0x6QXxw1CcunRhlFdk=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "f2e9a130461950270f87630b11132323706b4d91", + "rev": "c66ccfa00c643751da2fd9290e096ceaa30493fc", "type": "github" }, "original": { - "id": "nixpkgs", + "owner": "nixos", "ref": "nixpkgs-unstable", - "type": "indirect" + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-py36": { @@ -192,53 +160,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1688556768, - "narHash": "sha256-mhd6g0iJGjEfOr3+6mZZOclUveeNr64OwxdbNtLc8mY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "27bd67e55fe09f9d68c77ff151c3e44c4f81f7de", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1693060755, - "narHash": "sha256-KNsbfqewEziFJEpPR0qvVz4rx0x6QXxw1CcunRhlFdk=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c66ccfa00c643751da2fd9290e096ceaa30493fc", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1692447944, - "narHash": "sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d680ded26da5cf104dd2735a51e88d2d8f487b4d", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, "nur": { "locked": { "lastModified": 1693943116, @@ -259,9 +180,9 @@ "agenix": "agenix", "flake-utils": "flake-utils", "golink": "golink", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "jolheiser-nur": "jolheiser-nur", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs", "nixpkgs-py36": "nixpkgs-py36", "nur": "nur", "tclip": "tclip" @@ -282,41 +203,15 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "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" - } - }, "tclip": { "inputs": { "gomod2nix": "gomod2nix", - "nixpkgs": "nixpkgs_4", - "utils": "utils" + "nixpkgs": [ + "nixpkgs" + ], + "utils": [ + "flake-utils" + ] }, "locked": { "lastModified": 1693326365, @@ -331,24 +226,6 @@ "repo": "tclip", "type": "github" } - }, - "utils": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index d508554..d2bdbd0 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,8 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + nixpkgs-py36.url = "github:nixos/nixpkgs/34f85de51bbc74595e63b22ee089adbb31f7c7a2"; + home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -12,18 +14,32 @@ inputs = { nixpkgs.follows = "nixpkgs"; darwin.follows = ""; + home-manager.follows = ""; }; }; flake-utils.url = "github:numtide/flake-utils"; nur.url = "github:nix-community/NUR"; - jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur"; - - nixpkgs-py36.url = "github:nixos/nixpkgs/34f85de51bbc74595e63b22ee089adbb31f7c7a2"; + jolheiser-nur = { + url = "git+https://git.jojodev.com/jolheiser/nur"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # Other flakes - golink.url = "github:tailscale/golink"; - tclip.url = "github:tailscale-dev/tclip"; + golink = { + url = "github:tailscale/golink"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + }; + }; + tclip = { + url = "github:tailscale-dev/tclip"; + inputs = { + nixpkgs.follows = "nixpkgs"; + utils.follows = "flake-utils"; + }; + }; }; outputs = { @@ -42,10 +58,9 @@ nur = import inputs.nur { nurpkgs = prev; pkgs = prev; - repoOverrides = { - jolheiser = import jolheiser-nur {pkgs = prev;}; - }; }; + jolheiser = inputs.jolheiser-nur.packages.${prev.system}; + tclip = inputs.tclip.packages.${prev.system}.tclip; }) golink.overlay ]; diff --git a/machines/chai/default.nix b/machines/chai/default.nix index 837f4b9..7f55f51 100644 --- a/machines/chai/default.nix +++ b/machines/chai/default.nix @@ -57,8 +57,8 @@ in { teams-for-linux xorg.xauth - # Personal NUR - nur.repos.jolheiser.prospect-mail + # Flake overlay + jolheiser.prospect-mail ]; system.stateVersion = "22.11";