move ascanius+woodhouse to i3, remove dependency on nixops
parent
294890091d
commit
41e62975de
|
@ -37,7 +37,4 @@ in
|
||||||
|
|
||||||
users.extraUsers.yorick.hashedPassword = secrets.yorick_hashedPassword;
|
users.extraUsers.yorick.hashedPassword = secrets.yorick_hashedPassword;
|
||||||
|
|
||||||
services.xserver = {
|
|
||||||
desktopManager.enlightenment.enable = true;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -64,4 +64,6 @@
|
||||||
drivers = [ pkgs.gutenprint ];
|
drivers = [ pkgs.gutenprint ];
|
||||||
};
|
};
|
||||||
nix.maxJobs = 8;
|
nix.maxJobs = 8;
|
||||||
|
|
||||||
|
services.tcsd.enable = true; # it has a TPM. maybe use this?
|
||||||
}
|
}
|
||||||
|
|
6
conf
6
conf
|
@ -11,14 +11,14 @@ local)
|
||||||
eval ${@:2}
|
eval ${@:2}
|
||||||
;;
|
;;
|
||||||
remote)
|
remote)
|
||||||
export NIX_PATH="nixpkgs=https://nixos.org/channels/nixos-16.03/nixexprs.tar.xz:ssh-id-file=`pwd`/deploy_key":secrets=`pwd`/secrets.nix:muflax-blog=./vendor/muflax-blog
|
export NIX_PATH="nixpkgs=https://nixos.org/channels/nixos-16.09/nixexprs.tar.xz:nixos-config=`pwd`/$2/configuration.nix:ssh-id-file=`pwd`/deploy_key":secrets=`pwd`/secrets.nix:muflax-blog=./vendor/muflax-blog
|
||||||
eval ${@:2}
|
eval ${@:3}
|
||||||
;;
|
;;
|
||||||
local-deploy)
|
local-deploy)
|
||||||
sudo $0 local nixos-rebuild switch
|
sudo $0 local nixos-rebuild switch
|
||||||
;;
|
;;
|
||||||
remote-deploy)
|
remote-deploy)
|
||||||
$0 remote nixops deploy ${@:2}
|
$0 remote $2 nixos-rebuild --build-host localhost --target-host ${@:3}
|
||||||
;;
|
;;
|
||||||
update-encrypt)
|
update-encrypt)
|
||||||
gpg -a -r yorick --encrypt-files secrets.nix deploy_key keys/*.key
|
gpg -a -r yorick --encrypt-files secrets.nix deploy_key keys/*.key
|
||||||
|
|
|
@ -5,15 +5,13 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
synaptics = {
|
synaptics = {
|
||||||
twoFingerScroll = true;
|
twoFingerScroll = true;
|
||||||
# inverted scrolling
|
horizontalScroll = true;
|
||||||
additionalOptions = ''
|
scrollDelta = -107; # inverted scrolling
|
||||||
Option "HorizScrollDelta" "-107"
|
|
||||||
Option "VertScrollDelta" "-107"
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
layout = "us";
|
layout = "us";
|
||||||
displayManager.slim.defaultUser = "yorick";
|
displayManager.slim.defaultUser = "yorick";
|
||||||
# xkbOptions = "eurosign:e";
|
# xkbOptions = "eurosign:e";
|
||||||
|
windowManager.i3-gaps.enable = true;
|
||||||
};
|
};
|
||||||
hardware.opengl = {
|
hardware.opengl = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -22,11 +22,11 @@ echo "updating root conf"
|
||||||
sh -c "$userspace_update_cmd"
|
sh -c "$userspace_update_cmd"
|
||||||
else
|
else
|
||||||
echo "updating" $1
|
echo "updating" $1
|
||||||
./conf remote-deploy --include $1
|
|
||||||
HOST=$(nix-instantiate --eval -A hostnames.$1 secrets.nix | tr -d '"')
|
HOST=$(nix-instantiate --eval -A hostnames.$1 secrets.nix | tr -d '"')
|
||||||
|
./conf remote-deploy $1 root@$HOST switch
|
||||||
echo "updating userspace"
|
echo "updating userspace"
|
||||||
# nix-copy-closure --to $HOST $(./conf remote nix-build --no-out-link "\<nixpkgs\>" -A hosts.woodhouse)
|
#nix-copy-closure --to root@$HOST $(./conf remote nix-build --no-out-link "\<nixpkgs\>" -A hosts.$1)
|
||||||
echo "nix-channel --update" | nixops ssh $1
|
echo "nix-channel --update" | ssh root@$HOST
|
||||||
cp deploy_key deploy_key2
|
cp deploy_key deploy_key2
|
||||||
chmod 0600 deploy_key2
|
chmod 0600 deploy_key2
|
||||||
ssh-agent bash <<J
|
ssh-agent bash <<J
|
||||||
|
|
|
@ -15,8 +15,7 @@ in
|
||||||
../roles/graphical.nix
|
../roles/graphical.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# Use the gummiboot efi boot loader.
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.gummiboot.enable = true;
|
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
||||||
networking.hostName = secrets.hostnames.woodhouse;
|
networking.hostName = secrets.hostnames.woodhouse;
|
||||||
|
@ -31,6 +30,10 @@ in
|
||||||
|
|
||||||
# List services that you want to enable:
|
# List services that you want to enable:
|
||||||
|
|
||||||
|
hardware.opengl.driSupport32Bit = lib.mkOverride 30 false;
|
||||||
|
hardware.pulseaudio.support32Bit = lib.mkOverride 30 false;
|
||||||
|
|
||||||
|
|
||||||
# Enable the OpenSSH daemon.
|
# Enable the OpenSSH daemon.
|
||||||
services.openssh.enable = true;
|
services.openssh.enable = true;
|
||||||
|
|
||||||
|
@ -52,14 +55,12 @@ in
|
||||||
# services.xserver.desktopManager.kde4.enable = true;
|
# services.xserver.desktopManager.kde4.enable = true;
|
||||||
|
|
||||||
# The NixOS release to be compatible with for stateful data such as databases.
|
# The NixOS release to be compatible with for stateful data such as databases.
|
||||||
system.stateVersion = "16.03";
|
system.stateVersion = "16.09";
|
||||||
|
|
||||||
|
|
||||||
services.redshift.enable = lib.mkOverride 30 false;
|
services.redshift.enable = lib.mkOverride 30 false;
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
#windowManager.i3.enable = true;
|
# displayManager.slim.autoLogin = true; # TODO: debug this
|
||||||
desktopManager.e19.enable = true;
|
|
||||||
displayManager.slim.autoLogin = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
users.extraUsers.yorick.hashedPassword = secrets.yorick_hashedPassword;
|
users.extraUsers.yorick.hashedPassword = secrets.yorick_hashedPassword;
|
||||||
|
|
|
@ -29,4 +29,5 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
nix.maxJobs = lib.mkDefault 4;
|
nix.maxJobs = lib.mkDefault 4;
|
||||||
|
services.xserver.videoDrivers = ["intel"];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue