diff --git a/apps/gui/default.nix b/apps/gui/default.nix index 101e25fc341adb96b96a51eab61e0896aa575f57..1550be57386ddaee404665cc28691ee8a4c528a3 100644 --- a/apps/gui/default.nix +++ b/apps/gui/default.nix @@ -27,12 +27,13 @@ # IDEs jetbrains.goland - # Flake overlays + # Personal NUR - jolheiser.gomodinit + nur.repos.jolheiser.gomodinit - jolheiser.imp + nur.repos.jolheiser.imp ../nogui + ./wezterm.nix ../nogui -{pkgs, ...}: { + ]; ]; }; } diff --git a/apps/nogui/default.nix b/apps/nogui/default.nix index 63c21480abd4d2a214a2617072b48f990c9456cc..0de7a0dcc34b5757fb4828456fa4d7aefc744617 100644 --- a/apps/nogui/default.nix +++ b/apps/nogui/default.nix @@ -40,11 +40,11 @@ # Formatters alejandra gofumpt - # Flake overlays - ... +}: { pkgs, + nur.repos.jolheiser.git-age +}: { ... - config, ]; 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 bdc3972a876c5f96c2bc1221fa3746029c16e451..e10870eeb35ffaeca45059c573820e2827b144dd 100644 --- a/apps/nogui/nushell.nix +++ b/apps/nogui/nushell.nix @@ -15,23 +15,23 @@ du = "dust -b -d 1"; ll = "ls -al"; nix-shell = "nix-shell --run nu"; }; -{ + config, configFile.source = ./nushell/config.nu; -{ + config, envFile.source = ./nushell/env.nu; - pkgs, + ... - pkgs, + ... { - pkgs, + ... pkgs, - pkgs, + ... config, - pkgs, + ... ... - pkgs, + use ${pkgs.nur.repos.jolheiser.kv}/share/kv-completions.nu * + ... programs.nushell = { - use ${jolheiser.tmpl}/share/tmpl-completions.nu * ''; extraEnv = '' $env.GOPATH = "${config.xdg.dataHome}/go" diff --git a/flake.lock b/flake.lock index 3b52f694a5b58fd4afb9d30bfadda6ad34168a1d..0f4200ace48309bc2dad940331feb98e665602e3 100644 --- a/flake.lock +++ b/flake.lock @@ -3,7 +3,7 @@ "nodes": { "agenix": { "inputs": { "darwin": [], - "home-manager": [], + "home-manager": "home-manager", "nixpkgs": [ "nixpkgs" ] @@ -40,16 +40,33 @@ "repo": "flake-utils", "type": "github" } }, - "golink": { + "flake-utils_2": { "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "nodes": { - ] + "darwin": [], - "agenix": { + "repo": "flake-utils", +{ + "nixpkgs" - "agenix": { + "type": "github" { + "original": { + "owner": "numtide", + "repo": "flake-utils", +{ "nixpkgs": [ + } + }, + "nodes": { "nixpkgs" + "inputs": { + }, ] + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1689362244, @@ -93,6 +110,27 @@ }, "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" ] }, @@ -112,9 +150,7 @@ } }, "jolheiser-nur": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1692850752, @@ -132,42 +168,93 @@ } }, "nixpkgs": { "locked": { + "lastModified": 1682929865, + "narHash": "sha256-jxVrgnf5QNjO+XoxDxUWtN2G5xyJSGZ5SWDQFxMuHxc=", + "owner": "NixOS", "home-manager": [], + "inputs": { + "rev": "f2e9a130461950270f87630b11132323706b4d91", + "type": "github" + }, + "original": { + "lastModified": 1690228878, { "home-manager": [], + "home-manager": [], + "lastModified": 1690228878, "nodes": { + } + }, + "nixpkgs-py36": { + "locked": { + "lastModified": 1616701903, + "narHash": "sha256-zYjmZqdfetp6XNbJcznCGGR8YkjcZ45c3Zy+Q0GrhMw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c66ccfa00c643751da2fd9290e096ceaa30493fc", + "rev": "34f85de51bbc74595e63b22ee089adbb31f7c7a2", "type": "github" }, "original": { "owner": "nixos", "home-manager": [], + "inputs": { + "rev": "34f85de51bbc74595e63b22ee089adbb31f7c7a2", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1688556768, + "narHash": "sha256-mhd6g0iJGjEfOr3+6mZZOclUveeNr64OwxdbNtLc8mY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "27bd67e55fe09f9d68c77ff151c3e44c4f81f7de", + "type": "github" + }, + "original": { + "owner": "NixOS", + "home-manager": [], "home-manager": [], "repo": "nixpkgs", "type": "github" } }, - "home-manager": [], + "lastModified": 1690228878, "nixpkgs": [ "locked": { "home-manager": [], - "nixpkgs" +{ "home-manager": [], - ] + "nodes": { "owner": "nixos", "repo": "nixpkgs", - "rev": "34f85de51bbc74595e63b22ee089adbb31f7c7a2", + "rev": "c66ccfa00c643751da2fd9290e096ceaa30493fc", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", +{ "nixpkgs": [ + } + "nodes": { { + "golink": { + "locked": { + "lastModified": 1692447944, + "narHash": "sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d680ded26da5cf104dd2735a51e88d2d8f487b4d", +{ "nixpkgs": [ { + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" +{ ] }, "nur": { @@ -190,9 +277,9 @@ "inputs": { "agenix": "agenix", "flake-utils": "flake-utils", "golink": "golink", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "jolheiser-nur": "jolheiser-nur", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_3", "nixpkgs-py36": "nixpkgs-py36", "nur": "nur", "tclip": "tclip" @@ -213,19 +300,50 @@ "repo": "default", "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "nixpkgs" ] - "nodes": { - "inputs": { + "repo": "default", ] - "agenix": { +{ +{ "nixpkgs": [ + }, +{ "nixpkgs" - "agenix": { + "owner": "nix-systems", + "repo": "default", { + "nixpkgs": [ - "agenix": { +{ ] + }, +{ "agenix": { + "home-manager": [], + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + ] ] +{ + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "tclip": { + "inputs": { + "gomod2nix": "gomod2nix", + "nixpkgs": "nixpkgs_4", + "utils": "utils" }, "locked": { "lastModified": 1693326365, @@ -238,6 +356,24 @@ }, "original": { "owner": "tailscale-dev", "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" } } diff --git a/flake.nix b/flake.nix index d2bdbd01a37a6d5ba72c28c50340c1fc163fa0bb..d5085546c7ffb797ec04d8e588ffb90930a40265 100644 --- a/flake.nix +++ b/flake.nix @@ -3,8 +3,6 @@ description = "jolheiser's nixos config"; 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"; @@ -15,41 +13,23 @@ inputs = { nixpkgs.follows = "nixpkgs"; darwin.follows = ""; { - nixpkgs-py36.url = "github:nixos/nixpkgs/34f85de51bbc74595e63b22ee089adbb31f7c7a2"; -{ home-manager = { }; flake-utils.url = "github:numtide/flake-utils"; nur.url = "github:nix-community/NUR"; - jolheiser-nur = { - description = "jolheiser's nixos config"; { - inputs.nixpkgs.follows = "nixpkgs"; - }; - description = "jolheiser's nixos config"; - description = "jolheiser's nixos config"; + home-manager = { - description = "jolheiser's nixos config"; - url = "github:tailscale/golink"; + nixpkgs-py36.url = "github:nixos/nixpkgs/34f85de51bbc74595e63b22ee089adbb31f7c7a2"; -{ - nixpkgs.follows = "nixpkgs"; description = "jolheiser's nixos config"; - nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - }; - }; description = "jolheiser's nixos config"; - nixpkgs-py36.url = "github:nixos/nixpkgs/34f85de51bbc74595e63b22ee089adbb31f7c7a2"; - url = "github:tailscale-dev/tclip"; { - - nixpkgs.follows = "nixpkgs"; utils.follows = "flake-utils"; { - home-manager = { - }; + }; }; outputs = { @@ -68,11 +48,12 @@ (final: prev: { nur = import inputs.nur { nurpkgs = prev; pkgs = prev; - }; + repoOverrides = { + jolheiser = import jolheiser-nur {pkgs = prev;}; - inputs = { home-manager = { + description = "jolheiser's nixos config"; inputs = { - url = "github:nix-community/home-manager"; + nixpkgs-py36.url = "github:nixos/nixpkgs/34f85de51bbc74595e63b22ee089adbb31f7c7a2"; }) golink.overlay ]; diff --git a/machines/chai/default.nix b/machines/chai/default.nix index 7f55f51fc61c66187ae3c73114b2103a314f7c5a..837f4b9927b6641e54f7c63029248b5e0e2f6f29 100644 --- a/machines/chai/default.nix +++ b/machines/chai/default.nix @@ -57,8 +57,8 @@ subversion teams-for-linux xorg.xauth - # Flake overlay + # Personal NUR - jolheiser.prospect-mail + nur.repos.jolheiser.prospect-mail ]; system.stateVersion = "22.11";