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

nixos/base.nix

@@ -61,10 +61,12 @@
   hardware.bluetooth.enable = true;
   services.blueman.enable = true;
 
+  # Keyboard/Keymap
+  console.keyMap = "us";
+
   i18n = {
     defaultLocale = "en_US.UTF-8";
   };
-  console.useXkbConfig = true;
 
   # Update timezone automatically
   services.tzupdate.enable = true;
@@ -83,22 +85,9 @@
   hardware.keyboard.zsa.enable = true;
 
   services.xserver = {
+    exportConfiguration = true;
     enable = true;
-
+    layout = "us";
-    xkbOptions = "ctrl:swapcaps";
-    layout = "us+rwin_as_hyper";
-    extraLayouts.rwin_as_hyper = {
-      description = "Right Alt as Hyper key";
-      languages = [ ];
-      symbolsFile = pkgs.writeText "rwin_as_hyper" ''
-        partial modifier_keys
-        xkb_symbols "rwin_as_hyper" {
-          replace key <RWIN> { [ Hyper_R ] };
-          modifier_map Mod3 { <HYPR>, Hyper_L, Hyper_R };
-        };
-      '';
-    };
-
     desktopManager = {
       plasma5.enable = true;
     };

nixos/home-manager

@@ -1 +1 @@
-Subproject commit 1b533ee0c5407df22334d66ab400f8f6c33b2d89
+Subproject commit 39cb571ad798a6e355e181d53bb513bfafa8c3be

nixos/home-manager.nix

@@ -2,10 +2,11 @@
   xsession = {
     enable = true;
     preferStatusNotifierItems = true;
-    importedVariables = [ "GDK_PIXBUF_ICON_LOADER" "PATH" ];
+    importedVariables = [ "GDK_PIXBUF_ICON_LOADER" ];
     profileExtra = ''
       export ROFI_SYSTEMD_TERM="alacritty -e"
       . "$HOME/.lib/login.sh"
+      load_xkb_map.sh
     '';
   };