reo101/rix101
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(cheetah)!: nixpkgs.overlays && gpg

Browse source 
Fix `gpg` as `ssh` setup (also add `openssh` to `home.packages`)
Remove `j` (breaking, cannot build)
This commit is contained in:
reo101 2023-12-26 14:28:10 +02:00
parent 581b1d9a8d
commit 02f7fe0cf5
Signed by: reo101
GPG key ID: 675AA7EF13964ACB
4 changed files with 29 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
flake.lock
View file

@ -593,11 +593,11 @@
}, },
"impermanence": { "impermanence": {
"locked": { "locked": {
"lastModified": 1702984171, "lastModified": 1703562375,
"narHash": "sha256-reIUBrUXibohXmvXRsgpvtlCE0QQSvWSA+qQCKohgR0=", "narHash": "sha256-T46GgRVnSUo0DrCVAHreLNMgeCYmFvo469qj1Z6dYDQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "123e94200f63952639492796b8878e588a4a2851", "rev": "8d16ac97980b3641078dd7c11337bfaa77b45789",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -621,7 +621,6 @@
"lib-net": { "lib-net": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1596309860,
"narHash": "sha256-izAzepR/6cDvnRfaa2ceSolMLMwqzQB5x9q62aR5J2g=", "narHash": "sha256-izAzepR/6cDvnRfaa2ceSolMLMwqzQB5x9q62aR5J2g=",
"type": "tarball", "type": "tarball",
"url": "https://gist.github.com/duairc/5c9bb3c922e5d501a1edb9e7b3b845ba/archive/3885f7cd9ed0a746a9d675da6f265d41e9fd6704.tar.gz" "url": "https://gist.github.com/duairc/5c9bb3c922e5d501a1edb9e7b3b845ba/archive/3885f7cd9ed0a746a9d675da6f265d41e9fd6704.tar.gz"
@ -662,11 +661,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1703447444, "lastModified": 1703546163,
"narHash": "sha256-H8ba6xLDE+lSRlfa2s5U4bF4gIDtdaozN9VT/nm//ps=", "narHash": "sha256-XKOAD8Yz/qPAH0OlQyZYuGgGAKbj2sPaowclr4TDfdk=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "675522af18f59918a64e6dbe5f0ba3b1d3b4eb65", "rev": "bbd5c6363c25e8fbbfb962f8f6c5ea1800d431ca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -687,11 +686,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1703462663, "lastModified": 1703549056,
"narHash": "sha256-YXdSFsf8JMBaf/RoGtghcbhX2FouAxSmBngT7j7uJtU=", "narHash": "sha256-FYARnqNH1C3L7ygW33zh/lXgBiI917H/VYR3Xwl8pS4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "c4caeb6f9e87ea08baece83e6cac351d9bd3bb2f", "rev": "c36deb5e7d85e6d685b2d43ea460e145e01a70d9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -999,11 +998,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1703544839, "lastModified": 1703580851,
"narHash": "sha256-UBv96D7Rn9PuMZqQ1HBeaUKo9SCEpa5sjGB3CIJGzCY=", "narHash": "sha256-iDHVK29r+rUMHFlS22T3dJYstgQjqs+YGANojVMLdjY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "4c682e6595400dd3cec580b326823cc0ddc48c38", "rev": "af76437785fb4449474ac15d7b13718e296028a1",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
machines/nix-on-droid/aarch64-linux/cheetah/configuration.nix
View file

@ -18,7 +18,7 @@
system.stateVersion = "22.11"; system.stateVersion = "22.11";
nix.extraOptions = '' nix.extraOptions = ''
experimental-features = nix-command flakes repl-flake experimental-features = nix-command flakes repl-flake recursive-nix
keep-outputs = true keep-outputs = true
keep-derivations = true keep-derivations = true
''; '';

18
machines/nix-on-droid/aarch64-linux/cheetah/home.nix
View file

@ -27,6 +27,7 @@
# clang # clang
gcc gcc
openssh
diffutils diffutils
findutils findutils
utillinux utillinux
@ -72,7 +73,7 @@
# emacs # emacs
# #
j # j
]; ];
programs.neovim = { programs.neovim = {
@ -104,6 +105,7 @@
enable = true; enable = true;
username = "reo101"; username = "reo101";
hostname = "cheetah"; hostname = "cheetah";
atuin = true;
direnv = true; direnv = true;
zoxide = true; zoxide = true;
}; };
@ -118,16 +120,18 @@
enable = true; enable = true;
userName = "reo101"; userName = "reo101";
userEmail = "pavel.atanasov2001@gmail.com"; userEmail = "pavel.atanasov2001@gmail.com";
signing = {
signByDefault = true;
key = "675AA7EF13964ACB";
};
}; };
services.gpg-agent = { services.gpg-agent = {
enable = true; enable = true;
defaultCacheTtl = 1800; defaultCacheTtl = 86400;
maxCacheTtl = 86400;
pinentryFlavor = "tty";
enableSshSupport = true; enableSshSupport = true;
sshKeys = ["CFDE97EDC2FDB2FD27020A084F1E3F40221BAFE7"];
}; };
# Using nix-direnv
# services.lorri = {
# enable = true;
# };
} }

9
util/default.nix
View file

@ -157,16 +157,17 @@ rec {
modules = [ modules = [
(lib.path.append root "configuration.nix") (lib.path.append root "configuration.nix")
{ nix.registry.nixpkgs.flake = nixpkgs; } { nix.registry.nixpkgs.flake = nixpkgs; }
{
nixpkgs.overlays = builtins.attrValues outputs.overlays;
}
{ {
home-manager = { home-manager = {
config = (lib.path.append root "home.nix"); config = (lib.path.append root "home.nix");
backupFileExtension = "hm-bak"; backupFileExtension = "hm-bak";
useGlobalPkgs = false; useGlobalPkgs = false;
useUserPackages = true; useUserPackages = true;
sharedModules = builtins.attrValues homeManagerModules; sharedModules = builtins.attrValues homeManagerModules ++ [
{
nixpkgs.overlays = builtins.attrValues outputs.overlays;
}
];
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs outputs; inherit inputs outputs;
inherit hostname; inherit hostname;