diff --git a/nixos/boxes/foureighty.nix b/nixos/boxes/foureighty.nix index 70daf8cc..9b21c823 100644 --- a/nixos/boxes/foureighty.nix +++ b/nixos/boxes/foureighty.nix @@ -40,7 +40,6 @@ ../gfx-intel.nix ../zerotier.nix ../i3/system.nix - ../virtualbox.nix ]; nix.maxJobs = 2; diff --git a/nixos/common.nix b/nixos/common.nix index cf294b90..f468b0ba 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -63,6 +63,6 @@ in }; system = { - stateVersion = "19.09"; + stateVersion = "20.03"; }; } diff --git a/nixos/i3/system.nix b/nixos/i3/system.nix index 5915dd07..bbff1c60 100644 --- a/nixos/i3/system.nix +++ b/nixos/i3/system.nix @@ -9,6 +9,8 @@ colord.enable = true; autorandr.enable = true; + xserver.windowManager.i3.enable = true; + xserver.windowManager.i3.package = pkgs.i3-gaps; xserver.displayManager.sddm = { enable = true; enableHidpi = true; diff --git a/nixos/programs/alacritty.nix b/nixos/programs/alacritty.nix index 55b85b39..4d61c5be 100644 --- a/nixos/programs/alacritty.nix +++ b/nixos/programs/alacritty.nix @@ -8,7 +8,6 @@ scrolling = { history = 32000; multiplier = 3; - faux_multiplier = 3; auto_scroll = false; }; diff --git a/nixos/up.sh b/nixos/up.sh index 39f9feda..49d00134 100755 --- a/nixos/up.sh +++ b/nixos/up.sh @@ -26,8 +26,8 @@ cp -v "$DIR/keeweb.desktop" ~/.local/share/applications/ ln -vfs "$DIR/tools" ~/ echo "all links done" -sudo nix-channel --add https://nixos.org/channels/nixos-19.09-small nixos -nix-channel --add https://github.com/rycee/home-manager/archive/release-19.09.tar.gz home-manager +sudo nix-channel --add https://nixos.org/channels/nixos-20.03 nixos +nix-channel --add https://github.com/rycee/home-manager/archive/release-20.03.tar.gz home-manager nix-channel --update nix-shell '' -A install