dadada/nix-config
dadada/nix-config
1
0
Fork 0
Code Issues 2 Pull requests 5 Projects Releases Packages Wiki Activity Actions

update flakes

Browse source
This commit is contained in:
Tim Schubert 2021-11-14 01:05:47 +01:00
parent 83dc018a4f
commit 58cc357ad9
Signed by: dadada
GPG key ID: EEB8D1CE62C4DFEA
3 changed files with 15 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

30
flake.lock generated
View file

@ -34,12 +34,13 @@
} }
}, },
"emacs-overlay": { "emacs-overlay": {
"flake": false,
"locked": { "locked": {
"lastModified": 1636190016, "lastModified": 1630603742,
"narHash": "sha256-nx5Jbn4PJHfVatu9ZdV+Q+SB7UVtbc/QZacjRQezX44=", "narHash": "sha256-fYX5y18aHZTnYdBizeeW43NOFvCoT3iXk52dLtS43Gs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "93fac0add2abcf230b03498b7fa07e10a06a10f2", "rev": "9c69c4d0ef9d8ed0c5a54697e359d7f3a51fcbb1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -195,11 +196,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1636044164, "lastModified": 1636847964,
"narHash": "sha256-RI9QjS8NBrfVTp6dzmcEVKNNjxYGBf26+/7ihDA/USc=", "narHash": "sha256-hH2lbDgOPwCtlWDwp0wVCcOK7x0mtLf4nrNWfvUWrA8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "70c5b268e10025c70823767f4fb49e240b40151d", "rev": "accfbdf215dbf39eac2fbae67b574dac0be83d51",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -245,11 +246,11 @@
}, },
"myNixpkgs": { "myNixpkgs": {
"locked": { "locked": {
"lastModified": 1635844945, "lastModified": 1636623366,
"narHash": "sha256-tZcL307dj28jgEU1Wdn+zwG9neyW0H2+ZjdVhvJxh9g=", "narHash": "sha256-jOQMlv9qFSj0U66HB+ujZoapty0UbewmSNbX8+3ujUQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b67e752c29f18a0ca5534a07661366d6a2c2e649", "rev": "c5ed8beb478a8ca035f033f659b60c89500a3034",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -263,9 +264,7 @@
"inputs": { "inputs": {
"doom-emacs": "doom-emacs", "doom-emacs": "doom-emacs",
"doom-snippets": "doom-snippets", "doom-snippets": "doom-snippets",
"emacs-overlay": [ "emacs-overlay": "emacs-overlay",
"emacs-overlay"
],
"emacs-so-long": "emacs-so-long", "emacs-so-long": "emacs-so-long",
"evil-markdown": "evil-markdown", "evil-markdown": "evil-markdown",
"evil-org-mode": "evil-org-mode", "evil-org-mode": "evil-org-mode",
@ -319,11 +318,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1635449388, "lastModified": 1636317251,
"narHash": "sha256-i7hMiAgpRTGsMPTQKuNCDfW/ftQ+g9N6iaMj+RN6yws=", "narHash": "sha256-u1cWvvtGH5mfGkeIKrqw2usk4IL7wDiRcnJkUSiZq3Q=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "518b9c2159e7d4b7696ee18b8828f9086012923b", "rev": "fd6f34afcf062761fb5035230f6297752bfedcba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -481,7 +480,6 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"emacs-overlay": "emacs-overlay",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"home-manager": "home-manager", "home-manager": "home-manager",
"homePage": "homePage", "homePage": "homePage",

5
flake.nix
View file

@ -3,10 +3,6 @@
inputs = { inputs = {
myNixpkgs.url = github:NixOS/nixpkgs/nixos-unstable; myNixpkgs.url = github:NixOS/nixpkgs/nixos-unstable;
emacs-overlay = {
url = github:nix-community/emacs-overlay;
inputs.nixpkgs.follows = "myNixpkgs";
};
flake-utils.url = github:numtide/flake-utils; flake-utils.url = github:numtide/flake-utils;
home-manager = { home-manager = {
url = github:nix-community/home-manager; url = github:nix-community/home-manager;
@ -14,7 +10,6 @@
}; };
nix-doom-emacs = { nix-doom-emacs = {
url = github:vlaci/nix-doom-emacs/develop; url = github:vlaci/nix-doom-emacs/develop;
inputs.emacs-overlay.follows = "emacs-overlay";
inputs.nixpkgs.follows = "myNixpkgs"; inputs.nixpkgs.follows = "myNixpkgs";
}; };
nixos-hardware.url = github:NixOS/nixos-hardware/master; nixos-hardware.url = github:NixOS/nixos-hardware/master;

2
outputs.nix
View file

@ -39,7 +39,7 @@
declare -A profiles=(["gorgon"]="home" ["timsch-nb"]="work") declare -A profiles=(["gorgon"]="home" ["timsch-nb"]="work")
profile=''${profiles[$HOSTNAME]:-common} profile=''${profiles[$HOSTNAME]:-common}
flake=$(nix flake metadata --json ${./.} | jq -r .url) flake=$(nix flake metadata --json ${./.} | jq -r .url)
nix build --show-trace --out-link "$tmpdir/result" "$flake#hmConfigurations.''${profile}.activationPackage" "$@" nix build --out-link "$tmpdir/result" "$flake#hmConfigurations.''${profile}.activationPackage" "$@"
link=$(realpath $tmpdir/result) link=$(realpath $tmpdir/result)
$link/activate $link/activate
''); '');