diff options
Diffstat (limited to 'lass/2configs')
| -rw-r--r-- | lass/2configs/baseX.nix | 4 | ||||
| -rw-r--r-- | lass/2configs/minecraft.nix | 1 | ||||
| -rw-r--r-- | lass/2configs/network-manager.nix | 24 | ||||
| -rw-r--r-- | lass/2configs/vim.nix | 6 | ||||
| -rw-r--r-- | lass/2configs/websites/util.nix | 1 |
5 files changed, 34 insertions, 2 deletions
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index 61a006a52..2b7a5c924 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; @@ -121,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"; diff --git a/lass/2configs/minecraft.nix b/lass/2configs/minecraft.nix index aa33dcccc..6f8ceb358 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"; } ]; } diff --git a/lass/2configs/network-manager.nix b/lass/2configs/network-manager.nix new file mode 100644 index 000000000..c4f757de1 --- /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 + ]; + }; +} diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix index 5fe9e1450..6014fd082 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; @@ -68,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 diff --git a/lass/2configs/websites/util.nix b/lass/2configs/websites/util.nix index 36ae1a904..62055d0fd 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; |