summaryrefslogtreecommitdiff
path: root/nixos
diff options
context:
space:
mode:
authorKjetil Orbekk <kjetil.orbekk@gmail.com>2016-10-08 21:46:49 -0400
committerKjetil Orbekk <kjetil.orbekk@gmail.com>2016-10-08 21:46:49 -0400
commitc8935f56285a37cabe4d74a8444a7e0679a19906 (patch)
tree775d643bd89b88e18c74ace5f7e82de049440a40 /nixos
parent92cba6d453994e14ff049be972e2b817dc38ddfb (diff)
Change nixos configuration.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/configuration.nix5
-rw-r--r--nixos/pincer.nix7
2 files changed, 12 insertions, 0 deletions
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 6a8387f..6a29e71 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -33,6 +33,7 @@
myArduino = pkgs.stdenv.lib.overrideDerivation pkgs.arduino (o: {
withGUI = true;
});
+ myWine = pkgs.wine.override { wineBuild = "wine32"; };
in [
neovim
rustc
@@ -64,6 +65,10 @@
rofi
wireshark
trayer
+ myWine
+ iperf
+ telnet
+ pass
# fonts
source-code-pro
diff --git a/nixos/pincer.nix b/nixos/pincer.nix
index a59b51f..cab2b15 100644
--- a/nixos/pincer.nix
+++ b/nixos/pincer.nix
@@ -6,6 +6,7 @@
];
networking.hostName = "pincer";
+ hardware.opengl.driSupport32Bit = true;
boot.loader.systemd-boot.enable = true;
boot.loader.timeout = 0;
boot.loader.efi.canTouchEfiVariables = true;
@@ -35,6 +36,12 @@
fsType = "btrfs";
options = ["subvol=active/nixos-root" "discard" "compress=lzo"];
};
+ "/btrfs" = {
+ mountPoint = "/btrfs";
+ device = "/dev/mapper/cryptroot";
+ fsType = "btrfs";
+ options = ["discard" "compress=lzo"];
+ };
};
services.tlp.enable = true;