Merge branch 'master' of github.com:IvanMalison/dotfiles

nixos/configuration.nix

@@ -1,5 +1,6 @@
 { config, pkgs, options, ... }:
 let
+  all-hies = import (fetchTarball "https://github.com/infinisil/all-hies/tarball/master") {};
   my-overlays = import ./overlays.nix;
   my-python-packages = python-packages: with python-packages; [
     appdirs
@@ -20,11 +21,6 @@ in
 {
   nixpkgs.overlays = [ my-overlays ];
   # XXX: This ensures that all nix tools pick up the overlays that are set here
-  nix.nixPath =
-    # Prepend default nixPath values.
-    options.nix.nixPath.default ++
-    # Append our nixpkgs-overlays.
-    [ "nixpkgs-overlays=/etc/nixos/overlays-compat/" ];
 
   # Allow all the things
   nixpkgs.config.allowUnfree = true;
@@ -92,6 +88,7 @@ in
     pulseeffects
     quassel
     rxvt_unicode
+    slack-appindicator
     simplescreenrecorder
     spotify
     termite
@@ -150,7 +147,8 @@ in
     cabal2nix
     ghc
     stack
-    haskell.compiler.ghc863
+    haskellPackages.hasktags
+    # haskell.compiler.ghc863
 
     # Scala
     sbt
@@ -175,6 +173,7 @@ in
     bazaar
     binutils
     dex
+    direnv
     dpkg
     emacs26Packages.cask
     fd
@@ -185,6 +184,7 @@ in
     gitAndTools.git-fame
     gitAndTools.hub
     gitFull
+    glxinfo
     gnumake
     gnupg
     htop
@@ -198,6 +198,7 @@ in
     openvpn
     pass
     patchelf
+    pciutils
     plasma-workspace
     powertop
     pscircle
@@ -241,6 +242,8 @@ in
   programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
   programs.adb.enable = true;
 
+  services.acpid.enable = true;
+
   services.openssh.enable = true;
 
   services.avahi = {
@@ -291,7 +294,6 @@ in
 
   };
 
-  # Define a user account. Don't forget to set a password with ‘passwd’.
   users.extraUsers = let
     extraGroups = [
       "audio"

nixos/dfinity.nix

@@ -0,0 +1,10 @@
+{
+  nix = {
+    trustedBinaryCaches = [ https://nix.oregon.dfinity.build ];
+    binaryCachePublicKeys = [ "hydra.oregon.dfinity.build-2:KMTixHrh9DpAjF/0xU/49VEtNuGzQ71YaVIUSOLUaCM=" ];
+  };
+  networking.extraHosts =
+  ''
+    10.20.12.55 nix.oregon.dfinity.build
+  '';
+}

nixos/extra.nix

@@ -4,7 +4,6 @@
     gimp
     android-studio
     texlive.combined.scheme-full
-    slack
   ];
   boot.extraModulePackages = with pkgs; [ xboxdrv ];
 }

nixos/machines/dfinity-blade15.nix

@@ -0,0 +1,40 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, ... }:
+
+{
+  imports =
+    [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
+    ../configuration.nix
+    ../dfinity.nix
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  services.xserver.libinput.enable = true;
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/58218a04-3ba1-4295-86bb-ada59f75e3b6";
+      fsType = "ext4";
+    };
+
+  boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/8142784e-45c6-4a2b-91f1-09df741ac00f";
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/36E1-BE93";
+      fsType = "vfat";
+    };
+
+  swapDevices = [ ];
+
+  networking.hostName = "ivanm-dfinity-razr";
+
+  nix.maxJobs = lib.mkDefault 12;
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+}

nixos/overlays.nix

@@ -19,6 +19,7 @@ self: super:
   pasystray-appindicator = super.pasystray.overrideAttrs (oldAttrs: rec {
     buildInputs = oldAttrs.buildInputs ++ [self.libappindicator-gtk3];
   });
+  slack-appindicator = self.callPackage ./slack.nix { };
   customizable-notify-osd = super.notify-osd.overrideAttrs (oldAttrs: rec {
     version = "0.9.35+16.04.20160415";
     baseURI = "https://launchpad.net/~leolik/+archive/leolik";

nixos/slack.nix

@@ -0,0 +1,116 @@
+{ darkMode ? false, stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo,
+cups, curl, dbus, expat, fontconfig, freetype, glib , gnome2, gtk3, gdk_pixbuf,
+libappindicator-gtk3, libnotify, libxcb, nspr, nss, pango , systemd, xorg,
+at-spi2-atk }:
+
+let
+
+  version = "3.4.0";
+
+  rpath = stdenv.lib.makeLibraryPath [
+    alsaLib
+    at-spi2-atk
+    atk
+    cairo
+    cups
+    curl
+    dbus
+    expat
+    fontconfig
+    freetype
+    glib
+    gnome2.GConf
+    gdk_pixbuf
+    gtk3
+    pango
+    libnotify
+    libxcb
+    libappindicator-gtk3
+    nspr
+    nss
+    stdenv.cc.cc
+    systemd
+
+    xorg.libxkbfile
+    xorg.libX11
+    xorg.libXcomposite
+    xorg.libXcursor
+    xorg.libXdamage
+    xorg.libXext
+    xorg.libXfixes
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libXrender
+    xorg.libXtst
+    xorg.libXScrnSaver
+  ] + ":${stdenv.cc.cc.lib}/lib64";
+
+  src =
+    if stdenv.hostPlatform.system == "x86_64-linux" then
+      fetchurl {
+        url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
+        sha256 = "0ld53gg0dbfpi79lz2sx5br29mlhwkfcypzf3iya4cm75a33hyw5";
+      }
+    else
+      throw "Slack is not supported on ${stdenv.hostPlatform.system}";
+
+in stdenv.mkDerivation {
+  name = "slack-${version}";
+
+  inherit src;
+
+  buildInputs = [
+    dpkg
+    gtk3  # needed for GSETTINGS_SCHEMAS_PATH
+  ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  unpackPhase = "true";
+  buildCommand = ''
+    mkdir -p $out
+    dpkg -x $src $out
+    cp -av $out/usr/* $out
+    rm -rf $out/etc $out/usr $out/share/lintian
+
+    # Otherwise it looks "suspicious"
+    chmod -R g-w $out
+
+    for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
+      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
+      patchelf --set-rpath ${rpath}:$out/lib/slack $file || true
+    done
+
+    # Replace the broken bin/slack symlink with a startup wrapper
+    rm $out/bin/slack
+    makeWrapper $out/lib/slack/slack $out/bin/slack \
+      --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH
+
+    # Fix the desktop link
+    substituteInPlace $out/share/applications/slack.desktop \
+      --replace /usr/bin/ $out/bin/ \
+      --replace /usr/share/ $out/share/
+  '' + stdenv.lib.optionalString darkMode ''
+    cat <<EOF >> $out/lib/slack/resources/app.asar.unpacked/src/static/ssb-interop.js
+    document.addEventListener('DOMContentLoaded', function() {
+    let tt__customCss = ".menu ul li a:not(.inline_menu_link) {color: #fff !important;}"
+    $.ajax({
+        url: 'https://cdn.rawgit.com/laCour/slack-night-mode/master/css/raw/black.css',
+        success: function(css) {
+            \$("<style></style>").appendTo('head').html(css + tt__customCss);
+            \$("<style></style>").appendTo('head').html('#reply_container.upload_in_threads .inline_message_input_container {background: padding-box #545454}');
+            \$("<style></style>").appendTo('head').html('.p-channel_sidebar {background: #363636 !important}');
+            \$("<style></style>").appendTo('head').html('#client_body:not(.onboarding):not(.feature_global_nav_layout):before {background: inherit;}');
+        }
+      });
+    });
+    EOF
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Desktop client for Slack";
+    homepage = https://slack.com;
+    license = licenses.unfree;
+    platforms = [ "x86_64-linux" ];
+  };
+}