From e8e43c9c06bb2440d14428506bc0b52f1e058767 Mon Sep 17 00:00:00 2001 From: Matei Adriel Date: Wed, 10 Aug 2022 16:43:26 +0300 Subject: [PATCH] oops, accidentally deleted shit --- dotfiles/kmonad/keymap.kbd | 4 ++-- dotfiles/vieb/.viebrc | 4 ---- .../vscode-snippets/snippets/purescript/imports.json | 10 ++++++++++ modules/overlays/myPackages.nix | 2 +- modules/themes/catppuccin/default.nix | 2 +- modules/themes/themes.nix | 2 +- 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dotfiles/kmonad/keymap.kbd b/dotfiles/kmonad/keymap.kbd index 8188bda..77a1d18 100644 --- a/dotfiles/kmonad/keymap.kbd +++ b/dotfiles/kmonad/keymap.kbd @@ -1,8 +1,8 @@ (defcfg ;; For Linux ;; input (device-file "$DEVICE") ;; gets dynamically replaced by nix - ;; input (device-file "/dev/input/by-path/pci-0000:00:14.0-usb-0:1:1.0-event-kbd") - input (device-file "/dev/input/by-path/platform-i8042-serio-0-event-kbd") + input (device-file "/dev/input/by-path/pci-0000:00:14.0-usb-0:5:1.0-event-kbd") + ;; input (device-file "/dev/input/by-path/platform-i8042-serio-0-event-kbd") output (uinput-sink "My KMonad output" ;; To understand the importance of the following line, see the section on ;; Compose-key sequences at the near-bottom of this file. diff --git a/dotfiles/vieb/.viebrc b/dotfiles/vieb/.viebrc index fb48be5..76bdbb5 100644 --- a/dotfiles/vieb/.viebrc +++ b/dotfiles/vieb/.viebrc @@ -9,15 +9,11 @@ set search=https://google.com/search?q= set searchwords=w~https://www.wikipedia.org/w/index.php?title=Special:Search&search=%s " Mappings -nmap d -nmap u nmap yy -nmap yf nmap v nmap O nmap T buffer nmap x -nmap X nmap yt nmap ? <:help> diff --git a/dotfiles/vscode-snippets/snippets/purescript/imports.json b/dotfiles/vscode-snippets/snippets/purescript/imports.json index 0e30856..896b018 100644 --- a/dotfiles/vscode-snippets/snippets/purescript/imports.json +++ b/dotfiles/vscode-snippets/snippets/purescript/imports.json @@ -48,5 +48,15 @@ "prefix": "impref", "description": "import Effect.Ref module", "body": "import Effect.Ref as Ref" + }, + "Int": { + "prefix": "impint", + "description": "import Data.Int module", + "body": "import Data.Int as Int" + }, + "Number": { + "prefix": "impnumber", + "description": "import Data.Number module", + "body": "import Data.Number as Number" } } diff --git a/modules/overlays/myPackages.nix b/modules/overlays/myPackages.nix index f31cf01..f5fc556 100644 --- a/modules/overlays/myPackages.nix +++ b/modules/overlays/myPackages.nix @@ -3,7 +3,7 @@ self: super: let allThemes = self.callPackage (import ../themes/themes.nix) { }; # currentTheme = "github-light"; - currentTheme = "catppuccin"; + currentTheme = "catppuccin-macchiato"; in with self; { myHelpers = self.callPackage (import ../helpers.nix) { }; diff --git a/modules/themes/catppuccin/default.nix b/modules/themes/catppuccin/default.nix index f3b7adb..c1934e0 100644 --- a/modules/themes/catppuccin/default.nix +++ b/modules/themes/catppuccin/default.nix @@ -5,7 +5,7 @@ let v = (a: b: if variant == "latte" then a else b); in { - name = "catppuccin"; + name = "catppuccin-${variant}"; wallpaper = wallpaper.foreign or "${foreign.wallpapers}/${wallpaper}"; env = { diff --git a/modules/themes/themes.nix b/modules/themes/themes.nix index db65ed4..fc152a6 100644 --- a/modules/themes/themes.nix +++ b/modules/themes/themes.nix @@ -13,7 +13,7 @@ lib.lists.map (theme: pkgs.callPackage theme { }) [ # wallpaper = "misc/rainbow.png"; # wallpaper.foreign = ./wallpapers/eye.png; transparency = 0.93; - variant = "frappe"; + variant = "macchiato"; }) (githubVariant { variant = "light";