From 655cafa311e19676722b99102b623aba7cbb2cb7 Mon Sep 17 00:00:00 2001
From: Felix Wittwer <dev@felixwittwer.de>
Date: Mon, 31 May 2021 16:36:40 +0200
Subject: [PATCH] Vim config changes, float firefox extension window

---
 entropy/.vimrc                  |  6 ++++--
 entropy/nixos/configuration.nix | 27 ++++++++++++++++-----------
 entropy/sway/config             |  1 +
 entropy/waybar/config           |  2 +-
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/entropy/.vimrc b/entropy/.vimrc
index 2ea5e03..2e496fe 100644
--- a/entropy/.vimrc
+++ b/entropy/.vimrc
@@ -4,8 +4,9 @@ syntax on
 " enable autocompletion of ale
 let g:ale_completion_enabled = 1
 " disable latex linting from ale as i've got my own plugin for that
-let g:ale_linters = { 'tex': []}
-let b:ale_fixers = {'haskell': ['hindent']}
+let g:ale_linters = { 'tex': [], 'haskell': ['hls', 'hindent'], 'rust': ['rls'] }
+"let g:ale_fixers = {'haskell': ['hindent']}
+let g:ale_fixers = { 'haskell': ['hls', 'hindent'], 'rust': ['rls'] }
 
 
 " Initialize plugin system
@@ -90,6 +91,7 @@ set wildignore=*.o,*~,*.pyc,*.aux,*.bbl,*.blg,*-blx.bib,*.log,*.out,*.run.xml,
 
 " automatically reload files changed on disk but not in buffer
 set autoread
+set hidden
 
 " tex configuration
 let g:tex_flavor='latex'
diff --git a/entropy/nixos/configuration.nix b/entropy/nixos/configuration.nix
index fb98427..c3b0ddc 100644
--- a/entropy/nixos/configuration.nix
+++ b/entropy/nixos/configuration.nix
@@ -58,9 +58,17 @@
   # networking.proxy.default = "http://user:password@proxy:port/";
   # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
-  # enable hardware-accelerated graphics
-  nixpkgs.config.packageOverrides = pkgs: {
-    vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
+  nixpkgs.config = {
+    # enable hardware-accelerated graphics
+    packageOverrides = pkgs: {
+      vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
+      # add nixpkgs for unstable package sources
+      #unstable = import <nixpkgs> {
+        #config = config.nixpkgs.config;
+      #};
+    };
+    # allow unfree licenced packges
+    allowUnfree = true;
   };
   hardware.opengl = {
     enable = true;
@@ -227,6 +235,7 @@
     cargo-watch
     # python3
     stack
+    haskellPackages.haskell-language-server
     gcc
     binutils-unwrapped
     gnumake
@@ -278,13 +287,14 @@
     ffmpeg-full
     musikcube
     ## messenger
+    slack
     tdesktop
     signal-desktop
     (weechat.override {
       configure = { availablePlugins, ... }: {
         scripts = with pkgs.weechatScripts; [
           wee-slack
-          weechat-matrix
+          # weechat-matrix
         ];
       };
       # extraBuildInputs = [ python38Packages.Logbook ];
@@ -347,8 +357,8 @@
   systemd.user.services.mailfetch = {
     enable = true;
     description = "Automatically fetches for new mail when the network is up";
-    after = [ "network-online.target" ];
-    wantedBy = [ "network-online.target" ];
+    wantedBy = [ "graphical-session.target" ];
+    after = [ "graphical-session.target" ];
     serviceConfig = {
       Restart = "always";
       RestartSec = "60";
@@ -365,11 +375,6 @@
   # Or disable the firewall altogether.
   # networking.firewall.enable = false;
 
-  # allow unfree licenced packges
-  nixpkgs.config.allowUnfree = true;
-
-  # tmp workaround for rpy2
-  # nixpkgs.config.allowBroken = true;
 
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
diff --git a/entropy/sway/config b/entropy/sway/config
index 9035dbc..a49e817 100644
--- a/entropy/sway/config
+++ b/entropy/sway/config
@@ -230,6 +230,7 @@ bindsym XF86AudioMute exec 'pactl set-sink-mute @DEFAULT_SINK@ toggle'
 # automatically float windows that are intended to do so
 for_window [title="Picture-in-Picture" app_id="firefox"] floating enable
 for_window [title="Firefox — Sharing Indicator" app_id="firefox"] floating enable
+for_window [title="Extension: (Tree Style Tab).*" app_id="firefox"] floating enable
 # those frickin' zoom popups
 for_window [title="zoom"] floating enable
 
diff --git a/entropy/waybar/config b/entropy/waybar/config
index c5b8902..65b92fe 100644
--- a/entropy/waybar/config
+++ b/entropy/waybar/config
@@ -79,7 +79,7 @@
         "interval": 60,
         "exec": "notmuch count tag:unread",
         "exec-if": "[ $(notmuch count tag:unread) != 0 ]",
-        "on-click": "alacritty -e neomutt"
+        "on-click": "alacritty -e neomutt -f 'notmuch://?query=tag:unread'"
     }
     //"custom/spotify": {
     //    "format": " {}",