diff options
Diffstat (limited to 'lass/2configs')
| -rw-r--r-- | lass/2configs/base.nix | 10 | ||||
| -rw-r--r-- | lass/2configs/browsers.nix | 9 | ||||
| -rw-r--r-- | lass/2configs/chromium-patched.nix | 16 | ||||
| -rw-r--r-- | lass/2configs/desktop-base.nix | 1 | ||||
| -rw-r--r-- | lass/2configs/retiolum.nix | 2 | ||||
| -rw-r--r-- | lass/2configs/steam.nix | 19 | ||||
| -rw-r--r-- | lass/2configs/virtualbox.nix | 1 |
7 files changed, 35 insertions, 23 deletions
diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix index d44a19c1e..18acd15ab 100644 --- a/lass/2configs/base.nix +++ b/lass/2configs/base.nix @@ -14,7 +14,7 @@ with lib; users.extraUsers = { root = { openssh.authorizedKeys.keys = map readFile [ - ../../Zpubkeys/lass.ssh.pub + ../../krebs/Zpubkeys/lass.ssh.pub ]; }; mainUser = { @@ -29,7 +29,7 @@ with lib; "wheel" ]; openssh.authorizedKeys.keys = map readFile [ - ../../Zpubkeys/lass.ssh.pub + ../../krebs/Zpubkeys/lass.ssh.pub ]; }; }; @@ -42,7 +42,7 @@ with lib; exim-retiolum.enable = true; build.deps.nixpkgs = { url = https://github.com/Lassulus/nixpkgs; - rev = "58a82ff50b8605b88a8f66481d8c85bf8ab53be3"; + rev = "e74d0e7ff83c16846a81e1173543f180ad565076"; }; }; @@ -147,4 +147,8 @@ with lib; }; }; + networking.dhcpcd.extraConfig = '' + noipv4ll + ''; + } diff --git a/lass/2configs/browsers.nix b/lass/2configs/browsers.nix index 9849c829a..2aaeda63d 100644 --- a/lass/2configs/browsers.nix +++ b/lass/2configs/browsers.nix @@ -26,8 +26,17 @@ let ]; }; + #TODO: abstract this + in { + environment.systemPackages = [ + (simpleScript "browser-select" '' + BROWSER=$(echo -e "ff\ncr\nfb\ngm\nflash" | dmenu) + $BROWSER $@ + '') + ]; + imports = [ ../3modules/per-user.nix ] ++ [ diff --git a/lass/2configs/chromium-patched.nix b/lass/2configs/chromium-patched.nix index 715181778..d9d7760dd 100644 --- a/lass/2configs/chromium-patched.nix +++ b/lass/2configs/chromium-patched.nix @@ -37,12 +37,12 @@ let in { environment.etc."chromium/policies/managed/master.json".source = pkgs.lib.mkForce masterPolicy; - environment.systemPackages = [ - #pkgs.chromium - (pkgs.lib.overrideDerivation pkgs.chromium (attrs: { - buildCommand = attrs.buildCommand + '' - touch $out/TEST123 - ''; - })) - ]; + #environment.systemPackages = [ + # #pkgs.chromium + # (pkgs.lib.overrideDerivation pkgs.chromium (attrs: { + # buildCommand = attrs.buildCommand + '' + # touch $out/TEST123 + # ''; + # })) + #]; } diff --git a/lass/2configs/desktop-base.nix b/lass/2configs/desktop-base.nix index 9b98e4a8b..52c29d7e8 100644 --- a/lass/2configs/desktop-base.nix +++ b/lass/2configs/desktop-base.nix @@ -58,6 +58,7 @@ in { layout = "us"; xkbModel = "evdev"; xkbVariant = "altgr-intl"; + xkbOptions = "caps:backspace"; }; } diff --git a/lass/2configs/retiolum.nix b/lass/2configs/retiolum.nix index 7c7f2b4d4..17cd1d822 100644 --- a/lass/2configs/retiolum.nix +++ b/lass/2configs/retiolum.nix @@ -17,7 +17,7 @@ krebs.retiolum = { enable = true; - hosts = ../../Zhosts; + hosts = ../../krebs/Zhosts; connectTo = [ "fastpoke" "cloudkrebs" diff --git a/lass/2configs/steam.nix b/lass/2configs/steam.nix index 7d088fc6a..bd895e156 100644 --- a/lass/2configs/steam.nix +++ b/lass/2configs/steam.nix @@ -16,15 +16,14 @@ environment.systemPackages = with pkgs; [ steam ]; - networking.firewall = { - allowedUDPPorts = [ - 27031 - 27036 - ]; - allowedTCPPorts = [ - 27036 - 27037 - ]; + lass.iptables = { + tables = { + filter.INPUT.rules = [ + { predicate = "-p tcp --dport 27031"; target = "ACCEPT"; } + { predicate = "-p tcp --dport 27036"; target = "ACCEPT"; } + { predicate = "-p udp --dport 27031"; target = "ACCEPT"; } + { predicate = "-p udp --dport 27036"; target = "ACCEPT"; } + ]; + }; }; - } diff --git a/lass/2configs/virtualbox.nix b/lass/2configs/virtualbox.nix index ad7ac1429..9769cd68d 100644 --- a/lass/2configs/virtualbox.nix +++ b/lass/2configs/virtualbox.nix @@ -4,7 +4,6 @@ let mainUser = config.users.extraUsers.mainUser; in { - virtualisation.virtualbox.host.enable = true; users.extraUsers = { virtual = { |