summaryrefslogtreecommitdiffstats
path: root/jeschli/1systems
diff options
context:
space:
mode:
authorlassulus <lass@blue.r>2018-07-31 20:11:50 +0200
committerlassulus <lass@blue.r>2018-07-31 20:11:50 +0200
commitcf13e1ac12692a9b23d7af5dbd11ee68782948ad (patch)
treef1986cbe484fe262162c3ae71f11ec37448f6fe7 /jeschli/1systems
parentfe1d0ddb5a3106f0fb910febc385db1555ec5e8d (diff)
parent1de97fcef0a82307b3405d1b24ba5a999b572804 (diff)
Merge remote-tracking branch 'prism/staging/jeschli'
Diffstat (limited to 'jeschli/1systems')
-rw-r--r--jeschli/1systems/bln/config.nix4
-rw-r--r--jeschli/1systems/brauerei/config.nix20
-rw-r--r--jeschli/1systems/brauerei/hardware-configuration.nix1
3 files changed, 11 insertions, 14 deletions
diff --git a/jeschli/1systems/bln/config.nix b/jeschli/1systems/bln/config.nix
index 716b9c484..e17d5a41b 100644
--- a/jeschli/1systems/bln/config.nix
+++ b/jeschli/1systems/bln/config.nix
@@ -9,6 +9,8 @@
<stockholm/jeschli/2configs/emacs.nix>
<stockholm/jeschli/2configs/xdg.nix>
<stockholm/jeschli/2configs/xserver>
+# <stockholm/jeschli/1systems/bln/dcso-vpn.nix>
+ <stockholm/jeschli/2configs/officevpn.nix>
];
# boot.loader.systemd-boot.enable = true;
@@ -94,6 +96,8 @@
vagrant
# document viewer
zathura
+
+ samba
];
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;
}