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

dotfiles/emacs.d/README.org

@@ -1168,7 +1168,9 @@ Disabling line numbers because they are slow as fuck.
 #+END_SRC
 *** frame-mode
 #+BEGIN_SRC emacs-lisp
-(defvar imalison:use-frame-mode nil)
+(defvar imalison:use-frame-mode
+  (s-contains? "xmonad" (shell-command-to-string "wmctrl -m")))
+
 (use-package frame-mode
   :if imalison:use-frame-mode
   :demand t

nixos/configuration.nix

@@ -107,7 +107,6 @@ in
     pommed_light
     rofi
     rofi-pass
-    sddm-kcm
     udiskie-appindicator
     volnoti
     xclip
@@ -145,6 +144,7 @@ in
     stow
     tmux
     wget
+    wmctrl
     zsh
 
     # Nix
@@ -172,7 +172,6 @@ in
     exportConfiguration = true;
     enable = true;
     layout = "us";
-    videoDrivers = [ "nvidia" ];
     desktopManager = {
       gnome3.enable = true;
       default = "none";
@@ -222,5 +221,5 @@ in
     shell = pkgs.zsh;
   };
 
-  system.stateVersion = "18.03"; # Did you read the comment?
+  system.stateVersion = "18.03";
 }

nixos/machines/imalison-home.nix

@@ -52,7 +52,8 @@
   networking.hostName = "imalison-home";
   boot.loader.efi.canTouchEfiVariables = true;
 
-  services.xserver.screenSection = ''
+  services.xserver = {
+    screenSection = ''
       DefaultDepth 24
       Option "RegistryDwords" "PerfLevelSrc=0x3322; PowerMizerDefaultAC=0x1"
       Option "TripleBuffer" "True"
@@ -63,4 +64,6 @@
       Option "MultiGPU" "Off"
       Option "BaseMosaic" "off"
     '';
+    videoDrivers = [ "nvidia" ];
+  };
 }

nixos/machines/uber-loaner.nix

@@ -0,0 +1,36 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
+    ../configuration.nix
+  ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ pkgs.linuxPackages.rtl8814au ];
+  boot.loader.grub.efiSupport = true;
+  boot.loader.grub.device = "nodev";
+  boot.loader.grub.enable = true;
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-label/EFI";
+    fsType = "vfat";
+  };
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/2958f04b-8387-4a0c-abc1-f12036c53581";
+      fsType = "ext4";
+    };
+
+  fileSystems."/tmp" =
+    { device = "tmpfs";
+      fsType = "tmpfs";
+    };
+
+  swapDevices = [ ];
+
+  nix.maxJobs = lib.mkDefault 4;
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  users.extraUsers.root.initialHashedPassword = "";
+}