Commit 9506b3afc3bf

@@ -5,13 +5,17 @@
     loader.efi.canTouchEfiVariables = true;
     kernelParams = [
       # Kernel GPU Savings Options (NOTE i915 chipset only)
-      "i915.enable_rc6=0" "i915.enable_fbc=1"
+      "i915.enable_rc6=0"
+      "i915.enable_fbc=1"
       "i915.lvds_use_ssc=0"
-      "drm.debug=0" "drm.vblankoffdelay=1"
+      "drm.debug=0"
+      "drm.vblankoffdelay=1"
     ];
     blacklistedKernelModules = [
       # Kernel GPU Savings Options (NOTE i915 chipset only)
-      "sierra_net" "cdc_mbim" "cdc_ncm"
+      "sierra_net"
+      "cdc_mbim"
+      "cdc_ncm"
     ];
   };
   hardware = {

@@ -1,4 +1,4 @@
-{ config, pkgs, ...}:
+{ config, pkgs, ... }:
 
 {
   imports = [ ./thinkpad.nix ];
@@ -16,34 +16,34 @@
   services = {
     tlp = {
       extraConfig = ''
-# CPU optimizations
-CPU_SCALING_GOVERNOR_ON_AC=performance
-CPU_SCALING_GOVERNOR_ON_BAT=powersave
-CPU_MIN_PERF_ON_AC=0
-CPU_MAX_PERF_ON_AC=100
-CPU_MIN_PERF_ON_BAT=0
-CPU_MAX_PERF_ON_BAT=50
-# DEVICES (wifi, ..)
-DEVICES_TO_DISABLE_ON_STARTUP=""
-DEVICES_TO_ENABLE_ON_AC="bluetooth wifi wwan"
-DEVICES_TO_DISABLE_ON_BAT=""
-# Network management
-DEVICES_TO_DISABLE_ON_LAN_CONNECT=""
-DEVICES_TO_DISABLE_ON_WIFI_CONNECT=""
-DEVICES_TO_DISABLE_ON_WWAN_CONNECT=""
-DEVICES_TO_ENABLE_ON_LAN_DISCONNECT=""
-DEVICES_TO_ENABLE_ON_WIFI_DISCONNECT=""
-DEVICES_TO_ENABLE_ON_WWAN_DISCONNECT=""
-# Docking
-DEVICES_TO_DISABLE_ON_DOCK="wifi"
-DEVICES_TO_ENABLE_ON_UNDOCK="wifi"
-# Make sure it uses the right hard drive
-DISK_DEVICES="nvme0n1p2"
+        # CPU optimizations
+        CPU_SCALING_GOVERNOR_ON_AC=performance
+        CPU_SCALING_GOVERNOR_ON_BAT=powersave
+        CPU_MIN_PERF_ON_AC=0
+        CPU_MAX_PERF_ON_AC=100
+        CPU_MIN_PERF_ON_BAT=0
+        CPU_MAX_PERF_ON_BAT=50
+        # DEVICES (wifi, ..)
+        DEVICES_TO_DISABLE_ON_STARTUP=""
+        DEVICES_TO_ENABLE_ON_AC="bluetooth wifi wwan"
+        DEVICES_TO_DISABLE_ON_BAT=""
+        # Network management
+        DEVICES_TO_DISABLE_ON_LAN_CONNECT=""
+        DEVICES_TO_DISABLE_ON_WIFI_CONNECT=""
+        DEVICES_TO_DISABLE_ON_WWAN_CONNECT=""
+        DEVICES_TO_ENABLE_ON_LAN_DISCONNECT=""
+        DEVICES_TO_ENABLE_ON_WIFI_DISCONNECT=""
+        DEVICES_TO_ENABLE_ON_WWAN_DISCONNECT=""
+        # Docking
+        DEVICES_TO_DISABLE_ON_DOCK="wifi"
+        DEVICES_TO_ENABLE_ON_UNDOCK="wifi"
+        # Make sure it uses the right hard drive
+        DISK_DEVICES="nvme0n1p2"
       '';
     };
     udev.extraRules = ''
-  # Rules for Lenovo Thinkpad WS Dock
-  SUBSYSTEM=="usb", ACTION=="add|remove", ENV{ID_VENDOR}=="17ef", ENV{ID_MODEL}=="305a", RUN+="${pkgs.vde-thinkpad}/bin/dock"
+      # Rules for Lenovo Thinkpad WS Dock
+      SUBSYSTEM=="usb", ACTION=="add|remove", ENV{ID_VENDOR}=="17ef", ENV{ID_MODEL}=="305a", RUN+="${pkgs.vde-thinkpad}/bin/dock"
     '';
   };
 }

@@ -5,29 +5,29 @@
   services = {
     tlp = {
       extraConfig = ''
-# CPU optimizations
-CPU_SCALING_GOVERNOR_ON_AC=performance
-CPU_SCALING_GOVERNOR_ON_BAT=powersave
-CPU_MIN_PERF_ON_AC=0
-CPU_MAX_PERF_ON_AC=100
-CPU_MIN_PERF_ON_BAT=0
-CPU_MAX_PERF_ON_BAT=50
-# DEVICES (wifi, ..)
-DEVICES_TO_DISABLE_ON_STARTUP=""
-DEVICES_TO_ENABLE_ON_AC="bluetooth wifi wwan"
-DEVICES_TO_DISABLE_ON_BAT=""
-# Network management
-DEVICES_TO_DISABLE_ON_LAN_CONNECT=""
-DEVICES_TO_DISABLE_ON_WIFI_CONNECT=""
-DEVICES_TO_DISABLE_ON_WWAN_CONNECT=""
-DEVICES_TO_ENABLE_ON_LAN_DISCONNECT=""
-DEVICES_TO_ENABLE_ON_WIFI_DISCONNECT=""
-DEVICES_TO_ENABLE_ON_WWAN_DISCONNECT=""
-# Docking
-DEVICES_TO_DISABLE_ON_DOCK="wifi"
-DEVICES_TO_ENABLE_ON_UNDOCK="wifi"
-# Make sure it uses the right hard drive
-DISK_DEVICES="nvme0n1p3"
+        # CPU optimizations
+        CPU_SCALING_GOVERNOR_ON_AC=performance
+        CPU_SCALING_GOVERNOR_ON_BAT=powersave
+        CPU_MIN_PERF_ON_AC=0
+        CPU_MAX_PERF_ON_AC=100
+        CPU_MIN_PERF_ON_BAT=0
+        CPU_MAX_PERF_ON_BAT=50
+        # DEVICES (wifi, ..)
+        DEVICES_TO_DISABLE_ON_STARTUP=""
+        DEVICES_TO_ENABLE_ON_AC="bluetooth wifi wwan"
+        DEVICES_TO_DISABLE_ON_BAT=""
+        # Network management
+        DEVICES_TO_DISABLE_ON_LAN_CONNECT=""
+        DEVICES_TO_DISABLE_ON_WIFI_CONNECT=""
+        DEVICES_TO_DISABLE_ON_WWAN_CONNECT=""
+        DEVICES_TO_ENABLE_ON_LAN_DISCONNECT=""
+        DEVICES_TO_ENABLE_ON_WIFI_DISCONNECT=""
+        DEVICES_TO_ENABLE_ON_WWAN_DISCONNECT=""
+        # Docking
+        DEVICES_TO_DISABLE_ON_DOCK="wifi"
+        DEVICES_TO_ENABLE_ON_UNDOCK="wifi"
+        # Make sure it uses the right hard drive
+        DISK_DEVICES="nvme0n1p3"
       '';
     };
     xserver = {

@@ -5,7 +5,7 @@
   boot = {
     kernelParams = [ "i915.enable_psr=1" ];
     extraModprobeConfig = ''
-    options iwlwifi 11n_disable=1
+      options iwlwifi 11n_disable=1
     '';
   };
   security = {
@@ -20,35 +20,35 @@
     fprintd.enable = true;
     tlp = {
       extraConfig = ''
-# CPU optimizations
-CPU_SCALING_GOVERNOR_ON_AC=performance
-CPU_SCALING_GOVERNOR_ON_BAT=powersave
-CPU_MIN_PERF_ON_AC=0
-CPU_MAX_PERF_ON_AC=100
-CPU_MIN_PERF_ON_BAT=0
-CPU_MAX_PERF_ON_BAT=50
-CPU_BOOST_ON_AC=1
-CPU_BOOST_ON_BAT=0
-# DEVICES (wifi, ..)
-DEVICES_TO_DISABLE_ON_STARTUP="bluetooth"
-DEVICES_TO_ENABLE_ON_AC="bluetooth wifi wwan"
-DEVICES_TO_DISABLE_ON_BAT="bluetooth"
-# Network management
-DEVICES_TO_DISABLE_ON_LAN_CONNECT=""
-DEVICES_TO_DISABLE_ON_WIFI_CONNECT=""
-DEVICES_TO_DISABLE_ON_WWAN_CONNECT=""
-DEVICES_TO_ENABLE_ON_LAN_DISCONNECT=""
-DEVICES_TO_ENABLE_ON_WIFI_DISCONNECT=""
-DEVICES_TO_ENABLE_ON_WWAN_DISCONNECT=""
-DISK_IDLE_SECS_ON_AC=0
-DISK_IDLE_SECS_ON_BAT=2
-MAX_LOST_WORK_SECS_ON_AC=15
-MAX_LOST_WORK_SECS_ON_BAT=60
-DISK_DEVICES="ata-Corsair_Force_LX_SSD_15256501000102160059"
-SOUND_POWER_SAVE_ON_AC=0
-SOUND_POWER_SAVE_ON_BAT=1
-USB_AUTOSUSPEND=1
-USB_BLACKLIST_BTUSB=1
+        # CPU optimizations
+        CPU_SCALING_GOVERNOR_ON_AC=performance
+        CPU_SCALING_GOVERNOR_ON_BAT=powersave
+        CPU_MIN_PERF_ON_AC=0
+        CPU_MAX_PERF_ON_AC=100
+        CPU_MIN_PERF_ON_BAT=0
+        CPU_MAX_PERF_ON_BAT=50
+        CPU_BOOST_ON_AC=1
+        CPU_BOOST_ON_BAT=0
+        # DEVICES (wifi, ..)
+        DEVICES_TO_DISABLE_ON_STARTUP="bluetooth"
+        DEVICES_TO_ENABLE_ON_AC="bluetooth wifi wwan"
+        DEVICES_TO_DISABLE_ON_BAT="bluetooth"
+        # Network management
+        DEVICES_TO_DISABLE_ON_LAN_CONNECT=""
+        DEVICES_TO_DISABLE_ON_WIFI_CONNECT=""
+        DEVICES_TO_DISABLE_ON_WWAN_CONNECT=""
+        DEVICES_TO_ENABLE_ON_LAN_DISCONNECT=""
+        DEVICES_TO_ENABLE_ON_WIFI_DISCONNECT=""
+        DEVICES_TO_ENABLE_ON_WWAN_DISCONNECT=""
+        DISK_IDLE_SECS_ON_AC=0
+        DISK_IDLE_SECS_ON_BAT=2
+        MAX_LOST_WORK_SECS_ON_AC=15
+        MAX_LOST_WORK_SECS_ON_BAT=60
+        DISK_DEVICES="ata-Corsair_Force_LX_SSD_15256501000102160059"
+        SOUND_POWER_SAVE_ON_AC=0
+        SOUND_POWER_SAVE_ON_BAT=1
+        USB_AUTOSUSPEND=1
+        USB_BLACKLIST_BTUSB=1
       '';
     };
   };

@@ -4,10 +4,12 @@
   boot = {
     blacklistedKernelModules = [
       # Kernel GPU Savings Options (NOTE i915 chipset only)
-      "sierra_net" "cdc_mbim" "cdc_ncm"
+      "sierra_net"
+      "cdc_mbim"
+      "cdc_ncm"
     ];
     extraModprobeConfig = ''
-    options snd_hda_intel power_save=1
+      options snd_hda_intel power_save=1
     '';
     initrd = {
       availableKernelModules = [ "aesni-intel" "aes_x86_64" "cryptd" ];
@@ -15,9 +17,11 @@
     kernelModules = [ "kvm_intel" ];
     kernelParams = [
       # Kernel GPU Savings Options (NOTE i915 chipset only)
-      "i915.enable_rc6=1" "i915.enable_fbc=1"
+      "i915.enable_rc6=1"
+      "i915.enable_fbc=1"
       "i915.lvds_use_ssc=0"
-      "drm.debug=0" "drm.vblankoffdelay=1"
+      "drm.debug=0"
+      "drm.vblankoffdelay=1"
       "kvm_intel.nested=1"
       "intel_iommu=on"
     ];
@@ -39,10 +43,10 @@
     acpid = {
       enable = true;
       lidEventCommands = ''
-if grep -q closed /proc/acpi/button/lid/LID/state; then
-  date >> /tmp/i3lock.log
-  DISPLAY=":0.0" XAUTHORITY=/home/fadenb/.Xauthority ${pkgs.i3lock}/bin/i3lock &>> /tmp/i3lock.log
-fi
+        if grep -q closed /proc/acpi/button/lid/LID/state; then
+          date >> /tmp/i3lock.log
+          DISPLAY=":0.0" XAUTHORITY=/home/fadenb/.Xauthority ${pkgs.i3lock}/bin/i3lock &>> /tmp/i3lock.log
+        fi
       '';
     };
     tlp = {
@@ -51,22 +55,22 @@ fi
     xserver = {
       synaptics.enable = false;
       config =
-      ''
-  Section "InputClass"
-    Identifier     "Enable libinput for TrackPoint"
-    MatchIsPointer "on"
-    Driver         "libinput"
-    Option         "ScrollMethod" "button"
-    Option         "ScrollButton" "8"
-  EndSection
-      '';
+        ''
+          Section "InputClass"
+            Identifier     "Enable libinput for TrackPoint"
+            MatchIsPointer "on"
+            Driver         "libinput"
+            Option         "ScrollMethod" "button"
+            Option         "ScrollButton" "8"
+          EndSection
+        '';
       inputClassSections = [
         ''
-  Identifier "evdev touchpad off"
-  MatchIsTouchpad "on"
-  MatchDevicePath "/dev/input/event*"
-  Driver "evdev"
-  Option "Ignore" "true"
+          Identifier "evdev touchpad off"
+          MatchIsTouchpad "on"
+          MatchDevicePath "/dev/input/event*"
+          Driver "evdev"
+          Option "Ignore" "true"
         ''
       ];
     };

@@ -9,7 +9,7 @@ with import ../assets/machines.nix; {
   };
   profiles = {
     git.enable = true;
-    nix-config.localCaches = [];
+    nix-config.localCaches = [ ];
     nix-config.buildCores = 1;
     ssh.enable = true;
     syncthing.enable = true;

@@ -34,25 +34,25 @@ with import ../assets/machines.nix; {
         {
           # home
           name = "home";
-          slaves = [];
+          slaves = [ ];
           file = ../assets/db.home;
         }
         {
           # home.reverse
           name = "192.168.1.in-addr.arpa";
-          slaves = [];
+          slaves = [ ];
           file = ../assets/db.192.168.1;
         }
         {
           # vpn
           name = "vpn";
-          slaves = [];
+          slaves = [ ];
           file = ../assets/db.vpn;
         }
         {
           # vpn.reverse
           name = "10.100.0.in-addr.arpa";
-          slaves = [];
+          slaves = [ ];
           file = ../assets/db.10.100.0;
         }
       ];

@@ -44,25 +44,25 @@ with import ../assets/machines.nix; {
         {
           # home
           name = "home";
-          slaves = [];
+          slaves = [ ];
           file = ../assets/db.home;
         }
         {
           # home.reverse
           name = "192.168.1.in-addr.arpa";
-          slaves = [];
+          slaves = [ ];
           file = ../assets/db.192.168.1;
         }
         {
           # vpn
           name = "vpn";
-          slaves = [];
+          slaves = [ ];
           file = ../assets/db.vpn;
         }
         {
           # vpn.reverse
           name = "10.100.0.in-addr.arpa";
-          slaves = [];
+          slaves = [ ];
           file = ../assets/db.10.100.0;
         }
       ];

@@ -69,7 +69,7 @@ with import ../assets/machines.nix; {
     syncthing.guiAddress = "0.0.0.0:8384";
     smartd = {
       enable = true;
-      devices = [ { device = "/dev/nvme0n1"; } ];
+      devices = [{ device = "/dev/nvme0n1"; }];
     };
     wireguard = {
       enable = true;

@@ -3,26 +3,24 @@
 with lib;
 let
   cfg = config.hardware.sane;
-
-  pkg = if cfg.snapshot
-  then pkgs.sane-backends-git
-  else pkgs.sane-backends;
-
+  pkg =
+    if cfg.snapshot
+    then pkgs.sane-backends-git
+    else pkgs.sane-backends;
   backends = [ pkg ] ++ cfg.extraBackends;
-
   saneConfig = pkgs.mkSaneConfig { paths = backends; };
-
-  saneExtraConfig = pkgs.runCommand "sane-extra-config" {} ''
+  saneExtraConfig = pkgs.runCommand "sane-extra-config" { } ''
     cp -Lr '${pkgs.mkSaneConfig { paths = [ pkgs.sane-backends ]; }}'/etc/sane.d $out
     chmod +w $out
-    ${concatMapStrings (
-    c: ''
-      f="$out/${c.name}.conf"
-      [ ! -e "$f" ] || chmod +w "$f"
-      cat ${builtins.toFile "" (c.value + "\n")} >>"$f"
-      chmod -w "$f"
-    ''
-  ) (mapAttrsToList nameValuePair cfg.extraConfig)}
+    ${concatMapStrings
+      (
+          c: ''
+            f="$out/${c.name}.conf"
+            [ ! -e "$f" ] || chmod +w "$f"
+            cat ${builtins.toFile "" (c.value + "\n")} >>"$f"
+            chmod -w "$f"
+          ''
+        ) (mapAttrsToList nameValuePair cfg.extraConfig)}
     chmod -w $out
   '';
 in
@@ -30,12 +28,12 @@ in
   options = {
     hardware.sane.extraConfig = mkOption {
       type = types.attrsOf types.lines;
-      default = {};
+      default = { };
       example = { "some-backend" = "# some lines to add to its .conf"; };
     };
   };
 
-  config = mkIf (cfg.enable && cfg.extraConfig != {}) {
+  config = mkIf (cfg.enable && cfg.extraConfig != { }) {
     hardware.sane.configDir = saneExtraConfig.outPath;
   };
 }

@@ -18,41 +18,42 @@ in
       };
     };
   };
-  config = mkIf cfg.enable (
-    mkMerge [
-      {
-        services.shairport-sync.enable = cfg.shairport-sync;
-      }
-      (
-        mkIf cfg.mpd.enable {
-          services.mpd = {
-            enable = true;
-            musicDirectory = cfg.mpd.musicDir;
-            network.listenAddress = "any";
-            extraConfig = ''
-              audio_output {
-                type    "pulse"
-                name    "Local MPD"
-              }
-            '';
-          };
-          services.mpdris2 = {
-            enable = true;
-            mpd.host = "127.0.0.1";
-          };
-          home.packages = with pkgs; [
-            mpc_cli
-            ncmpcpp
-          ];
+  config = mkIf cfg.enable
+    (
+      mkMerge [
+        {
+          services.shairport-sync.enable = cfg.shairport-sync;
         }
-      )
-      (
-        mkIf (cfg.mpd.enable && config.profiles.desktop.enable) {
-          home.packages = with pkgs; [
-            ario
-          ];
-        }
-      )
-    ]
-  );
+        (
+          mkIf cfg.mpd.enable {
+            services.mpd = {
+              enable = true;
+              musicDirectory = cfg.mpd.musicDir;
+              network.listenAddress = "any";
+              extraConfig = ''
+                audio_output {
+                  type    "pulse"
+                  name    "Local MPD"
+                }
+              '';
+            };
+            services.mpdris2 = {
+              enable = true;
+              mpd.host = "127.0.0.1";
+            };
+            home.packages = with pkgs; [
+              mpc_cli
+              ncmpcpp
+            ];
+          }
+        )
+        (
+          mkIf (cfg.mpd.enable && config.profiles.desktop.enable) {
+            home.packages = with pkgs; [
+              ario
+            ];
+          }
+        )
+      ]
+    );
 }

@@ -3,7 +3,6 @@
 with lib;
 let
   cfg = config.profiles.desktop;
-
   dim-screen = pkgs.writeScript "dim-sreen.sh" ''
     #!${pkgs.stdenv.shell}
     export PATH=${lib.getBin pkgs.xlibs.xbacklight}/bin:$PATH

@@ -16,20 +16,21 @@ in
       idea = mkEnableOption "Install intellij idea";
     };
   };
-  config = mkIf cfg.enable (
-    mkMerge [
-      {
-        profiles.dev.enable = true;
-        home.packages = with pkgs; [
-          cfg.javaPackage
-          gradle
-        ];
-      }
-      (
-        mkIf cfg.idea {
-          home.packages = with pkgs; [ jetbrains.idea-ultimate ];
+  config = mkIf cfg.enable
+    (
+      mkMerge [
+        {
+          profiles.dev.enable = true;
+          home.packages = with pkgs; [
+            cfg.javaPackage
+            gradle
+          ];
         }
-      )
-    ]
-  );
+        (
+          mkIf cfg.idea {
+            home.packages = with pkgs; [ jetbrains.idea-ultimate ];
+          }
+        )
+      ]
+    );
 }

@@ -10,24 +10,25 @@ in
       enable = mkEnableOption "Enable js development profile";
     };
   };
-  config = mkIf cfg.enable (
-    mkMerge [
-      {
-        home.file.".npmrc".text = ''
-          prefix = ${config.home.homeDirectory}/.local/npm
-        '';
-        home.packages = with pkgs; [
-          nodejs-10_x
-          yarn
-        ];
-      }
-      (
-        mkIf config.profiles.fish.enable {
-          xdg.configFile."fish/conf.d/js.fish".text = ''
-            set -gx PATH ${config.home.homeDirectory}/.local/npm/bin $PATH
+  config = mkIf cfg.enable
+    (
+      mkMerge [
+        {
+          home.file.".npmrc".text = ''
+            prefix = ${config.home.homeDirectory}/.local/npm
           '';
+          home.packages = with pkgs; [
+            nodejs-10_x
+            yarn
+          ];
         }
-      )
-    ]
-  );
+        (
+          mkIf config.profiles.fish.enable {
+            xdg.configFile."fish/conf.d/js.fish".text = ''
+              set -gx PATH ${config.home.homeDirectory}/.local/npm/bin $PATH
+            '';
+          }
+        )
+      ]
+    );
 }

@@ -10,50 +10,51 @@ in
       enable = mkEnableOption "Enable development profile";
     };
   };
-  config = mkIf cfg.enable (
-    mkMerge [
-      {
-        profiles.git.enable = true;
-        profiles.emacs.enable = true;
-        home.file.".ignore".text = ''
-          *.swp
-          *~
-          **/VENDOR-LICENSE
-        '';
-        xdg.configFile."mr".source = ./assets/lib.mr;
-        home.file."src/.mrconfig".source = ./assets/src.mr;
-        home.file."src/knative.dev/.mrconfig".source = ./assets/src.knative.dev.mr;
-        home.file."src/github.com/.mrconfig".source = ./assets/src.github.mr;
-        home.file."src/github.com/openshift/.mrconfig".source = ./assets/src.github.openshift.mr;
-        home.file."src/pkgs.devel.redhat.com/.mrconfig".source = ./assets/src.pkgs.devel.redhat.mr;
-        home.packages = with pkgs;
-          [
-            binutils
-            cmake
-            fswatch
-            gnumake
-            jq
-            mercurial
-            niv
-            ripgrep
-            shfmt
-          ];
-        xdg.configFile."nr/dev" = {
-          text = builtins.toJSON [
-            { cmd = "yq"; }
-            { cmd = "lnav"; }
-            { cmd = "miniserve"; }
-            { cmd = "licensor"; }
-            { cmd = "nix-review"; }
-            { cmd = "yamllint"; pkg = "python37Packages.yamllint"; }
-            { cmd = "nix-prefetch-git"; pkg = "nix-prefetch-scripts"; }
-            { cmd = "nix-prefetch-hg"; pkg = "nix-prefetch-scripts"; }
-            { cmd = "http"; pkg = "httpie"; }
-          ];
-          onChange = "${pkgs.my.nr}/bin/nr dev";
-        };
-        services.lorri.enable = true;
-      }
-    ]
-  );
+  config = mkIf cfg.enable
+    (
+      mkMerge [
+        {
+          profiles.git.enable = true;
+          profiles.emacs.enable = true;
+          home.file.".ignore".text = ''
+            *.swp
+            *~
+            **/VENDOR-LICENSE
+          '';
+          xdg.configFile."mr".source = ./assets/lib.mr;
+          home.file."src/.mrconfig".source = ./assets/src.mr;
+          home.file."src/knative.dev/.mrconfig".source = ./assets/src.knative.dev.mr;
+          home.file."src/github.com/.mrconfig".source = ./assets/src.github.mr;
+          home.file."src/github.com/openshift/.mrconfig".source = ./assets/src.github.openshift.mr;
+          home.file."src/pkgs.devel.redhat.com/.mrconfig".source = ./assets/src.pkgs.devel.redhat.mr;
+          home.packages = with pkgs;
+            [
+              binutils
+              cmake
+              fswatch
+              gnumake
+              jq
+              mercurial
+              niv
+              ripgrep
+              shfmt
+            ];
+          xdg.configFile."nr/dev" = {
+            text = builtins.toJSON [
+              { cmd = "yq"; }
+              { cmd = "lnav"; }
+              { cmd = "miniserve"; }
+              { cmd = "licensor"; }
+              { cmd = "nix-review"; }
+              { cmd = "yamllint"; pkg = "python37Packages.yamllint"; }
+              { cmd = "nix-prefetch-git"; pkg = "nix-prefetch-scripts"; }
+              { cmd = "nix-prefetch-hg"; pkg = "nix-prefetch-scripts"; }
+              { cmd = "http"; pkg = "httpie"; }
+            ];
+            onChange = "${pkgs.my.nr}/bin/nr dev";
+          };
+          services.lorri.enable = true;
+        }
+      ]
+    );
 }

@@ -10,22 +10,23 @@ in
       enable = mkEnableOption "Enable rust development profile";
     };
   };
-  config = mkIf cfg.enable (
-    mkMerge [
-      {
-        profiles.dev.enable = true;
-        home.packages = with pkgs; [
-          gcc
-          rustup
-        ];
-      }
-      (
-        mkIf config.profiles.emacs.enable {
+  config = mkIf cfg.enable
+    (
+      mkMerge [
+        {
+          profiles.dev.enable = true;
           home.packages = with pkgs; [
-            rustracer
+            gcc
+            rustup
           ];
         }
-      )
-    ]
-  );
+        (
+          mkIf config.profiles.emacs.enable {
+            home.packages = with pkgs; [
+              rustracer
+            ];
+          }
+        )
+      ]
+    );
 }

@@ -14,38 +14,39 @@ in
       };
     };
   };
-  config = mkIf cfg.enable (
-    mkMerge [
-      {
-        programs.direnv = {
-          enable = true;
-          config = {
-            whitelist = {
-              prefix = [
-                "${config.home.homeDirectory}/src/github.com/knative"
-                "${config.home.homeDirectory}/src/github.com/openshift"
-                "${config.home.homeDirectory}/src/github.com/tektoncd"
-                "${config.home.homeDirectory}/src/github.com/vdemeester"
-              ];
+  config = mkIf cfg.enable
+    (
+      mkMerge [
+        {
+          programs.direnv = {
+            enable = true;
+            config = {
+              whitelist = {
+                prefix = [
+                  "${config.home.homeDirectory}/src/github.com/knative"
+                  "${config.home.homeDirectory}/src/github.com/openshift"
+                  "${config.home.homeDirectory}/src/github.com/tektoncd"
+                  "${config.home.homeDirectory}/src/github.com/vdemeester"
+                ];
+              };
             };
           };
-        };
-      }
-      (
-        mkIf config.profiles.fish.enable {
-          programs.direnv.enableFishIntegration = true;
         }
-      )
-      (
-        mkIf config.profiles.zsh.enable {
-          programs.direnv.enableZshIntegration = true;
-        }
-      )
-      (
-        mkIf config.profiles.bash.enable {
-          programs.direnv.enableBashIntegration = true;
-        }
-      )
-    ]
-  );
+        (
+          mkIf config.profiles.fish.enable {
+            programs.direnv.enableFishIntegration = true;
+          }
+        )
+        (
+          mkIf config.profiles.zsh.enable {
+            programs.direnv.enableZshIntegration = true;
+          }
+        )
+        (
+          mkIf config.profiles.bash.enable {
+            programs.direnv.enableBashIntegration = true;
+          }
+        )
+      ]
+    );
 }

@@ -10,24 +10,25 @@ in
       enable = mkEnableOption "Enable docker profile";
     };
   };
-  config = mkIf cfg.enable (
-    mkMerge [
-      {
-        home.packages = with pkgs; [
-          docker
-          docker-machine
-          docker-machine-kvm
-          docker-machine-kvm2
-          docker-compose
-        ];
-      }
-      (
-        mkIf config.profiles.fish.enable {
-          xdg.configFile."fish/conf.d/docker.fish".text = ''
-            # set -gx DOCKER_BUILDKIT 1
-          '';
+  config = mkIf cfg.enable
+    (
+      mkMerge [
+        {
+          home.packages = with pkgs; [
+            docker
+            docker-machine
+            docker-machine-kvm
+            docker-machine-kvm2
+            docker-compose
+          ];
         }
-      )
-    ]
-  );
+        (
+          mkIf config.profiles.fish.enable {
+            xdg.configFile."fish/conf.d/docker.fish".text = ''
+              # set -gx DOCKER_BUILDKIT 1
+            '';
+          }
+        )
+      ]
+    );
 }

@@ -3,7 +3,6 @@
 with lib;
 let
   cfg = config.profiles.emacs;
-
   capture = pkgs.writeScriptBin "capture" ''
     #!${pkgs.stdenv.shell}
     emacsclient -s /run/user/1000/emacs/org -n -F '((name . "capture") (width . 150) (height . 90))' -e '(org-capture)'
@@ -27,172 +26,173 @@ in
       };
     };
   };
-  config = mkIf cfg.enable (
-    mkMerge [
-      {
-        home.file.".local/share/applications/org-protocol.desktop".source = ./assets/xorg/org-protocol.desktop;
-        home.file.".local/share/applications/ec.desktop".source = ./assets/xorg/ec.desktop;
-        home.file.".local/share/applications/capture.desktop".source = ./assets/xorg/capture.desktop;
-        home.packages = with pkgs; [
-          ditaa
-          graphviz
-          pandoc
-          zip
-          hunspell
-          hunspellDicts.en_US-large
-          hunspellDicts.en_GB-ize
-          hunspellDicts.fr-any
-          nixpkgs-fmt
-        ];
-        home.sessionVariables = {
-          EDITOR = "et";
-          ALTERNATE_EDITOR = "et";
-        };
-        programs.emacs = {
-          enable = true;
-          package = pkgs.emacs27.override { inherit (pkgs) imagemagick; withXwidgets = cfg.withXwidgets; };
-          extraPackages = epkgs: with epkgs; [
-            ace-window
-            aggressive-indent
-            async
-            avy
-            bbdb
-            beginend
-            pkgs.bookmark-plus
-            company
-            company-emoji
-            company-go
-            dash
-            delight
-            dired-collapse
-            dired-git-info
-            dired-quick-sort
-            dired-narrow
-            dired-rsync
-            pkgs.dired-plus
-            direnv
-            dockerfile-mode
-            easy-kill
-            esup
-            expand-region
-            flycheck
-            flycheck-golangci-lint
-            git-annex
-            git-commit
-            gitattributes-mode
-            gitconfig-mode
-            gitignore-mode
-            github-review
-            goto-last-change
-            hardhat
-            helpful
-            highlight
-            highlight-indentation
-            highlight-numbers
-            ibuffer-vc
-            iedit
-            json-mode
-            markdown-mode
-            #modus-operandi-theme
-            #modus-vivendi-theme
-            mpdel
-            multiple-cursors
+  config = mkIf cfg.enable
+    (
+      mkMerge [
+        {
+          home.file.".local/share/applications/org-protocol.desktop".source = ./assets/xorg/org-protocol.desktop;
+          home.file.".local/share/applications/ec.desktop".source = ./assets/xorg/ec.desktop;
+          home.file.".local/share/applications/capture.desktop".source = ./assets/xorg/capture.desktop;
+          home.packages = with pkgs; [
+            ditaa
+            graphviz
+            pandoc
+            zip
+            hunspell
+            hunspellDicts.en_US-large
+            hunspellDicts.en_GB-ize
+            hunspellDicts.fr-any
             nixpkgs-fmt
-            no-littering
-            ob-async
-            ob-go
-            ob-http
-            orgit
-            org-plus-contrib
-            org-capture-pop-frame
-            org-gcal
-            org-ref
-            org-super-agenda
-            org-web-tools
-            ox-pandoc
-            pandoc-mode
-            projectile
-            projectile-ripgrep
-            pdf-tools
-            python-mode
-            rainbow-delimiters
-            rainbow-mode
-            region-bindings-mode
-            ripgrep
-            rg
-            try
-            visual-fill-column
-            visual-regexp
-            web-mode
-            wgrep
-            with-editor
-            xterm-color
-            yaml-mode
-            darkroom
-            eshell-prompt-extras
-            esh-autosuggest
-            forge
-            go-mode
-            magit
-            magit-annex
-            magit-popup
-            minions
-            moody
-            mwim
-            nix-buffer
-            nix-mode
-            org-super-agenda
-            org-tree-slide
-            shr-tag-pre-highlight
-            ssh-config-mode
-            smartparens
-            symbol-overlay
-            undo-tree
-            use-package
-            # Highly experimental
-            vterm
-            gotest
           ];
-        };
-      }
-      (
-        mkIf config.profiles.emacs.capture {
-          home.packages = with pkgs; [ wmctrl capture ];
-        }
-      )
-      (
-        mkIf config.services.gpg-agent.enable {
-          #services.gpg-agent.extraConfig = ''
-          #  allow-emacs-pinentry
-          #'';
-        }
-      )
-      (
-        mkIf cfg.texlive {
-          home.packages = with pkgs; [ texlive.combined.scheme-full ];
-        }
-      )
-      (
-        mkIf cfg.daemonService {
-          systemd.user.services.emacs = {
-            Unit = {
-              Description = "Emacs: the extensible, self-documenting text editor";
-            };
-            Service = {
-              Environment = ''
-                PATH=${config.home.homeDirectory}/.nix-profile/bin:${config.home.homeDirectory}/.local/npm/bin:/run/wrappers/bin:/etc/profiles/per-user/vincent/bin:${config.home.profileDirectory}/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/usr/share/Modules/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:${config.home.homeDirectory}/bin GOPATH=${config.home.homeDirectory} NIX_PATH=${config.home.homeDirectory}/.nix-defexpr/channels:nixpkgs=/home/vincent/.nix-defexpr/channels/nixpkgs ASPELL_CONF=dict-dir=${config.home.homeDirectory}/.nix-profile/lib/aspell SSH_AUTH_SOCK=/run/user/1000/gnupg/S.gpg-agent.ssh NIX_SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt
-              '';
-              Type = "forking";
-              ExecStart = "${pkgs.bash}/bin/bash -c 'source /etc/profile; exec ${config.home.homeDirectory}/.nix-profile/bin/emacs --dump-file=${config.home.homeDirectory}/.config/emacs/emacs.pdmp --daemon=org'";
-              ExecStop = "${config.home.homeDirectory}/.nix-profile/bin/emacsclient --eval (kill-emacs)";
-              Restart = "always";
-            };
-            Install = {
-              WantedBy = [ "default.target" ];
-            };
+          home.sessionVariables = {
+            EDITOR = "et";
+            ALTERNATE_EDITOR = "et";
+          };
+          programs.emacs = {
+            enable = true;
+            package = pkgs.emacs27.override { inherit (pkgs) imagemagick; withXwidgets = cfg.withXwidgets; };
+            extraPackages = epkgs: with epkgs; [
+              ace-window
+              aggressive-indent
+              async
+              avy
+              bbdb
+              beginend
+              pkgs.bookmark-plus
+              company
+              company-emoji
+              company-go
+              dash
+              delight
+              dired-collapse
+              dired-git-info
+              dired-quick-sort
+              dired-narrow
+              dired-rsync
+              pkgs.dired-plus
+              direnv
+              dockerfile-mode
+              easy-kill
+              esup
+              expand-region
+              flycheck
+              flycheck-golangci-lint
+              git-annex
+              git-commit
+              gitattributes-mode
+              gitconfig-mode
+              gitignore-mode
+              github-review
+              goto-last-change
+              hardhat
+              helpful
+              highlight
+              highlight-indentation
+              highlight-numbers
+              ibuffer-vc
+              iedit
+              json-mode
+              markdown-mode
+              #modus-operandi-theme
+              #modus-vivendi-theme
+              mpdel
+              multiple-cursors
+              nixpkgs-fmt
+              no-littering
+              ob-async
+              ob-go
+              ob-http
+              orgit
+              org-plus-contrib
+              org-capture-pop-frame
+              org-gcal
+              org-ref
+              org-super-agenda
+              org-web-tools
+              ox-pandoc
+              pandoc-mode
+              projectile
+              projectile-ripgrep
+              pdf-tools
+              python-mode
+              rainbow-delimiters
+              rainbow-mode
+              region-bindings-mode
+              ripgrep
+              rg
+              try
+              visual-fill-column
+              visual-regexp
+              web-mode
+              wgrep
+              with-editor
+              xterm-color
+              yaml-mode
+              darkroom
+              eshell-prompt-extras
+              esh-autosuggest
+              forge
+              go-mode
+              magit
+              magit-annex
+              magit-popup
+              minions
+              moody
+              mwim
+              nix-buffer
+              nix-mode
+              org-super-agenda
+              org-tree-slide
+              shr-tag-pre-highlight
+              ssh-config-mode
+              smartparens
+              symbol-overlay
+              undo-tree
+              use-package
+              # Highly experimental
+              vterm
+              gotest
+            ];
           };
         }
-      )
-    ]
-  );
+        (
+          mkIf config.profiles.emacs.capture {
+            home.packages = with pkgs; [ wmctrl capture ];
+          }
+        )
+        (
+          mkIf config.services.gpg-agent.enable {
+            #services.gpg-agent.extraConfig = ''
+            #  allow-emacs-pinentry
+            #'';
+          }
+        )
+        (
+          mkIf cfg.texlive {
+            home.packages = with pkgs; [ texlive.combined.scheme-full ];
+          }
+        )
+        (
+          mkIf cfg.daemonService {
+            systemd.user.services.emacs = {
+              Unit = {
+                Description = "Emacs: the extensible, self-documenting text editor";
+              };
+              Service = {
+                Environment = ''
+                  PATH=${config.home.homeDirectory}/.nix-profile/bin:${config.home.homeDirectory}/.local/npm/bin:/run/wrappers/bin:/etc/profiles/per-user/vincent/bin:${config.home.profileDirectory}/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/usr/share/Modules/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:${config.home.homeDirectory}/bin GOPATH=${config.home.homeDirectory} NIX_PATH=${config.home.homeDirectory}/.nix-defexpr/channels:nixpkgs=/home/vincent/.nix-defexpr/channels/nixpkgs ASPELL_CONF=dict-dir=${config.home.homeDirectory}/.nix-profile/lib/aspell SSH_AUTH_SOCK=/run/user/1000/gnupg/S.gpg-agent.ssh NIX_SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt
+                '';
+                Type = "forking";
+                ExecStart = "${pkgs.bash}/bin/bash -c 'source /etc/profile; exec ${config.home.homeDirectory}/.nix-profile/bin/emacs --dump-file=${config.home.homeDirectory}/.config/emacs/emacs.pdmp --daemon=org'";
+                ExecStop = "${config.home.homeDirectory}/.nix-profile/bin/emacsclient --eval (kill-emacs)";
+                Restart = "always";
+              };
+              Install = {
+                WantedBy = [ "default.target" ];
+              };
+            };
+          }
+        )
+      ]
+    );
 }

@@ -11,212 +11,213 @@ in
       enable = mkEnableOption "Enable git profile";
     };
   };
-  config = mkIf cfg.enable (
-    mkMerge [
-      {
-        home.packages = with pkgs; [
-          gist
-          git-lfs
-          gitAndTools.git-annex
-          gitAndTools.hub
-          mr
-          my.prm
-          my.ape
-        ];
-        programs.git = {
-          enable = true;
-          package = pkgs.gitAndTools.gitFull;
+  config = mkIf cfg.enable
+    (
+      mkMerge [
+        {
+          home.packages = with pkgs; [
+            gist
+            git-lfs
+            gitAndTools.git-annex
+            gitAndTools.hub
+            mr
+            my.prm
+            my.ape
+          ];
+          programs.git = {
+            enable = true;
+            package = pkgs.gitAndTools.gitFull;
 
-          userName = "Vincent Demeester";
-          userEmail = "vincent@sbr.pm";
+            userName = "Vincent Demeester";
+            userEmail = "vincent@sbr.pm";
 
-          signing = {
-            key = "6EB699A3";
-            signByDefault = false;
+            signing = {
+              key = "6EB699A3";
+              signByDefault = false;
+            };
+
+            aliases = {
+              b = "branch --color -v";
+              br = "branch";
+              ci = "commit --signoff";
+              co = "checkout";
+              conflicts = "!git ls-files --unmerged | cut -c51- | sort -u | xargs $EDITOR";
+              ca = "commit --amend";
+              wdiff = "diff --color-words";
+              unstage = "reset HEAD";
+              lg = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative";
+              lga = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative --branches --remotes";
+              lol = "log --pretty=oneline --abbrev-commit --graph --decorate";
+              ls-ignored = "ls-files --exclude-standard --ignored --others";
+              resolve = "!git ls-files --unmerged | cut -c51- | sort -u | xargs git add";
+              su = "submodule update --init --recursive";
+              st = "status";
+              w = "status -sb";
+            };
+            attributes = [
+              "*.org   diff=org"
+            ];
+            extraConfig = {
+              core = {
+                editor = "${pkgs.emacs}/bin/emacsclient -t";
+              };
+              color = {
+                status = "auto";
+                diff = "auto";
+                branch = "auto";
+                interactive = "auto";
+                ui = "auto";
+                sh = "auto";
+              };
+              "color.branch" = {
+                current = "cyan reverse";
+                local = "cyan";
+                remote = "green";
+              };
+              "color.diff" = {
+                current = "white reverse";
+                frag = "magenta reverse";
+                old = "red";
+                new = "green";
+              };
+              "color.status" = {
+                added = "green";
+                changed = "yellow";
+                untracked = "red";
+              };
+              "diff.org" = {
+                xfuncname = "\"^\\\\*+.*\"";
+              };
+              forge = {
+                remote = "upstream";
+              };
+              hub = {
+                protocol = true;
+              };
+              pull = {
+                rebase = true;
+              };
+              push = {
+                default = "upstream";
+                recurseSubmodules = "check";
+              };
+              rebase = {
+                autosquash = true;
+              };
+              advice = {
+                statusHints = false;
+                pushNonFastForward = false;
+              };
+              http = {
+                sslCAinfo = "${ca-bundle_crt}";
+                sslverify = true;
+              };
+              github.user = "vdemeester";
+              "filter \"lfs\"" = {
+                clean = "${pkgs.git-lfs}/bin/git-lfs clean -- %f";
+                smudge = "${pkgs.git-lfs}/bin/git-lfs smudge --skip -- %f";
+                required = true;
+              };
+              "url \"git@github.com:\"".insteadOf = "git://github.com/";
+            };
+
+            includes = [
+              {
+                path = "${config.xdg.configHome}/git/config.d/redhat.gitconfig";
+                condition = "gitdir:${config.home.homeDirectory}/src/github.com/kubernetes/";
+              }
+              {
+                path = "${config.xdg.configHome}/git/config.d/redhat.gitconfig";
+                condition = "gitdir:${config.home.homeDirectory}/src/k8s.io/";
+              }
+              {
+                path = "${config.xdg.configHome}/git/config.d/redhat.gitconfig";
+                condition = "gitdir:${config.home.homeDirectory}/src/github.com/knative/";
+              }
+              {
+                path = "${config.xdg.configHome}/git/config.d/redhat.gitconfig";
+                condition = "gitdir:${config.home.homeDirectory}/src/github.com/tektoncd/";
+              }
+              {
+                path = "${config.xdg.configHome}/git/config.d/redhat.gitconfig";
+                condition = "gitdir/i:${config.home.homeDirectory}/src/github.com/google**";
+              }
+              {
+                path = "${config.xdg.configHome}/git/config.d/redhat.gitconfig";
+                condition = "gitdir:${config.home.homeDirectory}/src/k8s.io/";
+              }
+              {
+                path = "${config.xdg.configHome}/git/config.d/redhat.gitconfig";
+                condition = "gitdir:${config.home.homeDirectory}/src/github.com/minishift/";
+              }
+              {
+                path = "${config.xdg.configHome}/git/config.d/redhat.gitconfig";
+                condition = "gitdir:${config.home.homeDirectory}/src/github.com/operator-framework/";
+              }
+              {
+                path = "${config.xdg.configHome}/git/config.d/redhat.gitconfig";
+                condition = "gitdir:${config.home.homeDirectory}/src/github.com/openshift**";
+              }
+              {
+                path = "${config.xdg.configHome}/git/config.d/redhat.gitconfig";
+                condition = "gitdir:${config.home.homeDirectory}/src/github.com/redhat**";
+              }
+              {
+                path = "${config.xdg.configHome}/git/config.d/redhat.gitconfig";
+                condition = "gitdir:${config.home.homeDirectory}/src/github.com/containers/";
+              }
+              {
+                path = "${config.xdg.configHome}/git/config.d/redhat.gitconfig";
+                condition = "gitdir:${config.home.homeDirectory}/src/gitlab.cee.redhat.com/";
+              }
+              {
+                path = "${config.xdg.configHome}/git/config.d/redhat.gitconfig";
+                condition = "gitdir:${config.home.homeDirectory}/src/gitlab.corp.redhat.com/";
+              }
+              {
+                path = "${config.xdg.configHome}/git/config.d/redhat.gitconfig";
+                condition = "gitdir:${config.home.homeDirectory}/src/pkg.devel.redhat.com/";
+              }
+            ];
+            ignores = [
+              "*.elc"
+              "*.vo"
+              "*.aux"
+              "*.v.d"
+              "*.o"
+              "*.a"
+              "*.la"
+              "*.so"
+              "*.dylib"
+              "*.pyc"
+              "*.pyo"
+              ".idea"
+              "*.iml"
+              "*~"
+              "#*#"
+              ".makefile"
+              ".clean"
+            ];
           };
-
-          aliases = {
-            b = "branch --color -v";
-            br = "branch";
-            ci = "commit --signoff";
-            co = "checkout";
-            conflicts = "!git ls-files --unmerged | cut -c51- | sort -u | xargs $EDITOR";
-            ca = "commit --amend";
-            wdiff = "diff --color-words";
-            unstage = "reset HEAD";
-            lg = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative";
-            lga = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative --branches --remotes";
-            lol = "log --pretty=oneline --abbrev-commit --graph --decorate";
-            ls-ignored = "ls-files --exclude-standard --ignored --others";
-            resolve = "!git ls-files --unmerged | cut -c51- | sort -u | xargs git add";
-            su = "submodule update --init --recursive";
-            st = "status";
-            w = "status -sb";
-          };
-          attributes = [
-            "*.org   diff=org"
-          ];
-          extraConfig = {
-            core = {
-              editor = "${pkgs.emacs}/bin/emacsclient -t";
-            };
-            color = {
-              status = "auto";
-              diff = "auto";
-              branch = "auto";
-              interactive = "auto";
-              ui = "auto";
-              sh = "auto";
-            };
-            "color.branch" = {
-              current = "cyan reverse";
-              local = "cyan";
-              remote = "green";
-            };
-            "color.diff" = {
-              current = "white reverse";
-              frag = "magenta reverse";
-              old = "red";
-              new = "green";
-            };
-            "color.status" = {
-              added = "green";
-              changed = "yellow";
-              untracked = "red";
-            };
-            "diff.org" = {
-              xfuncname = "\"^\\\\*+.*\"";
-            };
-            forge = {
-              remote = "upstream";
-            };
-            hub = {
-              protocol = true;
-            };
-            pull = {
-              rebase = true;
-            };
-            push = {
-              default = "upstream";
-              recurseSubmodules = "check";
-            };
-            rebase = {
-              autosquash = true;
-            };
-            advice = {
-              statusHints = false;
-              pushNonFastForward = false;
-            };
-            http = {
-              sslCAinfo = "${ca-bundle_crt}";
-              sslverify = true;
-            };
-            github.user = "vdemeester";
-            "filter \"lfs\"" = {
-              clean = "${pkgs.git-lfs}/bin/git-lfs clean -- %f";
-              smudge = "${pkgs.git-lfs}/bin/git-lfs smudge --skip -- %f";
-              required = true;
-            };
-            "url \"git@github.com:\"".insteadOf = "git://github.com/";
-          };
-
-          includes = [
-            {
-              path = "${config.xdg.configHome}/git/config.d/redhat.gitconfig";
-              condition = "gitdir:${config.home.homeDirectory}/src/github.com/kubernetes/";
-            }
-            {
-              path = "${config.xdg.configHome}/git/config.d/redhat.gitconfig";
-              condition = "gitdir:${config.home.homeDirectory}/src/k8s.io/";
-            }
-            {
-              path = "${config.xdg.configHome}/git/config.d/redhat.gitconfig";
-              condition = "gitdir:${config.home.homeDirectory}/src/github.com/knative/";
-            }
-            {
-              path = "${config.xdg.configHome}/git/config.d/redhat.gitconfig";
-              condition = "gitdir:${config.home.homeDirectory}/src/github.com/tektoncd/";
-            }
-            {
-              path = "${config.xdg.configHome}/git/config.d/redhat.gitconfig";
-              condition = "gitdir/i:${config.home.homeDirectory}/src/github.com/google**";
-            }
-            {
-              path = "${config.xdg.configHome}/git/config.d/redhat.gitconfig";
-              condition = "gitdir:${config.home.homeDirectory}/src/k8s.io/";
-            }
-            {
-              path = "${config.xdg.configHome}/git/config.d/redhat.gitconfig";
-              condition = "gitdir:${config.home.homeDirectory}/src/github.com/minishift/";
-            }
-            {
-              path = "${config.xdg.configHome}/git/config.d/redhat.gitconfig";
-              condition = "gitdir:${config.home.homeDirectory}/src/github.com/operator-framework/";
-            }
-            {
-              path = "${config.xdg.configHome}/git/config.d/redhat.gitconfig";
-              condition = "gitdir:${config.home.homeDirectory}/src/github.com/openshift**";
-            }
-            {
-              path = "${config.xdg.configHome}/git/config.d/redhat.gitconfig";
-              condition = "gitdir:${config.home.homeDirectory}/src/github.com/redhat**";
-            }
-            {
-              path = "${config.xdg.configHome}/git/config.d/redhat.gitconfig";
-              condition = "gitdir:${config.home.homeDirectory}/src/github.com/containers/";
-            }
-            {
-              path = "${config.xdg.configHome}/git/config.d/redhat.gitconfig";
-              condition = "gitdir:${config.home.homeDirectory}/src/gitlab.cee.redhat.com/";
-            }
-            {
-              path = "${config.xdg.configHome}/git/config.d/redhat.gitconfig";
-              condition = "gitdir:${config.home.homeDirectory}/src/gitlab.corp.redhat.com/";
-            }
-            {
-              path = "${config.xdg.configHome}/git/config.d/redhat.gitconfig";
-              condition = "gitdir:${config.home.homeDirectory}/src/pkg.devel.redhat.com/";
-            }
-          ];
-          ignores = [
-            "*.elc"
-            "*.vo"
-            "*.aux"
-            "*.v.d"
-            "*.o"
-            "*.a"
-            "*.la"
-            "*.so"
-            "*.dylib"
-            "*.pyc"
-            "*.pyo"
-            ".idea"
-            "*.iml"
-            "*~"
-            "#*#"
-            ".makefile"
-            ".clean"
-          ];
-        };
-        xdg.configFile."git/config.d/redhat.gitconfig".source = ./assets/git/redhat.gitconfig;
-        xdg.configFile."nr/git" = {
-          text = builtins.toJSON [
-            { cmd = "tig"; }
-            { cmd = "grv"; pkg = "gitAndTools.grv"; }
-            { cmd = "git-appraise"; pkg = "gitAndTools.git-appraise"; chan = "unstable"; }
-          ];
-          onChange = "${pkgs.my.nr}/bin/nr git";
-        };
-      }
-      (
-        mkIf config.profiles.fish.enable {
-          programs.fish.shellAbbrs = {
-            gs = "git status";
-            gb = "git b";
-            gfr = "git fetch -p --all;and git rebase -S --autostash";
+          xdg.configFile."git/config.d/redhat.gitconfig".source = ./assets/git/redhat.gitconfig;
+          xdg.configFile."nr/git" = {
+            text = builtins.toJSON [
+              { cmd = "tig"; }
+              { cmd = "grv"; pkg = "gitAndTools.grv"; }
+              { cmd = "git-appraise"; pkg = "gitAndTools.git-appraise"; chan = "unstable"; }
+            ];
+            onChange = "${pkgs.my.nr}/bin/nr git";
           };
         }
-      )
-    ]
-  );
+        (
+          mkIf config.profiles.fish.enable {
+            programs.fish.shellAbbrs = {
+              gs = "git status";
+              gb = "git b";
+              gfr = "git fetch -p --all;and git rebase -S --autostash";
+            };
+          }
+        )
+      ]
+    );
 }

@@ -141,7 +141,7 @@ in
           "Mod4+Shift+39" = "exec ~/.screenlayout/home-work.sh && systemctl --user start random-background.service";
           "Mod4+24" = "border toggle";
         };
-        modes = {};
+        modes = { };
         bars = [
           {
             mode = "hide";

@@ -26,65 +26,66 @@ in
       };
     };
   };
-  config = mkIf cfg.enable (
-    mkMerge [
-      {
-        home.file.".local/share/applications/chos4.desktop".source = ../../assets/chos4.desktop;
-        profiles.containers.enable = cfg.containers;
-        home.packages = with pkgs; [
-          #cri-tools
-          kail
-          kustomize
-          kube-prompt
-          kubectx
-          my.oc
-          #my.openshift-install
-          my.operator-sdk
-          my.ko
-          my.kss
-          my.kubernix
-        ];
-      }
-      (
-        mkIf cfg.nr {
-          xdg.configFile."nr/kubernetes" = {
-            text = builtins.toJSON [
-              { cmd = "kubectl"; }
+  config = mkIf cfg.enable
+    (
+      mkMerge [
+        {
+          home.file.".local/share/applications/chos4.desktop".source = ../../assets/chos4.desktop;
+          profiles.containers.enable = cfg.containers;
+          home.packages = with pkgs; [
+            #cri-tools
+            kail
+            kustomize
+            kube-prompt
+            kubectx
+            my.oc
+            #my.openshift-install
+            my.operator-sdk
+            my.ko
+            my.kss
+            my.kubernix
+          ];
+        }
+        (
+          mkIf cfg.nr {
+            xdg.configFile."nr/kubernetes" = {
+              text = builtins.toJSON [
+                { cmd = "kubectl"; }
+              ];
+              onChange = "${pkgs.my.nr}/bin/nr -force kubernetes";
+            };
+          }
+        )
+        (
+          mkIf cfg.krew {
+            home.packages = with pkgs; [ my.krew ];
+          }
+        )
+        (
+          mkIf config.profiles.zsh.enable {
+            home.file."${config.programs.zsh.dotDir}/functions/_kubectl".source = ./assets/zsh/_kubectl;
+          }
+        )
+        (
+          mkIf cfg.minikube.enable {
+            home.packages = with pkgs; [
+              cfg.minikube.package
+              docker-machine-kvm2
             ];
-            onChange = "${pkgs.my.nr}/bin/nr -force kubernetes";
-          };
-        }
-      )
-      (
-        mkIf cfg.krew {
-          home.packages = with pkgs; [ my.krew ];
-        }
-      )
-      (
-        mkIf config.profiles.zsh.enable {
-          home.file."${config.programs.zsh.dotDir}/functions/_kubectl".source = ./assets/zsh/_kubectl;
-        }
-      )
-      (
-        mkIf cfg.minikube.enable {
-          home.packages = with pkgs; [
-            cfg.minikube.package
-            docker-machine-kvm2
-          ];
-        }
-      )
-      (
-        mkIf cfg.kind {
-          home.packages = with pkgs; [
-            kind
-          ];
-        }
-      )
-      (
-        mkIf (!config.profiles.containers.openshift.enable) {
-          home.packages = with pkgs; [ kubectl ];
-        }
-      )
-    ]
-  );
+          }
+        )
+        (
+          mkIf cfg.kind {
+            home.packages = with pkgs; [
+              kind
+            ];
+          }
+        )
+        (
+          mkIf (!config.profiles.containers.openshift.enable) {
+            home.packages = with pkgs; [ kubectl ];
+          }
+        )
+      ]
+    );
 }

@@ -20,193 +20,194 @@ in
     };
   };
 
-  config = mkIf cfg.enable (
-    mkMerge [
-      {
+  config = mkIf cfg.enable
+    (
+      mkMerge [
+        {
 
-        accounts.email = {
-          maildirBasePath = "desktop/mails";
-          accounts = {
-            "redhat" = {
-              address = "vdemeest@redhat.com";
-              userName = "vdemeest@redhat.com";
-              realName = "Vincent Demeester";
-              passwordCommand = "${pkgs.gnupg}/bin/gpg -q --for-your-eyes-only --no-tty --exit-on-status-write-error --batch --passphrase-file ${config.home.homeDirectory}/sync/rh.pass -d ${config.home.homeDirectory}/desktop/documents/rh.pass.gpg";
-              imap.host = "imap.gmail.com";
-              smtp.host = "smtp.gmail.com";
-              mbsync = {
-                enable = true;
-                create = "both";
-                expunge = "both";
-                patterns = [ "*" "![Gmail]*" "[Gmail]/Sent Mail" "[Gmail]/Starred" "[Gmail]/All Mail" ];
-                extraConfig = {
-                  channel = {
-                    Sync = "All";
-                  };
-                  account = {
-                    Timeout = 120;
-                    PipelineDepth = 1;
+          accounts.email = {
+            maildirBasePath = "desktop/mails";
+            accounts = {
+              "redhat" = {
+                address = "vdemeest@redhat.com";
+                userName = "vdemeest@redhat.com";
+                realName = "Vincent Demeester";
+                passwordCommand = "${pkgs.gnupg}/bin/gpg -q --for-your-eyes-only --no-tty --exit-on-status-write-error --batch --passphrase-file ${config.home.homeDirectory}/sync/rh.pass -d ${config.home.homeDirectory}/desktop/documents/rh.pass.gpg";
+                imap.host = "imap.gmail.com";
+                smtp.host = "smtp.gmail.com";
+                mbsync = {
+                  enable = true;
+                  create = "both";
+                  expunge = "both";
+                  patterns = [ "*" "![Gmail]*" "[Gmail]/Sent Mail" "[Gmail]/Starred" "[Gmail]/All Mail" ];
+                  extraConfig = {
+                    channel = {
+                      Sync = "All";
+                    };
+                    account = {
+                      Timeout = 120;
+                      PipelineDepth = 1;
+                    };
                   };
                 };
+                notmuch.enable = cfg.sync;
+                astroid.enable = cfg.sync;
+                msmtp.enable = true;
               };
-              notmuch.enable = cfg.sync;
-              astroid.enable = cfg.sync;
-              msmtp.enable = true;
-            };
-            "perso" = {
-              address = "vinc.demeester@gmail.com";
-              userName = "vinc.demeester@gmail.com";
-              realName = "Vincent Demeester";
-              passwordCommand = "${pkgs.gnupg}/bin/gpg -q --for-your-eyes-only --no-tty --exit-on-status-write-error --batch --passphrase-file ${config.home.homeDirectory}/sync/perso.pass -d ${config.home.homeDirectory}/desktop/documents/perso.pass.gpg";
-              imap.host = "imap.gmail.com";
-              smtp.host = "smtp.gmail.com";
-              mbsync = {
-                enable = true;
-                create = "both";
-                expunge = "both";
-                patterns = [ "*" "![Gmail]*" "[Gmail]/Sent Mail" "[Gmail]/Starred" "[Gmail]/All Mail" ];
-                extraConfig = {
-                  channel = {
-                    Sync = "All";
-                  };
-                  account = {
-                    Timeout = 120;
-                    PipelineDepth = 1;
+              "perso" = {
+                address = "vinc.demeester@gmail.com";
+                userName = "vinc.demeester@gmail.com";
+                realName = "Vincent Demeester";
+                passwordCommand = "${pkgs.gnupg}/bin/gpg -q --for-your-eyes-only --no-tty --exit-on-status-write-error --batch --passphrase-file ${config.home.homeDirectory}/sync/perso.pass -d ${config.home.homeDirectory}/desktop/documents/perso.pass.gpg";
+                imap.host = "imap.gmail.com";
+                smtp.host = "smtp.gmail.com";
+                mbsync = {
+                  enable = true;
+                  create = "both";
+                  expunge = "both";
+                  patterns = [ "*" "![Gmail]*" "[Gmail]/Sent Mail" "[Gmail]/Starred" "[Gmail]/All Mail" ];
+                  extraConfig = {
+                    channel = {
+                      Sync = "All";
+                    };
+                    account = {
+                      Timeout = 120;
+                      PipelineDepth = 1;
+                    };
                   };
                 };
+                notmuch.enable = cfg.sync;
+                astroid.enable = cfg.sync;
+                msmtp.enable = true;
               };
-              notmuch.enable = cfg.sync;
-              astroid.enable = cfg.sync;
-              msmtp.enable = true;
-            };
-            "prv" = {
-              primary = true;
-              address = "vincent@demeester.fr";
-              userName = "vincent@demeester.fr";
-              realName = "Vincent Demeester";
-              passwordCommand = "${pkgs.gnupg}/bin/gpg -q --for-your-eyes-only --no-tty --exit-on-status-write-error --batch --passphrase-file ${config.home.homeDirectory}/sync/prv.pass -d ${config.home.homeDirectory}/desktop/documents/prv.pass.gpg";
-              imap.host = "mail.gandi.net";
-              smtp.host = "mail.gandi.net";
-              mbsync = {
-                enable = true;
-                create = "both";
-                expunge = "both";
-                patterns = [ "*" ];
-                extraConfig = {
-                  channel = {
-                    Sync = "All";
-                  };
-                  account = {
-                    Timeout = 120;
-                    PipelineDepth = 1;
+              "prv" = {
+                primary = true;
+                address = "vincent@demeester.fr";
+                userName = "vincent@demeester.fr";
+                realName = "Vincent Demeester";
+                passwordCommand = "${pkgs.gnupg}/bin/gpg -q --for-your-eyes-only --no-tty --exit-on-status-write-error --batch --passphrase-file ${config.home.homeDirectory}/sync/prv.pass -d ${config.home.homeDirectory}/desktop/documents/prv.pass.gpg";
+                imap.host = "mail.gandi.net";
+                smtp.host = "mail.gandi.net";
+                mbsync = {
+                  enable = true;
+                  create = "both";
+                  expunge = "both";
+                  patterns = [ "*" ];
+                  extraConfig = {
+                    channel = {
+                      Sync = "All";
+                    };
+                    account = {
+                      Timeout = 120;
+                      PipelineDepth = 1;
+                    };
                   };
                 };
+                notmuch.enable = cfg.sync;
+                astroid.enable = cfg.sync;
+                msmtp.enable = true;
               };
-              notmuch.enable = cfg.sync;
-              astroid.enable = cfg.sync;
-              msmtp.enable = true;
             };
           };
-        };
 
-        home.file."bin/msmtp" = {
-          text = ''
-            #!${pkgs.stdenv.shell}
-            ${pkgs.libnotify}/bin/notify-send "Sending mail ✉️"
-            ${pkgs.msmtp}/bin/msmtp --read-envelope-from $@
-          '';
-          executable = true;
-        };
-
-        programs.msmtp.enable = true;
-
-      }
-
-      (
-        mkIf cfg.sync {
-
-          services.mbsync = {
-            enable = true;
-            preExec = "${config.xdg.configHome}/mbsync/preExec";
-            postExec = "${config.xdg.configHome}/mbsync/postExec";
-            frequency = cfg.frequency;
-          };
-
-          xdg.configFile."mbsync/preExec" = {
+          home.file."bin/msmtp" = {
             text = ''
               #!${pkgs.stdenv.shell}
-
-              export NOTMUCH_CONFIG=${config.xdg.configHome}/notmuch/notmuchrc
-              export NMBGIT=${config.xdg.dataHome}/notmuch/nmbug
-
-              ${pkgs.coreutils}/bin/mkdir -p ${config.home.homeDirectory}/desktop/mails/redhat ${config.home.homeDirectory}/desktop/mails/perso
-              ${pkgs.afew}/bin/afew -C  ${config.xdg.configHome}/notmuch/notmuchrc -m -v
+              ${pkgs.libnotify}/bin/notify-send "Sending mail ✉️"
+              ${pkgs.msmtp}/bin/msmtp --read-envelope-from $@
             '';
             executable = true;
           };
 
-          xdg.configFile."mbsync/postExec" = {
-            text = ''
-              #!${pkgs.stdenv.shell}
-
-              export NOTMUCH_CONFIG=${config.xdg.configHome}/notmuch/notmuchrc
-              export NMBGIT=${config.xdg.dataHome}/notmuch/nmbug
-
-              ${pkgs.notmuch}/bin/notmuch new
-              ${pkgs.afew}/bin/afew -C ${config.xdg.configHome}/notmuch/notmuchrc --tag --new -v
-              # Remove inbox (lower-case)
-              ${pkgs.notmuch}/bin/notmuch tag -inbox -- tag:inbox
-              # Remove Inbox tagged message that are not in an Inbox
-              ${pkgs.notmuch}/bin/notmuch tag -Inbox -- not folder:redhat/Inbox and not folder:perso/Inbox and tag:Inbox
-              ${pkgs.libnotify}/bin/notify-send "Mails synced 📬"
-            '';
-            executable = true;
-          };
-
-          home.file."bin/msync" = {
-            text = ''
-              #!${pkgs.stdenv.shell}
-              ${pkgs.libnotify}/bin/notify-send "Syncing mails 📫️"
-              systemctl --user start mbsync
-            '';
-            executable = true;
-          };
-
-          programs.mbsync.enable = true;
-          programs.notmuch.enable = true;
-
-          programs.afew = {
-            enable = true;
-            extraConfig = ''
-              [SpamFilter]
-              [KillThreadsFilter]
-              [ListMailsFilter]
-              [ArchiveSentMailsFilter]
-              [FolderNameFilter]
-              maildir_separator = /
-
-              [MailMover]
-              folders = perso/Inbox redhat/Inbox
-              rename = true
-
-              perso/Inbox = 'NOT tag:Inbox':"perso/[Gmail]/All Mail"
-              redhat/Inbox = 'NOT tag:Inbox':"redhat/[Gmail]/All Mail"
-            '';
-          };
-
-          programs.astroid = {
-            enable = true;
-            externalEditor = "emacsclient -c";
-            extraConfig = {
-              startup.queries.inbox = "tag:Inbox";
-              startup.queries.inbox_perso = "folder:perso/Inbox";
-              startup.queries.inbox_redhat = "folder:redhat/Inbox";
-            };
-          };
+          programs.msmtp.enable = true;
 
         }
-      )
 
-    ]
-  );
+        (
+          mkIf cfg.sync {
+
+            services.mbsync = {
+              enable = true;
+              preExec = "${config.xdg.configHome}/mbsync/preExec";
+              postExec = "${config.xdg.configHome}/mbsync/postExec";
+              frequency = cfg.frequency;
+            };
+
+            xdg.configFile."mbsync/preExec" = {
+              text = ''
+                #!${pkgs.stdenv.shell}
+
+                export NOTMUCH_CONFIG=${config.xdg.configHome}/notmuch/notmuchrc
+                export NMBGIT=${config.xdg.dataHome}/notmuch/nmbug
+
+                ${pkgs.coreutils}/bin/mkdir -p ${config.home.homeDirectory}/desktop/mails/redhat ${config.home.homeDirectory}/desktop/mails/perso
+                ${pkgs.afew}/bin/afew -C  ${config.xdg.configHome}/notmuch/notmuchrc -m -v
+              '';
+              executable = true;
+            };
+
+            xdg.configFile."mbsync/postExec" = {
+              text = ''
+                #!${pkgs.stdenv.shell}
+
+                export NOTMUCH_CONFIG=${config.xdg.configHome}/notmuch/notmuchrc
+                export NMBGIT=${config.xdg.dataHome}/notmuch/nmbug
+
+                ${pkgs.notmuch}/bin/notmuch new
+                ${pkgs.afew}/bin/afew -C ${config.xdg.configHome}/notmuch/notmuchrc --tag --new -v
+                # Remove inbox (lower-case)
+                ${pkgs.notmuch}/bin/notmuch tag -inbox -- tag:inbox
+                # Remove Inbox tagged message that are not in an Inbox
+                ${pkgs.notmuch}/bin/notmuch tag -Inbox -- not folder:redhat/Inbox and not folder:perso/Inbox and tag:Inbox
+                ${pkgs.libnotify}/bin/notify-send "Mails synced 📬"
+              '';
+              executable = true;
+            };
+
+            home.file."bin/msync" = {
+              text = ''
+                #!${pkgs.stdenv.shell}
+                ${pkgs.libnotify}/bin/notify-send "Syncing mails 📫️"
+                systemctl --user start mbsync
+              '';
+              executable = true;
+            };
+
+            programs.mbsync.enable = true;
+            programs.notmuch.enable = true;
+
+            programs.afew = {
+              enable = true;
+              extraConfig = ''
+                [SpamFilter]
+                [KillThreadsFilter]
+                [ListMailsFilter]
+                [ArchiveSentMailsFilter]
+                [FolderNameFilter]
+                maildir_separator = /
+
+                [MailMover]
+                folders = perso/Inbox redhat/Inbox
+                rename = true
+
+                perso/Inbox = 'NOT tag:Inbox':"perso/[Gmail]/All Mail"
+                redhat/Inbox = 'NOT tag:Inbox':"redhat/[Gmail]/All Mail"
+              '';
+            };
+
+            programs.astroid = {
+              enable = true;
+              externalEditor = "emacsclient -c";
+              extraConfig = {
+                startup.queries.inbox = "tag:Inbox";
+                startup.queries.inbox_perso = "folder:perso/Inbox";
+                startup.queries.inbox_redhat = "folder:redhat/Inbox";
+              };
+            };
+
+          }
+        )
+
+      ]
+    );
 }