From a35aca1564d0dbc46232237004027c92d8f1a06e Mon Sep 17 00:00:00 2001 From: tristan Date: Sun, 24 Sep 2023 14:37:45 +0100 Subject: [PATCH] vim config, anki, organicmaps --- flake.lock | 30 +++++++++++++++--------------- global/home.nix | 2 -- lib/modules/editor.nix | 20 ++++++++++++++++++++ lib/modules/keyboard.nix | 1 - lib/modules/personal.nix | 15 ++------------- lib/modules/wayland.nix | 1 + 6 files changed, 38 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index c238b73..bad6266 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1693399033, - "narHash": "sha256-yXhiMo8MnE86sGtPIHAKaLHhmhe8v9tqGGotlUgKJvY=", + "lastModified": 1694134858, + "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, - "narHash": "sha256-A6AmYGtmPQ9eqG1QGcPYbUHzWevtWUdxdptty4ol2qA=", + "lastModified": 1694193424, + "narHash": "sha256-aTSjv6ydg56AHB2CrOr89LYdnPYK+yKx7GG/55AMoyM=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "f69c5469d79f31f77f4662731ac6255e285febed", + "rev": "664827473583f8e986f9fb2a37a13e9b3a232cc2", "type": "github" }, "original": { @@ -70,11 +70,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1693158576, - "narHash": "sha256-aRTTXkYvhXosGx535iAFUaoFboUrZSYb1Ooih/auGp0=", + "lastModified": 1693844670, + "narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a999c1cc0c9eb2095729d5aa03e0d8f7ed256780", + "rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1", "type": "github" }, "original": { @@ -86,11 +86,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1693471703, - "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=", + "lastModified": 1693985761, + "narHash": "sha256-K5b+7j7Tt3+AqbWkcw+wMeqOAWyCD1MH26FPZyWXpdo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85", + "rev": "0bffda19b8af722f8069d09d8b6a24594c80b352", "type": "github" }, "original": { @@ -156,11 +156,11 @@ ] }, "locked": { - "lastModified": 1691841170, - "narHash": "sha256-RCTm1/MVWYPnReMgyp7tr2ogGYo/pvw38jZaFwemgPU=", + "lastModified": 1694025408, + "narHash": "sha256-oJNhGfZH8Z2w3ztXdzsYVg32//cWEcPVDM3+tp/ZVfU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "57a3a41ba6b358109e4fc25c6a4706b5f7d93c6b", + "rev": "022469529c8bc95acf222dc5a62389b04c8b1205", "type": "github" }, "original": { diff --git a/global/home.nix b/global/home.nix index c413f99..058f54b 100644 --- a/global/home.nix +++ b/global/home.nix @@ -45,8 +45,6 @@ in neofetch obs-studio selectdefaultapplication - input-leap - pwvucontrol easyeffects inkscape diff --git a/lib/modules/editor.nix b/lib/modules/editor.nix index e423d8e..43c082e 100644 --- a/lib/modules/editor.nix +++ b/lib/modules/editor.nix @@ -59,6 +59,26 @@ in }; }; }; + extraConfig = '' + vnoremap * y/\V=escape(@",'/\') + vnoremap "ry:%s/=escape(@r,'/\') + 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 + ]; }; }]; diff --git a/lib/modules/keyboard.nix b/lib/modules/keyboard.nix index 6f3a7a9..1802a46 100644 --- a/lib/modules/keyboard.nix +++ b/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 diff --git a/lib/modules/personal.nix b/lib/modules/personal.nix index 25c3de4..82ce573 100644 --- a/lib/modules/personal.nix +++ b/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" ]; - }; - }; - }; - }]; }; } diff --git a/lib/modules/wayland.nix b/lib/modules/wayland.nix index 271453b..2cb36ff 100644 --- a/lib/modules/wayland.nix +++ b/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