From ae9dc0e1a645633be77559492840252517eb7c74 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 19 Feb 2018 09:46:50 +0100
Subject: l minecraft: open port for dynmap

---
 lass/2configs/minecraft.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lass/2configs')

diff --git a/lass/2configs/minecraft.nix b/lass/2configs/minecraft.nix
index aa33dccc..6f8ceb35 100644
--- a/lass/2configs/minecraft.nix
+++ b/lass/2configs/minecraft.nix
@@ -17,5 +17,6 @@
   krebs.iptables.tables.filter.INPUT.rules = [
     { predicate = "-p tcp --dport 25565"; target = "ACCEPT"; }
     { predicate = "-p udp --dport 25565"; target = "ACCEPT"; }
+    { predicate = "-p tcp --dport 8123"; target = "ACCEPT"; }
   ];
 }
-- 
cgit v1.2.3


From 1adeeffb7e0a6f7321743f431737cfc3d711f2eb Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 19 Feb 2018 09:47:35 +0100
Subject: l vim: add govet workaround

---
 lass/2configs/vim.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lass/2configs')

diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix
index 5fe9e145..5d19ae75 100644
--- a/lass/2configs/vim.nix
+++ b/lass/2configs/vim.nix
@@ -6,6 +6,9 @@ let
     environment.systemPackages = [
       (hiPrio vim)
       pkgs.python35Packages.flake8
+      (pkgs.writeDashBin "govet" ''
+        go vet "$@"
+      '')
     ];
 
     environment.etc.vimrc.source = vimrc;
-- 
cgit v1.2.3


From efb192f5153f48aa9f3ddde5ee25bc794ccf49bb Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 19 Feb 2018 09:50:45 +0100
Subject: l vim: run gometalinter

---
 lass/2configs/vim.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lass/2configs')

diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix
index 5d19ae75..6014fd08 100644
--- a/lass/2configs/vim.nix
+++ b/lass/2configs/vim.nix
@@ -71,6 +71,9 @@ let
     let g:syntastic_python_checkers=['flake8']
     let g:syntastic_python_flake8_post_args='--ignore=E501'
 
+    let g:go_metalinter_autosave = 1
+    let g:go_metalinter_deadline = "10s"
+
     nmap <esc>q :buffer 
     nmap <M-q> :buffer 
 
-- 
cgit v1.2.3


From 28f96d4cb1753d0632f42ce0894297f427323133 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 19 Feb 2018 09:53:56 +0100
Subject: l: php5 -> php7

---
 lass/2configs/websites/util.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lass/2configs')

diff --git a/lass/2configs/websites/util.nix b/lass/2configs/websites/util.nix
index 36ae1a90..62055d0f 100644
--- a/lass/2configs/websites/util.nix
+++ b/lass/2configs/websites/util.nix
@@ -32,7 +32,6 @@ rec {
     let
       domain = head domains;
     in {
-      services.phpfpm.phpPackage = pkgs.php56;
       services.nginx.virtualHosts."${domain}" = {
         enableACME = true;
         enableSSL = true;
-- 
cgit v1.2.3


From aef9e595f021ca9c6676d743b24b7de2a2592f5d Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Thu, 22 Feb 2018 18:23:12 +0100
Subject: l baseX: use network-manager

---
 lass/2configs/baseX.nix           |  1 +
 lass/2configs/network-manager.nix | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 lass/2configs/network-manager.nix

(limited to 'lass/2configs')

diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 61a006a5..93189b0d 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -10,6 +10,7 @@ in {
     ./livestream.nix
     ./dns-stuff.nix
     ./urxvt.nix
+    ./network-manager.nix
     {
       hardware.pulseaudio = {
         enable = true;
diff --git a/lass/2configs/network-manager.nix b/lass/2configs/network-manager.nix
new file mode 100644
index 00000000..c4f757de
--- /dev/null
+++ b/lass/2configs/network-manager.nix
@@ -0,0 +1,24 @@
+{ pkgs, lib, ... }:
+{
+  networking.wireless.enable = lib.mkForce false;
+
+  systemd.services.modemmanager = {
+    description = "ModemManager";
+    after = [ "network-manager.service" ];
+    bindsTo = [ "network-manager.service" ];
+    wantedBy = [ "network-manager.service" ];
+    serviceConfig = {
+      ExecStart = "${pkgs.modemmanager}/bin/ModemManager";
+      PrivateTmp = true;
+      Restart = "always";
+      RestartSec = "5";
+    };
+  };
+  networking.networkmanager.enable = true;
+  users.users.mainUser = {
+    extraGroups = [ "networkmanager" ];
+    packages = with pkgs; [
+      gnome3.gnome_keyring gnome3.dconf
+    ];
+  };
+}
-- 
cgit v1.2.3


From 87bc9a72eec639f8a73414e498ee2674355af640 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Thu, 22 Feb 2018 18:34:24 +0100
Subject: l baseX: run xmonad only in xmonad session

---
 lass/2configs/baseX.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lass/2configs')

diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 93189b0d..2b7a5c92 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -122,13 +122,14 @@ in {
       name = "xmonad";
       start = ''
         ${pkgs.xorg.xhost}/bin/xhost +LOCAL:
+        ${pkgs.systemd}/bin/systemctl --user start xmonad
         exec ${pkgs.coreutils}/bin/sleep infinity
       '';
     }];
   };
 
   systemd.user.services.xmonad = {
-    wantedBy = [ "graphical-session.target" ];
+    #wantedBy = [ "graphical-session.target" ];
     environment = {
       DISPLAY = ":${toString config.services.xserver.display}";
       RXVT_SOCKET = "%t/urxvtd-socket";
-- 
cgit v1.2.3