steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'bump/steveej-rmvbl-sdep0' into 'master'

Browse source 
Bump/steveej rmvbl sdep0

See merge request steveeJ/infra!64
This commit is contained in:
steveej 2020-11-24 22:08:16 +00:00
commit 0405690f6e
4 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Justfile
View file

@ -298,6 +298,7 @@ switch-gpg-card:
# export pubkey and ownertrust # export pubkey and ownertrust
gpg2 --output "${KEY_ID}".pubkey --export "${KEY_ID}" gpg2 --output "${KEY_ID}".pubkey --export "${KEY_ID}"
# if this fails the trust in the key is missing and can be fixed with `gpg --edit-key ${KEY_ID}`
gpg2 --export-ownertrust | rg "${KEY_ID}" > "${KEY_ID}".ownertrust gpg2 --export-ownertrust | rg "${KEY_ID}" > "${KEY_ID}".ownertrust
# delete the key # delete the key

1
nix/home-manager/configuration/graphical-fullblown.nix
View file

@ -18,7 +18,6 @@ in {
../profiles/common.nix ../profiles/common.nix
../profiles/qtile-desktop.nix ../profiles/qtile-desktop.nix
../profiles/dotfiles.nix ../profiles/dotfiles.nix
../programs/emacs.nix
../programs/firefox.nix ../programs/firefox.nix
../programs/chromium.nix ../programs/chromium.nix
# FIXME: fix homeshick when no WAN connection is available # FIXME: fix homeshick when no WAN connection is available

1
nix/home-manager/configuration/graphical-removable.nix
View file

@ -16,7 +16,6 @@ in {
../profiles/common.nix ../profiles/common.nix
../profiles/qtile-desktop.nix ../profiles/qtile-desktop.nix
../profiles/dotfiles.nix ../profiles/dotfiles.nix
../programs/emacs.nix
../programs/firefox.nix ../programs/firefox.nix
../programs/chromium.nix ../programs/chromium.nix
# FIXME: fix homeshick when no WAN connection is available # FIXME: fix homeshick when no WAN connection is available

8
nix/os/devices/steveej-rmvbl-sdep0/versions.nix
View file

@ -2,7 +2,7 @@ let
nixpkgs = { nixpkgs = {
url = "https://github.com/NixOS/nixpkgs/"; url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-20.09"; ref = "nixos-20.09";
rev = "51aaa3fa1b69559456f9bd4968bd5b179a784f67"; rev = "19db3e5ea2777daa874563b5986288151f502e27";
}; };
in in
@ -15,16 +15,16 @@ in
"channels-nixos-unstable" = { "channels-nixos-unstable" = {
url = "https://github.com/NixOS/nixpkgs/"; url = "https://github.com/NixOS/nixpkgs/";
ref = "nixos-unstable"; ref = "nixos-unstable";
rev = "24c9b05ac53e422f1af81a156f1fd58499eb27fb"; rev = "2247d824fe07f16325596acc7faa286502faffd1";
}; };
"nixpkgs-master" = { "nixpkgs-master" = {
url = "https://github.com/NixOS/nixpkgs/"; url = "https://github.com/NixOS/nixpkgs/";
ref = "master"; ref = "master";
rev = "396f3407a28a0ce8ee537d6f4440d3e6cb359570"; rev = "8d4af2e08c3d161fa482fe8e14af721e79ae7a09";
}; };
"home-manager-module" = { "home-manager-module" = {
url = "https://github.com/nix-community/home-manager"; url = "https://github.com/nix-community/home-manager";
ref = "release-20.09"; ref = "release-20.09";
rev = "7339784e07217ed0232e08d1ea33b610c94657d8"; rev = "63f299b3347aea183fc5088e4d6c4a193b334a41";
}; };
} }