From ef6928f5bca5d48e7f54c2123d0fca9083968095 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Mon, 14 Jun 2021 20:36:11 +0800 Subject: [PATCH] repo: more caveats --- README.org | 8 ++++---- flake.lock | 7 ++++--- flake.nix | 2 +- hosts/superfluous/default.nix | 1 + users/fortuneteller2k/config/zsh/default.nix | 1 + 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/README.org b/README.org index 197b8c0a..7e9403e3 100644 --- a/README.org +++ b/README.org @@ -11,7 +11,7 @@ ** Installation -Get the latest NixOS 21.05 image [[https://releases.nixos.org/?prefix=nixos/unstable/][here]], do your partitions (root must be mounted at =/mnt=), then run the following commands +Get the latest NixOS 21.11 image [[https://releases.nixos.org/?prefix=nixos/unstable/][here]], do your partitions (root must be mounted at =/mnt=), then run the following commands #+begin_src sh # move the output file of this to hosts/superfluous/hardware-configuration.nix nixos-generate-config @@ -25,10 +25,11 @@ Get the latest NixOS 21.05 image [[https://releases.nixos.org/?prefix=nixos/unst * You probably should replace [[https://github.com/fortuneteller2k/nix-config/blob/master/hosts/superfluous/hardware-configuration.nix][hosts/superfluous/hardware-configuration.nix]] with your own with =nixos-generate-config=. * You might want to change all instances of my username to yours. + * You might want to disable =agenix=, for my secret cannot be decrypted without my private key. See [[https://github.com/fortuneteller2k/nix-config/blob/master/hosts/superfluous/default.nix][hosts/superfluous/default.nix]] and [[https://github.com/fortuneteller2k/nix-config/blob/master/users/fortuneteller2k/config/zsh/default.nix][users/fortuneteller2k/config/zsh/default.nix]]. ** Description -NixOS configuration that I use daily, it contains the system-wide *AND* home configuration, symlinked to =/etc/nixos=. +NixOS configuration that I use daily, it contains the system-wide and home configuration, symlinked to =/etc/nixos=. See also: * [[https://github.com/nix-community/home-manager][home-manager]] @@ -38,11 +39,10 @@ See also: Resources and configurations I used to base on: * [[https://github.com/hlissner/dotfiles][hlissner/dotfiles]] * [[https://github.com/colemickens/nixos-flake-example][colemickens/nixos-flake-example]] - * [[https://github.com/nrdxp/nixflk][nrdxp/nixflk]] * [[https://git.sr.ht/~dunklecat/nixos-config/tree/master/flake.nix][dunklecat/nixos-config]] * [[https://www.youtube.com/watch?v=UeBX7Ide5a0][Nix Flakes talk by Eelco Dolstra on NixCon]] -Why flakes? +*** Why flakes? [[https://github.com/jonringer][jonringer]] gave a [[https://discourse.nixos.org/t/what-are-nix-flakes-and-why-should-i-care/12910/3][brief explanation]] as to why one might want to use Nix flakes. diff --git a/flake.lock b/flake.lock index 98ab8bfa..f87d9bfc 100644 --- a/flake.lock +++ b/flake.lock @@ -403,16 +403,17 @@ }, "nur": { "locked": { - "lastModified": 1623596031, - "narHash": "sha256-sQwzoKymnejKKQlaJ37sZ6Oip4Yeb+gka7lbGXewWXQ=", + "lastModified": 1623664927, + "narHash": "sha256-EnvFJpfqJAaraCEqGDMzFvguwN1AbY2A+29wwv3I99c=", "owner": "nix-community", "repo": "NUR", - "rev": "9c0051055e8b3cbc234871533a781c072de0b959", + "rev": "13d1f3087d69e7ea6845dab0af7c77bb3ad3af53", "type": "github" }, "original": { "owner": "nix-community", "repo": "NUR", + "rev": "13d1f3087d69e7ea6845dab0af7c77bb3ad3af53", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 33df398c..9dd26dd4 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,7 @@ home.url = "github:nix-community/home-manager"; manix.url = "github:mlvzk/manix"; neovim.url = "github:neovim/neovim?dir=contrib"; - nur.url = "github:nix-community/NUR"; + nur.url = "github:nix-community/NUR/13d1f3087d69e7ea6845dab0af7c77bb3ad3af53"; review.url = "github:Mic92/nixpkgs-review"; rust.url = "github:oxalica/rust-overlay"; diff --git a/hosts/superfluous/default.nix b/hosts/superfluous/default.nix index 6d703479..561b52f0 100644 --- a/hosts/superfluous/default.nix +++ b/hosts/superfluous/default.nix @@ -9,6 +9,7 @@ nixpkgs.lib.nixosSystem rec { nixpkgs.nixosModules.notDetected { + # NOTE: you should either change this or disable it completely by commenting it out age.secrets.github-token = { file = ../../secrets/github-token.age; owner = "fortuneteller2k"; diff --git a/users/fortuneteller2k/config/zsh/default.nix b/users/fortuneteller2k/config/zsh/default.nix index 31c42a23..0ac8d2b9 100644 --- a/users/fortuneteller2k/config/zsh/default.nix +++ b/users/fortuneteller2k/config/zsh/default.nix @@ -4,6 +4,7 @@ with home; '' compinit -C -d ${dotDir}/zcompdump + # You should comment this out, this is useless without my private key . /run/secrets/github-token rm ${homeDirectory}/.xsession-errors ${homeDirectory}/.xsession-errors.old >/dev/null 2>&1 ''