From aa13c942c6c8e67fca6adac033cbf2415107d343 Mon Sep 17 00:00:00 2001
From: mb <mb@codemonkey.cc>
Date: Sun, 28 Apr 2019 15:48:23 +0200
Subject: mb: update configs

---
 mb/1systems/orange/configuration.nix | 6 +++---
 mb/1systems/p1nk/configuration.nix   | 7 ++++---
 mb/2configs/default.nix              | 1 +
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'mb')

diff --git a/mb/1systems/orange/configuration.nix b/mb/1systems/orange/configuration.nix
index 4ac0996a..ff9d4988 100644
--- a/mb/1systems/orange/configuration.nix
+++ b/mb/1systems/orange/configuration.nix
@@ -27,15 +27,13 @@ in {
 
   fileSystems."/".options = [ "noatime" "nodiratime" "discard" ];
   fileSystems."/mnt/public" = {
-    device = "//192.168.88.252/public";
+    device = "//192.168.0.4/public";
     fsType = "cifs";
     options = let
       automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
     in [ "${automount_opts},user,rw,username=mb0,iocharset=utf8,credentials=${config.users.users.mb.home}/.smbcredentials" ];
   };
 
-  #networking.hostName = "0r4n93";
-  networking.wireless.enable = false;
 
   # Select internationalisation properties.
   i18n = {
@@ -173,7 +171,9 @@ in {
   #services.openssh.permitRootLogin = "yes";
   services.openssh.passwordAuthentication = false;
 
+  networking.wireless.enable = false;
   networking.networkmanager.enable = false;
+  krebs.iptables.enable = true;
   #networking.nameservers = [ "8.8.8.8" "141.1.1.1" ];
   networking.enableIPv6 = false;
 
diff --git a/mb/1systems/p1nk/configuration.nix b/mb/1systems/p1nk/configuration.nix
index 28a7c777..73ef04bf 100644
--- a/mb/1systems/p1nk/configuration.nix
+++ b/mb/1systems/p1nk/configuration.nix
@@ -22,14 +22,13 @@ in {
   ];
   fileSystems."/".options = [ "noatime" "nodiratime" "discard" ];
   fileSystems."/mnt/public" = {
-    device = "//192.168.88.252/public";
+    device = "//192.168.0.4/public";
     fsType = "cifs";
     options = let
       automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
     in [ "${automount_opts},user,rw,username=mb0,iocharset=utf8,credentials=${config.users.users.mb.home}/.smbcredentials" ];
   };
 
-  networking.wireless.enable = true;
 
   i18n = {
     consoleFont = "Lat2-Terminus16";
@@ -147,7 +146,7 @@ in {
   services.xserver = {
     enable = true;
     layout = "de";
-    xkbOptions = "neo";
+    xkbOptions = "nodeadkeys";
     libinput.enable = true;
     desktopManager = {
       default = "xfce";
@@ -164,7 +163,9 @@ in {
   services.openssh.enable = true;
   services.openssh.passwordAuthentication = false;
 
+  krebs.iptables.enable = true;
   networking.networkmanager.enable = false;
+  networking.wireless.enable = true;
   networking.nameservers = [ "8.8.8.8" "141.1.1.1" ];
   networking.enableIPv6 = false;
 
diff --git a/mb/2configs/default.nix b/mb/2configs/default.nix
index 75189e19..679be56d 100644
--- a/mb/2configs/default.nix
+++ b/mb/2configs/default.nix
@@ -67,6 +67,7 @@ with import <stockholm/lib>;
   environment.systemPackages = with pkgs; [
   #stockholm
     git
+    git-preview
     gnumake
     jq
     parallel
-- 
cgit v1.2.3