config sync

9 files changed, 55 insertions, 24 deletions

diff --git a/config/nvim b/config/nvim
-Subproject c410b8783002949856b47053b183d937c6f494e
+Subproject 96a52f23557715ac4d14922a675be95e63711f4
diff --git a/configuration.nix b/configuration.nix
index 37559c0..32c776b 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -99,9 +99,15 @@ in
   services.atd.enable = true;
 
   virtualisation = {
-    docker.enable = true;
+    docker = {
+      enable = true;
+      # autoPrune = {
+      #   enable = true;
+      #   flags = [ "--volumes" ];
+      # };
+    };
     lxd.enable = false;
-    virtualbox.host.enable = true;
+    virtualbox.host.enable = false;
     #anbox.enable = true;
   };
 
diff --git a/extras/notes b/extras/notes
-Subproject 91f7a3ceedca4c1ece1060dc48d3b593cb929eb
+Subproject 57a94c6bc46d198221d90426f41b1eec67ab345
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index 40fd0aa..ae3cff8 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -20,7 +20,6 @@
     "snd-rawmidi"
   ];
   boot.kernelParams = [ "i8042.nopnp=1" "pci=nocrs" "i915.enable_dpcd_backlight=1" "acpi_backlight=vendor" ];
-  boot.extraModulePackages = [ ];
   boot.extraModprobeConfig = ''
     options snd slots=snd-hda-intel
   '';
diff --git a/home.nix b/home.nix
index 08e1468..02c35f4 100644
--- a/home.nix
+++ b/home.nix
@@ -27,6 +27,18 @@ in
   #enableNixDirenvIntegration = true;
   #};
 
+  # xdg.configFile."mimeapps.list".text = ''
+  #   [Default Applications]
+  #   text/html=browser-select.desktop
+  #   x-scheme-handler/http=browser-select.desktop
+  #   x-scheme-handler/https=browser-select.desktop
+  #   x-scheme-handler/about=browser-select.desktop
+  #   x-scheme-handler/mailto=thunderbird.desktop;
+  #   x-scheme-handler/unknown=browser-select.desktop
+  #   image/png=sxiv.desktop
+  #   image/jpeg=sxiv.desktop
+  # '';
+
   programs.lsd = {
     enable = true;
     enableAliases = true;
diff --git a/modules/keyboard/kmonad.k2.kbd b/modules/keyboard/kmonad.k2.kbd
index e77c26f..47b6829 100644
--- a/modules/keyboard/kmonad.k2.kbd
+++ b/modules/keyboard/kmonad.k2.kbd
@@ -7,24 +7,37 @@
   lctl lmet lalt           spc            ralt rmet rctl left down up right
 )
 
+#| Template
+(deflayer name
+	_
+  _    1    2    3    4    5    6    7    8    9    0    _    _    _
+  _    _    _    _    _    _    _    _    _    _    _    _    _    _
+  _    _    _    _    _    _    _    _    _    _    _    _    _
+  _    _    _    _    _    _    _    _    _    _    _    _
+  _    _    _              _         _    _    _    _    _    _    _
+)
+|#
+
+
 (defalias
-   nv  (tap-next f (layer-toggle navigation))
+  navf  (tap-hold 180 f (layer-toggle navigation))
+  esc   (tap-hold 180 esc lctl)
 )
 
 (deflayer default
 	esc
-  grv  1    2    3    4    5    6    7    8    9    0    -    =    bspc
-  tab  q    w    e    r    t    y    u    i    o    p    [    ]    \
-  esc  a    s    d   @nv   g    h    j    k    l    ;    '    ret
-  lsft z    x    c    v    b    n    m    ,    .    /    rsft
-  lctl lmet lalt           spc            ralt rmet rctl left down up right
+  grv   1    2    3    4    5    6    7    8    9    0    -    =    bspc
+  tab   q    w    e    r    t    y    u    i    o    p    [    ]    \
+  @esc  a    s    d  @navf  g    h    j    k    l    ;    '    ret
+  lsft  z    x    c    v    b    n    m    ,    .    /    rsft
+  lctl  lmet lalt           spc            ralt rmet rctl left down up right
 )
 
 (deflayer navigation
 	_
-  grv  1    2    3    4    5    6      7      8    9    0    -    =    bspc
-  _    _    _    _    _    _    _      _      _    _    _    _    _    _
-  _    _    _    _    _    _    left   down   up   right    _    _    _
-  _    _    _    _    _    _    _      _      _    _    _    _
-  _    _    _              _           _    _    _    _    _    _    _
+  _   1    2    3    4    5    6      7      8    9      0    _    _    _
+  _   _    _    _    _    _    _      _      _    _      _    _    _    _
+  _   _    _    _    _    _    left   down   up   right  _    _    _
+  _   _    _    _    _    _    _      _      _    _      _    _
+  _   _    _              _           _      _    _      _    _    _    _
 )
diff --git a/packages.nix b/packages.nix
index 6f827d0..e12063d 100644
--- a/packages.nix
+++ b/packages.nix
@@ -36,17 +36,18 @@ let
     # godot
     # blender
 
+    bspwm
+    sxhkd
+
     rnix-lsp
     efm-langserver
-  ] ++ (
-    with pkgs.nodePackages; [
-      typescript
-      typescript-language-server
-      vscode-json-languageserver
-      vscode-langservers-extracted
-      # bash-language-server
-    ]
-  );
+
+    nodePackages.typescript
+    nodePackages.typescript-language-server
+    nodePackages.vscode-json-languageserver
+    nodePackages.vscode-langservers-extracted
+    # nodePackage.bash-language-server
+  ];
 
   apps = with pkgs; [
     # Browser
diff --git a/packages/shotkey/pkg.nix b/packages/shotkey/pkg.nix
index 7e12a62..a9ec241 100644
--- a/packages/shotkey/pkg.nix
+++ b/packages/shotkey/pkg.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, libX11 }:
+{ stdenv, pkgs, libX11, ... }:
 with pkgs.lib;
 
 stdenv.mkDerivation rec {
diff --git a/packages/xmonad/source b/packages/xmonad/source
-Subproject 67fd3a2534ebabb9cd6035603267b5ce7a87fec
+Subproject 3e9905eb25f2bb98cbd71b6bbb6682466bbf2e7