Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:magenbluten/stockholm

Browse Source
This commit is contained in:
magenbluten 2019-04-28 16:53:20 +02:00
commit 0459fdef4f
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mb/1systems/orange/configuration.nix
View File

@ -27,15 +27,13 @@ in {
fileSystems."/".options = [ "noatime" "nodiratime" "discard" ]; fileSystems."/".options = [ "noatime" "nodiratime" "discard" ];
fileSystems."/mnt/public" = { fileSystems."/mnt/public" = {
device = "//192.168.88.252/public"; device = "//192.168.0.4/public";
fsType = "cifs"; fsType = "cifs";
options = let options = let
automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"; 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" ]; 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. # Select internationalisation properties.
i18n = { i18n = {
@ -173,7 +171,9 @@ in {
#services.openssh.permitRootLogin = "yes"; #services.openssh.permitRootLogin = "yes";
services.openssh.passwordAuthentication = false; services.openssh.passwordAuthentication = false;
networking.wireless.enable = false;
networking.networkmanager.enable = false; networking.networkmanager.enable = false;
krebs.iptables.enable = true;
#networking.nameservers = [ "8.8.8.8" "141.1.1.1" ]; #networking.nameservers = [ "8.8.8.8" "141.1.1.1" ];
networking.enableIPv6 = false; networking.enableIPv6 = false;

7
mb/1systems/p1nk/configuration.nix
View File

@ -22,14 +22,13 @@ in {
]; ];
fileSystems."/".options = [ "noatime" "nodiratime" "discard" ]; fileSystems."/".options = [ "noatime" "nodiratime" "discard" ];
fileSystems."/mnt/public" = { fileSystems."/mnt/public" = {
device = "//192.168.88.252/public"; device = "//192.168.0.4/public";
fsType = "cifs"; fsType = "cifs";
options = let options = let
automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"; 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" ]; in [ "${automount_opts},user,rw,username=mb0,iocharset=utf8,credentials=${config.users.users.mb.home}/.smbcredentials" ];
}; };
networking.wireless.enable = true;
i18n = { i18n = {
consoleFont = "Lat2-Terminus16"; consoleFont = "Lat2-Terminus16";
@ -147,7 +146,7 @@ in {
services.xserver = { services.xserver = {
enable = true; enable = true;
layout = "de"; layout = "de";
xkbOptions = "neo"; xkbOptions = "nodeadkeys";
libinput.enable = true; libinput.enable = true;
desktopManager = { desktopManager = {
default = "xfce"; default = "xfce";
@ -164,7 +163,9 @@ in {
services.openssh.enable = true; services.openssh.enable = true;
services.openssh.passwordAuthentication = false; services.openssh.passwordAuthentication = false;
krebs.iptables.enable = true;
networking.networkmanager.enable = false; networking.networkmanager.enable = false;
networking.wireless.enable = true;
networking.nameservers = [ "8.8.8.8" "141.1.1.1" ]; networking.nameservers = [ "8.8.8.8" "141.1.1.1" ];
networking.enableIPv6 = false; networking.enableIPv6 = false;

1
mb/2configs/default.nix
View File

@ -67,6 +67,7 @@ with import <stockholm/lib>;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
#stockholm #stockholm
git git
git-preview
gnumake gnumake
jq jq
parallel parallel