summaryrefslogtreecommitdiffstats
path: root/jeschli/1systems/brauerei
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2018-08-29 01:38:45 +0200
committertv <tv@krebsco.de>2018-08-29 01:38:45 +0200
commit000f2a7c9123fcd4b110c6c220570758d556c837 (patch)
tree8464e80b13adce3b5958ad6e9bcebc8a4f559cd9 /jeschli/1systems/brauerei
parent16ad5fb0a835a1022656253ae838e83fa024e692 (diff)
parent413e0689acd4f6b322f9996950927ebd41d0e58c (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'jeschli/1systems/brauerei')
-rw-r--r--jeschli/1systems/brauerei/config.nix20
-rw-r--r--jeschli/1systems/brauerei/hardware-configuration.nix1
2 files changed, 7 insertions, 14 deletions
diff --git a/jeschli/1systems/brauerei/config.nix b/jeschli/1systems/brauerei/config.nix
index 5a6ad7652..e200cbcd4 100644
--- a/jeschli/1systems/brauerei/config.nix
+++ b/jeschli/1systems/brauerei/config.nix
@@ -25,21 +25,11 @@
preLVM = true;
allowDiscards = true;
} ];
-# networking.hostName = "brauerei";
- # Define your hostname.
-# networking.wireless.enable = true;
networking.networkmanager.enable = true;
- # Enables wireless support via wpa_supplicant.
- # Select internationalisation properties.
- # i18n = {
- # consoleFont = "Lat2-Terminus16";
- # consoleKeyMap = "us";
- # defaultLocale = "en_US.UTF-8";
- # };
- # Set your time zone. #
time.timeZone = "Europe/Amsterdam";
+
nixpkgs.config.allowUnfree = true;
- # List packages installed in system profile. To search by name, run: # $ nix-env -qaP | grep wget
+
environment.shellAliases = {
n = "nix-shell";
stocki = pkgs.writeDash "deploy" ''
@@ -47,6 +37,7 @@
exec nix-shell -I stockholm="$PWD" --run 'deploy --system="brauerei"'
'';
};
+
environment.systemPackages = with pkgs; [
# system helper
ag
@@ -103,6 +94,7 @@
zathura
# xorg
xorg.xbacklight
+ taskwarrior
];
# Some programs need SUID wrappers, can be configured further or are
@@ -126,7 +118,7 @@
display = 11;
tty = 11;
- dpi = 96;
+ dpi = 144;
# videoDrivers = [ "nvidia" ];
synaptics = {
@@ -138,7 +130,7 @@
users.extraUsers.jeschli = { # TODO: define as krebs.users
isNormalUser = true;
- extraGroups = ["docker" "vboxusers"];
+ extraGroups = ["docker" "vboxusers" "audio"];
uid = 1000;
};
users.extraUsers.jamie = {
diff --git a/jeschli/1systems/brauerei/hardware-configuration.nix b/jeschli/1systems/brauerei/hardware-configuration.nix
index 75fdb89fd..2cb3e6661 100644
--- a/jeschli/1systems/brauerei/hardware-configuration.nix
+++ b/jeschli/1systems/brauerei/hardware-configuration.nix
@@ -29,5 +29,6 @@
swapDevices = [ ];
+ hardware.pulseaudio.enable = true;
nix.maxJobs = lib.mkDefault 4;
}