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

nixos/configuration.nix

@@ -15,6 +15,7 @@ let
     virtualenvwrapper
   ];
   python-with-my-packages = pkgs.python3.withPackages my-python-packages;
+  all-hies = import (fetchTarball "https://github.com/infinisil/all-hies/tarball/master") {};
   taffySource = pkgs.lib.sourceByRegex ../dotfiles/config/taffybar [
     "taffybar.hs" "imalison-taffybar.cabal"
   ];
@@ -84,6 +85,7 @@ in
     };
   };
 
+  xdg.menus.enable = true;
   environment.systemPackages = with pkgs; [
 
     # Applications
@@ -121,7 +123,7 @@ in
     plasma5.breeze-qt5
     gnome-breeze
 
-    # Desktop
+    # Haskell Desktop
     (haskellPackages.callCabal2nix "imalison-taffybar" taffySource { })
     (haskellPackages.callCabal2nix "imalison-xmonad" xmonadSource { })
     (ntiHaskellPackages.callCabal2nix "notifications-tray-icon" notifications-tray-icon-source { })
@@ -130,6 +132,8 @@ in
     haskellPackages.xmonad
     haskellPackages.taffybar
 
+    # Desktop
+    taffybar
     autorandr
     betterlockscreen
     blueman
@@ -173,6 +177,8 @@ in
     ghc
     stack
     haskellPackages.hasktags
+    haskellPackages.hoogle
+    (all-hies.selection { selector = p: { inherit (p) ghc864; }; })
 
     # Scala
     sbt
@@ -248,6 +254,7 @@ in
 
     # Nix
     nix-prefetch-git
+    cachix
 
     # Miscellaneous
     android-udev-rules

nixos/machines/ivanm-dfinity-razer.nix

@@ -4,12 +4,15 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports =
-    [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
+  imports = [
+    <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
     ../configuration.nix
     ../extra.nix
     ../dfinity.nix
-    ];
+    /etc/nixos/cachix.nix
+  ];
+
+  hardware.bumblebee.enable = true;
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
   boot.kernelModules = [ "kvm-intel" ];
@@ -22,29 +25,29 @@
   services.tlp.enable = true;
   services.acpid.enable = false;
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/58218a04-3ba1-4295-86bb-ada59f75e3b6";
-      fsType = "ext4";
-    };
+  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";
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/36E1-BE93";
+    fsType = "vfat";
+  };
 
-    systemd.services.resume-fix = {
-      description = "Fixes acpi immediate resume after suspend";
-      wantedBy = [ "multi-user.target" "post-resume.target" ];
-      after = [ "multi-user.target" "post-resume.target" ];
-      script = ''
-        if ${pkgs.gnugrep}/bin/grep -q '\bXHC\b.*\benabled\b' /proc/acpi/wakeup; then
-          echo XHC > /proc/acpi/wakeup
-        fi
-      '';
-      serviceConfig.Type = "oneshot";
-    };
+  systemd.services.resume-fix = {
+    description = "Fixes acpi immediate resume after suspend";
+    wantedBy = [ "multi-user.target" "post-resume.target" ];
+    after = [ "multi-user.target" "post-resume.target" ];
+    script = ''
+      if ${pkgs.gnugrep}/bin/grep -q '\bXHC\b.*\benabled\b' /proc/acpi/wakeup; then
+      echo XHC > /proc/acpi/wakeup
+      fi
+    '';
+    serviceConfig.Type = "oneshot";
+  };
 
   swapDevices = [ ];