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

Merge branch 'staging' into 'master'

Browse source 
Staging

See merge request steveeJ/infra!10
This commit is contained in:
steveej 2019-01-26 12:42:51 +00:00
commit dccc50926a
4 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

0
nix/home-manager/configuration/text-minimal.txt → nix/home-manager/configuration/text-minimal.nix
View file

1
nix/home-manager/profiles/common.nix
View file

@ -63,5 +63,6 @@ in {
mkpasswd mkpasswd
just just
ripgrep
]); ]);
} }

2
nix/os/devices/CFB4ED74/pkg.nix
View file

@ -5,7 +5,7 @@
}: }:
{ {
home-manager.users.steveej = import ../../../home-manager/configuration/text-minimal.txt; home-manager.users.steveej = import ../../../home-manager/configuration/text-minimal.nix;
services.syncthing = { services.syncthing = {
enable = true; enable = true;

2
nix/os/profiles/common/pkg.nix
View file

@ -4,7 +4,7 @@
imports = [ imports = [
"${builtins.fetchGit { url = "https://github.com/rycee/home-manager.git"; ref = "master"; }}/nixos" "${builtins.fetchGit { url = "https://github.com/rycee/home-manager.git"; ref = "master"; }}/nixos"
]; ];
home-manager.users.root = import ../../../home-manager/configuration/text-minimal.txt; home-manager.users.root = import ../../../home-manager/configuration/text-minimal.nix;
nixpkgs.config = { nixpkgs.config = {
allowBroken = false; allowBroken = false;