diff options
author | magenbluten <magenbluten@codemonkey.cc> | 2019-04-28 16:53:20 +0200 |
---|---|---|
committer | magenbluten <magenbluten@codemonkey.cc> | 2019-04-28 16:53:20 +0200 |
commit | e9ed25b2e1b55c7ce3c8733ab607fd03b53d7b4b (patch) | |
tree | 2bb5655f2bbf528aad5153063c473ddf3ba5989a /mb | |
parent | f5f3275ac968caaeba398e183c7d404adfeb10e1 (diff) | |
parent | 9140befeb5bec2cc48d7fd2ddfc8528bc33f307b (diff) |
Merge branch 'master' of github.com:magenbluten/stockholm
Diffstat (limited to 'mb')
-rw-r--r-- | mb/1systems/orange/configuration.nix | 6 | ||||
-rw-r--r-- | mb/1systems/p1nk/configuration.nix | 7 | ||||
-rw-r--r-- | mb/2configs/default.nix | 1 |
3 files changed, 8 insertions, 6 deletions
diff --git a/mb/1systems/orange/configuration.nix b/mb/1systems/orange/configuration.nix index 4ac0996..ff9d498 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 28a7c77..73ef04b 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 75189e1..679be56 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 |