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

dotfiles/emacs.d/README.org

@@ -3880,11 +3880,6 @@ I've disabled magithub because it causes magit to be super slow
   (progn
     (add-hook 'magit-mode-hook 'turn-on-magit-gitflow)))
 #+END_SRC
-** git-timemachine
-#+BEGIN_SRC emacs-lisp
-(use-package git-timemachine
-  :commands git-timemachine)
-#+END_SRC
 ** git-gutter
 #+BEGIN_SRC emacs-lisp
 (use-package git-gutter

dotfiles/xkb/keymap/katboon

@@ -0,0 +1,7 @@
+xkb_keymap {
+	xkb_keycodes  { include "evdev+aliases(qwerty)"	};
+	xkb_types     { include "complete"	};
+	xkb_compat    { include "complete"	};
+	xkb_symbols   { include "pc+us+inet(evdev)+altwin(swap_lalt_lwin)+imalison(ralt_as_hyper)+capslock(ctrl_modifier)"	};
+	xkb_geometry  { include "pc(pc105)"	};
+};

nixos/configuration.nix

@@ -161,6 +161,7 @@ in
     clipit
     feh
     gnome3.gpaste
+    gnome3.gnome-tweaks
     kdeconnect
     libnotify
     lxqt.lxqt-powermanagement
@@ -339,36 +340,14 @@ in
     desktopManager = {
       plasma5.enable = true;
     };
-    windowManager = {
-      session = [
-        {
-          name = "xmonad";
-          start = ''
-            /usr/bin/env imalison-xmonad &
-            waitPID=$!
-          '';
-        }
-        {
-          name = "waymonad";
-          start = ''
-            /usr/bin/env waymonad
-            waitPID=$!
-          '';
-        }
-      ];
-    };
     displayManager = {
-      sddm = {
-        enable = true;
-      };
+      sddm.enable = true;
       sessionCommands = ''
         systemctl --user import-environment GDK_PIXBUF_MODULE_FILE DBUS_SESSION_BUS_ADDRESS PATH
       '';
     };
   };
 
-  virtualisation.docker.enable = true;
-
   users.extraUsers = let
     extraGroups = [
       "audio"
@@ -391,18 +370,15 @@ in
   in {
     imalison = userDefaults // {
       name = "imalison";
-      uid = 1000;
       home = "/home/imalison";
       shell = pkgs.zsh;
     };
     kat = userDefaults // {
       name = "kat";
-      uid = 1001;
       home = "/home/kat";
       shell = pkgs.zsh;
     };
   };
-  nix.trustedUsers = ["imalison"];
 
   nix = {
     package = pkgs.nixFlakes;
@@ -410,4 +386,5 @@ in
       experimental-features = nix-command flakes
     '';
    };
+  nix.trustedUsers = ["imalison" "kat"];
 }

nixos/machines/adele.nix

@@ -0,0 +1,48 @@
+# 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
+    ];
+
+  system.stateVersion = "20.03";
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.initrd.kernelModules = [ ];
+  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/bfe4586b-2538-4aae-ad2f-b1277378de4a";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/5C09-F06F";
+      fsType = "vfat";
+    };
+
+  swapDevices = [ ];
+
+  networking.hostName = "adele";
+
+  nix.maxJobs = lib.mkDefault 12;
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+
+  services.redshift.enable = true;
+
+  location = {
+    latitude = 37.8104601;
+    longitude = -122.2572529;
+  };
+}