Skip to content

Commit

Permalink
chore(flake): Automatic flake update (#61)
Browse files Browse the repository at this point in the history
* flake.lock: Update

Flake lock file changes:

• Updated input 'darwin':
    'github:lnl7/nix-darwin/80871c71edb3da76d40bdff9cae007a2a035c074' (2022-08-16)
  → 'github:lnl7/nix-darwin/ef56fd8979b5f4e800c4716f62076e00600b1172' (2022-10-10)
• Updated input 'fenix':
    'github:nix-community/fenix/dca822b67ddf0af52f9b63feaeefc1668c8635c0' (2022-08-19)
  → 'github:nix-community/fenix/e48ce691b34fd5e6cec35489f482484ae64711fa' (2022-10-16)
• Updated input 'fenix/rust-analyzer-src':
    'github:rust-lang/rust-analyzer/917bd68b37de4e60e7203061a0a9c23b74d2b5c2' (2022-08-18)
  → 'github:rust-lang/rust-analyzer/5174d3d030c3f38e7f3fea857cc8a0f59f24b219' (2022-10-15)
• Updated input 'home-manager':
    'github:nix-community/home-manager/688e5c85b7537f308b82167c8eb4ecfb70a49861' (2022-08-15)
  → 'github:nix-community/home-manager/04f53999788cd47c6ce932d6cbd7cbfd3998712f' (2022-10-16)
• Updated input 'home-manager/utils':
    'github:numtide/flake-utils/1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1' (2022-05-30)
  → 'github:numtide/flake-utils/c0e246b9b83f637f4681389ecabcb2681b4f3af0' (2022-08-07)
• Updated input 'neovim-flake':
    'github:neovim/neovim/6b9852cc4188d9ca7bce8e7592dcfca38539c743?dir=contrib' (2022-08-21)
  → 'github:neovim/neovim/8617101b6bf21bf27ba5194db5fb42c73ff67160?dir=contrib' (2022-10-16)
• Updated input 'neovim-flake/flake-utils':
    'github:numtide/flake-utils/3cecb5b042f7f209c56ffd8371b2711a290ec797' (2022-02-07)
  → 'github:numtide/flake-utils/c0e246b9b83f637f4681389ecabcb2681b4f3af0' (2022-08-07)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/495b19d5b3e62b4ec7e846bdfb6ef3d9c3b83492' (2022-08-19)
  → 'github:nixos/nixpkgs/83b198a2083774844962c854f811538323f9f7b1' (2022-10-15)
• Updated input 'nur':
    'github:nix-community/nur/b0ebe831dd4add1ce7444f7ad94c55fdf8a215d9' (2022-08-21)
  → 'github:nix-community/nur/704e1ef5bdb1af57b4f7988abf2ef80c897dfc9b' (2022-10-17)
• Updated input 'nushell-src':
    'github:nushell/nushell/37bc90c62a75c906edfe5f7373a68850b9c9124c' (2022-08-21)
  → 'github:nushell/nushell/803f9d4daff434ef5e4c6535d9d3f9fc70bd2de1' (2022-10-16)

* fix(nix): Posix manpages renamed

* fix(nix): nixFlake renamed

* fix: Remove repo as it does not build

Co-authored-by: GitHub Actions <[email protected]>
  • Loading branch information
EdenEast and web-flow authored Oct 19, 2022
1 parent 7fd39ab commit 22f94bd
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 52 deletions.
60 changes: 30 additions & 30 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions home/hosts/eden.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
key = ../../config/.gnupg/public.key;
}];
};
repo = let r = import ../common/repo.nix; in
{
enable = true;
projects = r.projects;
tags = r.tags;
};
# repo = let r = import ../common/repo.nix; in
# {
# enable = true;
# projects = r.projects;
# tags = r.tags;
# };
};
};
profiles = {
Expand Down
2 changes: 1 addition & 1 deletion home/profiles/common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ in
# Man pages
man
man-pages
posix_man_pages
man-pages-posix
stdman
# grep alternative.
ripgrep
Expand Down
4 changes: 2 additions & 2 deletions lib/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ rec {
{ pkgs, ... }: {
# Don't rely on the configuration to enable a flake-compatible version of Nix.
nix = {
package = pkgs.nixFlakes;
package = pkgs.nixVersions.stable;
extraOptions = "experimental-features = nix-command flakes";
};
}
Expand Down Expand Up @@ -210,7 +210,7 @@ rec {
# Don't rely on the configuration to enable a flake-compatible version of Nix.
nix = {
inherit (nixConf) binaryCaches binaryCachePublicKeys;
package = pkgs.nixFlakes;
package = pkgs.nixVersions.stable;
extraOptions = "experimental-features = nix-command flakes";
};
services.nix-daemon.enable = true;
Expand Down
2 changes: 1 addition & 1 deletion shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pkgs.mkShell {

shellHook = ''
PATH=${pkgs.writeShellScriptBin "nix" ''
${pkgs.nixFlakes}/bin/nix ${builtins.concatStringsSep " " options} "$@"
${pkgs.nixVersions.stable}/bin/nix ${builtins.concatStringsSep " " options} "$@"
''}/bin:$PATH
'';
}
6 changes: 0 additions & 6 deletions system/darwin/hosts/theman/home.nix
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,6 @@
key = ../../../../config/.gnupg/public.key;
}];
};

repo = {
enable = true;
cli = true;
root = "${config.home.homeDirectory}/dev";
};
};
};
}
12 changes: 6 additions & 6 deletions system/nixos/hosts/pride/home.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
key = ../../../../config/.gnupg/public.key;
}];
};
repo = let r = import ../../../../home/common/repo.nix; in
{
enable = true;
projects = r.projects;
tags = r.tags;
};
# repo = let r = import ../../../../home/common/repo.nix; in
# {
# enable = true;
# projects = r.projects;
# tags = r.tags;
# };
};
};

Expand Down

0 comments on commit 22f94bd

Please sign in to comment.