diff --git a/apply-system.sh b/apply-system.sh new file mode 100755 index 0000000..8f65bd3 --- /dev/null +++ b/apply-system.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env sh +set -xv + +# Where is this script located +SCRIPT_DIR=$(realpath $(dirname $0)) +echo "SCRIPT_DIR: ${SCRIPT_DIR}" +# Where should the symlink for this repo live in the system +CONFIG_DIR="~/.dotfiles" + +# Create a symlink for this directory to ~/.dotfiles +# if it already exists, error out +if [ -L ${CONFIG_DIR} ] && [ $(readlink -f ${CONFIG_DIR}) != ${SCRIPT_DIR} ]; then + echo "ERR: ${SCRIPT_DIR}/apply-system.sh: ${CONFIG_DIR} exists and not symlink to ${SCRIPT_DIR}" + exit 1 +fi +ln -s -T ${SCRIPT_DIR} ${CONFIG_DIR} + + +# $PWD to ~/.dotfiles +pushd ~/.dotfiles +sudo nixos-rebuild switch -I nixos-config=./system/configuration.nix +popd diff --git a/nix/sources.json b/nix/sources.json new file mode 100644 index 0000000..5c20860 --- /dev/null +++ b/nix/sources.json @@ -0,0 +1,14 @@ +{ + "nixpkgs": { + "branch": "release-21.05", + "description": "Nix Packages collection", + "homepage": "", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5f244caea76105b63d826911b2a1563d33ff1cdc", + "sha256": "1xlgynfw9svy7nvh9nkxsxdzncv9hg99gbvbwv3gmrhmzc3sar75", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/5f244caea76105b63d826911b2a1563d33ff1cdc.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 0000000..9a01c8a --- /dev/null +++ b/nix/sources.nix @@ -0,0 +1,194 @@ +# 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 = + if spec ? ref then spec.ref else + 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 = if spec ? submodules then spec.submodules else false; + submoduleArg = + let + nixSupportsSubmodules = builtins.compareVersions builtins.nixVersion "2.4" >= 0; + emptyArgWithWarning = + if submodules == true + 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 isNull (builtins.match "[a-zA-Z0-9]" c) 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 (!isNull name) { 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 (!isNull name) { 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 isNull sourcesFile 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/devel/configuration.nix b/system/configuration.nix similarity index 79% rename from devel/configuration.nix rename to system/configuration.nix index 06363b6..e298cb6 100755 --- a/devel/configuration.nix +++ b/system/configuration.nix @@ -7,10 +7,13 @@ in { imports = [ "${modulesPath}/profiles/minimal.nix" - + ./hardware-configuration.nix nixos-wsl.nixosModules.wsl ]; + networking.hostName = "nixos"; + system.stateVersion = "22.05"; + wsl = { enable = true; automountPath = "/mnt"; @@ -32,6 +35,7 @@ in experimental-features = nix-command flakes ''; + # Home manager programs.neovim = { enable = true; defaultEditor = true; @@ -40,8 +44,18 @@ in enable = true; # more information should be configured under user level }; - networking.hostName = "nixos"; - system.stateVersion = "22.05"; + programs.zsh = { + enable = true; + shellAliases = { + # list lists + ll = "ls -l"; + update = "sudo nixos-rebuild switch"; + }; + history = { + size = 10000; + path = "${config.xdg.dataHome}/zsh/history"; + }; + }; environment.systemPackages = [ pkgs.gnumake diff --git a/devel/flake.lock b/system/flake.lock similarity index 100% rename from devel/flake.lock rename to system/flake.lock diff --git a/devel/flake.nix b/system/flake.nix similarity index 100% rename from devel/flake.nix rename to system/flake.nix diff --git a/devel/nixos-wsl/.envrc b/system/nixos-wsl/.envrc similarity index 100% rename from devel/nixos-wsl/.envrc rename to system/nixos-wsl/.envrc diff --git a/devel/nixos-wsl/.github/ISSUE_TEMPLATE/bug_report.md b/system/nixos-wsl/.github/ISSUE_TEMPLATE/bug_report.md similarity index 100% rename from devel/nixos-wsl/.github/ISSUE_TEMPLATE/bug_report.md rename to system/nixos-wsl/.github/ISSUE_TEMPLATE/bug_report.md diff --git a/devel/nixos-wsl/.github/ISSUE_TEMPLATE/feature_request.md b/system/nixos-wsl/.github/ISSUE_TEMPLATE/feature_request.md similarity index 100% rename from devel/nixos-wsl/.github/ISSUE_TEMPLATE/feature_request.md rename to system/nixos-wsl/.github/ISSUE_TEMPLATE/feature_request.md diff --git a/devel/nixos-wsl/.github/release-drafter.yml b/system/nixos-wsl/.github/release-drafter.yml similarity index 100% rename from devel/nixos-wsl/.github/release-drafter.yml rename to system/nixos-wsl/.github/release-drafter.yml diff --git a/devel/nixos-wsl/.github/workflows/main.yml b/system/nixos-wsl/.github/workflows/main.yml similarity index 100% rename from devel/nixos-wsl/.github/workflows/main.yml rename to system/nixos-wsl/.github/workflows/main.yml diff --git a/devel/nixos-wsl/.github/workflows/release-drafter.yml b/system/nixos-wsl/.github/workflows/release-drafter.yml similarity index 100% rename from devel/nixos-wsl/.github/workflows/release-drafter.yml rename to system/nixos-wsl/.github/workflows/release-drafter.yml diff --git a/devel/nixos-wsl/.github/workflows/update-flakes.yml b/system/nixos-wsl/.github/workflows/update-flakes.yml similarity index 100% rename from devel/nixos-wsl/.github/workflows/update-flakes.yml rename to system/nixos-wsl/.github/workflows/update-flakes.yml diff --git a/devel/nixos-wsl/.gitignore b/system/nixos-wsl/.gitignore similarity index 100% rename from devel/nixos-wsl/.gitignore rename to system/nixos-wsl/.gitignore diff --git a/devel/nixos-wsl/LICENSE b/system/nixos-wsl/LICENSE similarity index 100% rename from devel/nixos-wsl/LICENSE rename to system/nixos-wsl/LICENSE diff --git a/devel/nixos-wsl/README.md b/system/nixos-wsl/README.md similarity index 100% rename from devel/nixos-wsl/README.md rename to system/nixos-wsl/README.md diff --git a/devel/nixos-wsl/default.nix b/system/nixos-wsl/default.nix similarity index 100% rename from devel/nixos-wsl/default.nix rename to system/nixos-wsl/default.nix diff --git a/devel/nixos-wsl/flake.lock b/system/nixos-wsl/flake.lock similarity index 100% rename from devel/nixos-wsl/flake.lock rename to system/nixos-wsl/flake.lock diff --git a/devel/nixos-wsl/flake.nix b/system/nixos-wsl/flake.nix similarity index 100% rename from devel/nixos-wsl/flake.nix rename to system/nixos-wsl/flake.nix diff --git a/devel/nixos-wsl/modules/build-tarball.nix b/system/nixos-wsl/modules/build-tarball.nix similarity index 100% rename from devel/nixos-wsl/modules/build-tarball.nix rename to system/nixos-wsl/modules/build-tarball.nix diff --git a/devel/nixos-wsl/modules/docker-desktop.nix b/system/nixos-wsl/modules/docker-desktop.nix similarity index 100% rename from devel/nixos-wsl/modules/docker-desktop.nix rename to system/nixos-wsl/modules/docker-desktop.nix diff --git a/devel/nixos-wsl/modules/docker-native.nix b/system/nixos-wsl/modules/docker-native.nix similarity index 100% rename from devel/nixos-wsl/modules/docker-native.nix rename to system/nixos-wsl/modules/docker-native.nix diff --git a/devel/nixos-wsl/modules/installer.nix b/system/nixos-wsl/modules/installer.nix similarity index 100% rename from devel/nixos-wsl/modules/installer.nix rename to system/nixos-wsl/modules/installer.nix diff --git a/devel/nixos-wsl/modules/interop.nix b/system/nixos-wsl/modules/interop.nix similarity index 100% rename from devel/nixos-wsl/modules/interop.nix rename to system/nixos-wsl/modules/interop.nix diff --git a/devel/nixos-wsl/modules/wsl-distro.nix b/system/nixos-wsl/modules/wsl-distro.nix similarity index 100% rename from devel/nixos-wsl/modules/wsl-distro.nix rename to system/nixos-wsl/modules/wsl-distro.nix diff --git a/devel/nixos-wsl/syschdemd.nix b/system/nixos-wsl/syschdemd.nix similarity index 100% rename from devel/nixos-wsl/syschdemd.nix rename to system/nixos-wsl/syschdemd.nix diff --git a/devel/nixos-wsl/syschdemd.sh b/system/nixos-wsl/syschdemd.sh similarity index 100% rename from devel/nixos-wsl/syschdemd.sh rename to system/nixos-wsl/syschdemd.sh