From 6b4469a98d7b2d88a3442b1051174000538199f0 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Mon, 29 Apr 2024 00:23:51 +0200 Subject: de-flake local systems --- darwin-rebuild | 1 + home-manager | 1 + nix/sources.json | 86 +++++++++++++++++++++ nix/sources.nix | 198 ++++++++++++++++++++++++++++++++++++++++++++++++ nixos-rebuild | 1 + shell.nix | 28 ++++++- system/prefect.nix | 5 ++ user/mba.nix | 2 + user/prefect.nix | 2 + user/server.nix | 1 + user/settings/base.nix | 5 +- user/settings/nix.nix | 3 +- user/settings/shell.nix | 2 +- 13 files changed, 330 insertions(+), 5 deletions(-) create mode 120000 darwin-rebuild create mode 100755 home-manager create mode 100644 nix/sources.json create mode 100644 nix/sources.nix create mode 120000 nixos-rebuild diff --git a/darwin-rebuild b/darwin-rebuild new file mode 120000 index 00000000..856a8b68 --- /dev/null +++ b/darwin-rebuild @@ -0,0 +1 @@ +/Users/alan/projects/alanpearce.eu/nixfiles/home-manager \ No newline at end of file diff --git a/home-manager b/home-manager new file mode 100755 index 00000000..08cfd216 --- /dev/null +++ b/home-manager @@ -0,0 +1 @@ +nix-shell --run "$(basename $0) $@" diff --git a/nix/sources.json b/nix/sources.json new file mode 100644 index 00000000..9bc46ea0 --- /dev/null +++ b/nix/sources.json @@ -0,0 +1,86 @@ +{ + "agenix": { + "branch": "main", + "description": "age-encrypted secrets for NixOS and Home manager", + "homepage": "https://matrix.to/#/#agenix:nixos.org", + "owner": "ryantm", + "repo": "agenix", + "rev": "24a7ea390564ccd5b39b7884f597cfc8d7f6f44e", + "sha256": "165am10r61wl5v4hz169zrlljvj929hgnhr9sn7ak3bz73cr1m86", + "type": "tarball", + "url": "https://github.com/ryantm/agenix/archive/24a7ea390564ccd5b39b7884f597cfc8d7f6f44e.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, + "emacs-overlay": { + "branch": "master", + "description": "Bleeding edge emacs overlay [maintainer=@adisbladis] ", + "homepage": "", + "owner": "nix-community", + "repo": "emacs-overlay", + "rev": "bb943ccf9c2572550ddfdb7c92373c6671b870af", + "sha256": "0mpvgjp3pkr16769kzb16i9yl2lslhv2c743yi91313im76ynnw2", + "type": "tarball", + "url": "https://github.com/nix-community/emacs-overlay/archive/bb943ccf9c2572550ddfdb7c92373c6671b870af.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, + "home-manager": { + "branch": "master", + "description": "Manage a user environment using Nix [maintainer=@rycee] ", + "homepage": "https://nix-community.github.io/home-manager/", + "owner": "nix-community", + "repo": "home-manager", + "rev": "c1609d584a6b5e9e6a02010f51bd368cb4782f8e", + "sha256": "112r86p3iah1xahwlp82yd3gvh10wkf271za5h7v3jsqv08c6gkr", + "type": "tarball", + "url": "https://github.com/nix-community/home-manager/archive/c1609d584a6b5e9e6a02010f51bd368cb4782f8e.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, + "nix-darwin": { + "branch": "master", + "description": "nix modules for darwin", + "homepage": "", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7", + "sha256": "17qf4kfxlig7l4vryiirhylkms583ybvy81s1xwdlbah0jpgkklm", + "type": "tarball", + "url": "https://github.com/lnl7/nix-darwin/archive/230a197063de9287128e2c68a7a4b0cd7d0b50a7.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, + "nix-index-database": { + "branch": "main", + "description": "Weekly updated nix-index database [maintainer=@Mic92]", + "homepage": "", + "owner": "Mic92", + "repo": "nix-index-database", + "rev": "941c4973c824509e0356be455d89613611f76c8a", + "sha256": "0nicnyj8gqjv2102dpf0xkv41b6dxcldgyf3gfzj6jfckikiwskf", + "type": "tarball", + "url": "https://github.com/Mic92/nix-index-database/archive/941c4973c824509e0356be455d89613611f76c8a.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, + "nixos-hardware": { + "branch": "master", + "description": "A collection of NixOS modules covering hardware quirks.", + "homepage": "", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "53db5e1070d07e750030bf65f1b9963df8f0c678", + "sha256": "0imqm7yz0p75k06ic810nwv5ml1nm8mdbr1fg51qgigvn7i1ckcy", + "type": "tarball", + "url": "https://github.com/NixOS/nixos-hardware/archive/53db5e1070d07e750030bf65f1b9963df8f0c678.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, + "nixpkgs": { + "branch": "nixos-unstable", + "description": "Nix Packages collection & NixOS", + "homepage": "", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", + "sha256": "05rpyikxpjf15nrzggrx4m0kjkjcmpyhm714nfrbhsp5cp1x1m4r", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/58a1abdbae3217ca6b702f03d3b35125d88a2994.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + } +} diff --git a/nix/sources.nix b/nix/sources.nix new file mode 100644 index 00000000..fe3dadf7 --- /dev/null +++ b/nix/sources.nix @@ -0,0 +1,198 @@ +# This file has been generated by Niv. + +let + + # + # The fetchers. fetch_ fetches specs of type . + # + + fetch_file = pkgs: name: spec: + let + name' = sanitizeName name + "-src"; + in + if spec.builtin or true then + builtins_fetchurl { inherit (spec) url sha256; name = name'; } + else + pkgs.fetchurl { inherit (spec) url sha256; name = name'; }; + + fetch_tarball = pkgs: name: spec: + let + name' = sanitizeName name + "-src"; + in + if spec.builtin or true then + builtins_fetchTarball { name = name'; inherit (spec) url sha256; } + else + pkgs.fetchzip { name = name'; inherit (spec) url sha256; }; + + fetch_git = name: spec: + let + ref = + spec.ref or ( + if spec ? branch then "refs/heads/${spec.branch}" else + if spec ? tag then "refs/tags/${spec.tag}" else + abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!" + ); + submodules = spec.submodules or false; + submoduleArg = + let + nixSupportsSubmodules = builtins.compareVersions builtins.nixVersion "2.4" >= 0; + emptyArgWithWarning = + if submodules + then + builtins.trace + ( + "The niv input \"${name}\" uses submodules " + + "but your nix's (${builtins.nixVersion}) builtins.fetchGit " + + "does not support them" + ) + { } + else { }; + in + if nixSupportsSubmodules + then { inherit submodules; } + else emptyArgWithWarning; + in + builtins.fetchGit + ({ url = spec.repo; inherit (spec) rev; inherit ref; } // submoduleArg); + + fetch_local = spec: spec.path; + + fetch_builtin-tarball = name: throw + ''[${name}] The niv type "builtin-tarball" is deprecated. You should instead use `builtin = true`. + $ niv modify ${name} -a type=tarball -a builtin=true''; + + fetch_builtin-url = name: throw + ''[${name}] The niv type "builtin-url" will soon be deprecated. You should instead use `builtin = true`. + $ niv modify ${name} -a type=file -a builtin=true''; + + # + # Various helpers + # + + # https://github.com/NixOS/nixpkgs/pull/83241/files#diff-c6f540a4f3bfa4b0e8b6bafd4cd54e8bR695 + sanitizeName = name: + ( + concatMapStrings (s: if builtins.isList s then "-" else s) + ( + builtins.split "[^[:alnum:]+._?=-]+" + ((x: builtins.elemAt (builtins.match "\\.*(.*)" x) 0) name) + ) + ); + + # The set of packages used when specs are fetched using non-builtins. + mkPkgs = sources: system: + let + sourcesNixpkgs = + import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) { inherit system; }; + hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath; + hasThisAsNixpkgsPath = == ./.; + in + if builtins.hasAttr "nixpkgs" sources + then sourcesNixpkgs + else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then + import { } + else + abort + '' + Please specify either (through -I or NIX_PATH=nixpkgs=...) or + add a package called "nixpkgs" to your sources.json. + ''; + + # The actual fetching function. + fetch = pkgs: name: spec: + + if ! builtins.hasAttr "type" spec then + abort "ERROR: niv spec ${name} does not have a 'type' attribute" + else if spec.type == "file" then fetch_file pkgs name spec + else if spec.type == "tarball" then fetch_tarball pkgs name spec + else if spec.type == "git" then fetch_git name spec + else if spec.type == "local" then fetch_local spec + else if spec.type == "builtin-tarball" then fetch_builtin-tarball name + else if spec.type == "builtin-url" then fetch_builtin-url name + else + abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}"; + + # If the environment variable NIV_OVERRIDE_${name} is set, then use + # the path directly as opposed to the fetched source. + replace = name: drv: + let + saneName = stringAsChars (c: if (builtins.match "[a-zA-Z0-9]" c) == null then "_" else c) name; + ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}"; + in + if ersatz == "" then drv else + # this turns the string into an actual Nix path (for both absolute and + # relative paths) + if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}"; + + # Ports of functions for older nix versions + + # a Nix version of mapAttrs if the built-in doesn't exist + mapAttrs = builtins.mapAttrs or ( + f: set: with builtins; + listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set)) + ); + + # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295 + range = first: last: if first > last then [ ] else builtins.genList (n: first + n) (last - first + 1); + + # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257 + stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1)); + + # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269 + stringAsChars = f: s: concatStrings (map f (stringToCharacters s)); + concatMapStrings = f: list: concatStrings (map f list); + concatStrings = builtins.concatStringsSep ""; + + # https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d118/lib/attrsets.nix#L331 + optionalAttrs = cond: as: if cond then as else { }; + + # fetchTarball version that is compatible between all the versions of Nix + builtins_fetchTarball = { url, name ? null, sha256 }@attrs: + let + inherit (builtins) lessThan nixVersion fetchTarball; + in + if lessThan nixVersion "1.12" then + fetchTarball ({ inherit url; } // (optionalAttrs (name != null) { inherit name; })) + else + fetchTarball attrs; + + # fetchurl version that is compatible between all the versions of Nix + builtins_fetchurl = { url, name ? null, sha256 }@attrs: + let + inherit (builtins) lessThan nixVersion fetchurl; + in + if lessThan nixVersion "1.12" then + fetchurl ({ inherit url; } // (optionalAttrs (name != null) { inherit name; })) + else + fetchurl attrs; + + # Create the final "sources" from the config + mkSources = config: + mapAttrs + ( + name: spec: + if builtins.hasAttr "outPath" spec + then + abort + "The values in sources.json should not have an 'outPath' attribute" + else + spec // { outPath = replace name (fetch config.pkgs name spec); } + ) + config.sources; + + # The "config" used by the fetchers + mkConfig = + { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null + , sources ? if sourcesFile == null then { } else builtins.fromJSON (builtins.readFile sourcesFile) + , system ? builtins.currentSystem + , pkgs ? mkPkgs sources system + }: rec { + # The sources, i.e. the attribute set of spec name to spec + inherit sources; + + # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers + inherit pkgs; + }; + +in +mkSources (mkConfig { }) // { __functor = _: settings: mkSources (mkConfig settings); } diff --git a/nixos-rebuild b/nixos-rebuild new file mode 120000 index 00000000..856a8b68 --- /dev/null +++ b/nixos-rebuild @@ -0,0 +1 @@ +/Users/alan/projects/alanpearce.eu/nixfiles/home-manager \ No newline at end of file diff --git a/shell.nix b/shell.nix index d2c4c458..a0eb33c8 100644 --- a/shell.nix +++ b/shell.nix @@ -1,3 +1,27 @@ -{ system ? builtins.currentSystem }: +let -(builtins.getFlake (toString ./.)).devShells.${system}.default + sources = import ./nix/sources.nix; + + nixpkgs = sources.nixpkgs; + + pkgs = import nixpkgs { }; + +in +pkgs.mkShell rec { + + name = "nixfiles-shell"; + + buildInputs = with pkgs; [ + niv + deploy-rs + (pkgs.callPackage "${sources.agenix}/pkgs/agenix.nix" { }) + (import sources.home-manager { inherit pkgs; }).home-manager + ]; + + shellHook = '' + export HOST=$(hostname) + export NIX_PATH="nixpkgs=${nixpkgs}:home-manager=${sources."home-manager"}:darwin=${sources.nix-darwin}:darwin-config=$PWD/system/$HOST.nix:private=$PWD/private:nixpkgs-overlays=$PWD/overlays:nix-index-database=${sources.nix-index-database}"; + export HOME_MANAGER_CONFIG="./user/$HOST.nix" + ''; + +} diff --git a/system/prefect.nix b/system/prefect.nix index 12f0dd56..28905d10 100644 --- a/system/prefect.nix +++ b/system/prefect.nix @@ -25,6 +25,11 @@ ./settings/programs/shell.nix ./settings/programs/docker.nix ./settings/gaming.nix + + + + + ]; nixpkgs.hostPlatform = "x86_64-linux"; diff --git a/user/mba.nix b/user/mba.nix index a205fea4..eaa8fd5d 100644 --- a/user/mba.nix +++ b/user/mba.nix @@ -15,6 +15,8 @@ ./settings/ssh.nix ./settings/tabnine.nix ./settings/user-interface.nix + + ]; home.username = "alan"; diff --git a/user/prefect.nix b/user/prefect.nix index b5c4789e..18cde5d2 100644 --- a/user/prefect.nix +++ b/user/prefect.nix @@ -25,6 +25,8 @@ ./settings/trezor.nix ./settings/user-interface.nix ./settings/xresources.nix + + ]; home.username = "alan"; diff --git a/user/server.nix b/user/server.nix index 235e6908..9b3db3fc 100644 --- a/user/server.nix +++ b/user/server.nix @@ -9,6 +9,7 @@ ./settings/nix.nix ./settings/nixos.nix ./settings/development/base.nix + ]; home = { username = "alan"; diff --git a/user/settings/base.nix b/user/settings/base.nix index 6725b6db..d0c01b87 100644 --- a/user/settings/base.nix +++ b/user/settings/base.nix @@ -1,4 +1,4 @@ -{ config +args@{ config , lib , pkgs , ... @@ -6,7 +6,10 @@ imports = [ ./neovim.nix ./shell.nix + (import + (args // { databases = import ; })) ]; + # Let Home Manager install and manage itself. programs.home-manager.enable = true; manual = { diff --git a/user/settings/nix.nix b/user/settings/nix.nix index 08380286..b194bb42 100644 --- a/user/settings/nix.nix +++ b/user/settings/nix.nix @@ -17,6 +17,7 @@ in home.packages = with pkgs; [ nil + niv nix-prefetch-scripts nix-init nix-update @@ -30,7 +31,7 @@ in ]; xdg.configFile."nix-init/config.toml".source = toml.generate "config.toml" { maintainers = [ "alanpearce" ]; - nixpkgs = "builtins.getFlake \"nixpkgs\""; + nixpkgs = ""; }; programs.emacs.extraPackages = epkgs: (with epkgs; [ nix-mode diff --git a/user/settings/shell.nix b/user/settings/shell.nix index 5358f618..e5fe4f77 100644 --- a/user/settings/shell.nix +++ b/user/settings/shell.nix @@ -125,7 +125,7 @@ in hol = "home-manager generations"; hox = "home-manager expire-generations '-30 days'"; - nsh = "nix shell"; + nsh = "nix-shell"; nb = "nix build"; nl = "nix log"; # shadows `coreutils.nl`, but I've never used that yet nr = "nix run"; -- cgit 1.4.1