vim config, anki, organicmaps

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1693399033,
+        "lastModified": 1694134858,
-        "narHash": "sha256-yXhiMo8MnE86sGtPIHAKaLHhmhe8v9tqGGotlUgKJvY=",
+        "narHash": "sha256-fG/ESauOGmiojKlpJG8gB62dJa5Wd+ZIuiDMKK/HD3g=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f5c15668f9842dd4d5430787d6aa8a28a07f7c10",
+        "rev": "19c6a4081b14443420358262f8416149bd79561a",
         "type": "github"
       },
       "original": {
@@ -30,11 +30,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1693606917,
+        "lastModified": 1694193424,
-        "narHash": "sha256-A6AmYGtmPQ9eqG1QGcPYbUHzWevtWUdxdptty4ol2qA=",
+        "narHash": "sha256-aTSjv6ydg56AHB2CrOr89LYdnPYK+yKx7GG/55AMoyM=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "f69c5469d79f31f77f4662731ac6255e285febed",
+        "rev": "664827473583f8e986f9fb2a37a13e9b3a232cc2",
         "type": "github"
       },
       "original": {
@@ -70,11 +70,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1693158576,
+        "lastModified": 1693844670,
-        "narHash": "sha256-aRTTXkYvhXosGx535iAFUaoFboUrZSYb1Ooih/auGp0=",
+        "narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a999c1cc0c9eb2095729d5aa03e0d8f7ed256780",
+        "rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1",
         "type": "github"
       },
       "original": {
@@ -86,11 +86,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1693471703,
+        "lastModified": 1693985761,
-        "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=",
+        "narHash": "sha256-K5b+7j7Tt3+AqbWkcw+wMeqOAWyCD1MH26FPZyWXpdo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85",
+        "rev": "0bffda19b8af722f8069d09d8b6a24594c80b352",
         "type": "github"
       },
       "original": {
@@ -156,11 +156,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1691841170,
+        "lastModified": 1694025408,
-        "narHash": "sha256-RCTm1/MVWYPnReMgyp7tr2ogGYo/pvw38jZaFwemgPU=",
+        "narHash": "sha256-oJNhGfZH8Z2w3ztXdzsYVg32//cWEcPVDM3+tp/ZVfU=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "57a3a41ba6b358109e4fc25c6a4706b5f7d93c6b",
+        "rev": "022469529c8bc95acf222dc5a62389b04c8b1205",
         "type": "github"
       },
       "original": {

global/home.nix

@@ -45,8 +45,6 @@ in
     neofetch
     obs-studio
     selectdefaultapplication
-    input-leap
-    pwvucontrol
     easyeffects
 
     inkscape

lib/modules/editor.nix

@@ -59,6 +59,26 @@ in
             };
           };
         };
+        extraConfig = ''
+          vnoremap * y/\V<C-R>=escape(@",'/\')<CR><CR>
+          vnoremap <C-R> "ry:%s/<C-R>=escape(@r,'/\')<CR>
+          vnoremap A :norm A
+          set number
+          set rnu
+          set ignorecase
+          set smartcase
+          set mouse=a
+          set path=.,**
+          let g:netrw_banner=0
+          let g:netrw_liststyle=3
+          set undofile
+          set undodir=~/.local/share/nvim/undo
+        '';
+        plugins = with pkgs.vimPlugins; [
+          vim-surround
+          vim-commentary
+          firenvim
+        ];
       };
 
     }];

lib/modules/keyboard.nix

@@ -13,7 +13,6 @@ with lib;
         wayland.windowManager.hyprland.extraConfig = ''
           # === KEYBOARD MODULE ===
           input {
-            kb_variant = dvorak
             kb_layout = gb
             kb_options = caps:escape
             numlock_by_default = true

lib/modules/personal.nix

@@ -29,21 +29,10 @@ with lib;
         xmrig
         transmission-remote-gtk
         krita
+        organicmaps
+        anki
       ];
       
-      accounts.calendar = {
-        basePath = "Calendars";
-        accounts."tristan@files.tristans.cloud" = {
-          primary = true;
-          remote = {
-            type = "caldav";
-            url = "https://files.tristans.cloud/remote.php/dav/";
-            userName = "tristan";
-            passwordCommand = [ "${pkgs.rbw}/bin/rbw" "get" "files.tristans.cloud" "tristan" ];
-          };
-        };
-      };
-
     }];
   };
 }

lib/modules/wayland.nix

@@ -56,6 +56,7 @@ in
           bind = SUPER, n,       focuswindow, Logseq
 
           windowrule = float, title:wlogout
+          windowrule = idleinhibit always, vrmonitor
 
           bind = SUPER, h, movefocus,l
           bind = SUPER, l, movefocus,r