From 9235c9a0a7aeb5be7d0af0d2f39c14c63d656383 Mon Sep 17 00:00:00 2001 From: Leon Date: Tue, 14 Mar 2023 11:24:59 +0100 Subject: [PATCH] Re-set up laptop --- foot/.config/foot/foot.ini | 3 ++- nvim/.config/nvim/lazy-lock.json | 7 +++++++ zsh/.zshenv | 1 - 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/foot/.config/foot/foot.ini b/foot/.config/foot/foot.ini index 54b90a2..3d5c158 100644 --- a/foot/.config/foot/foot.ini +++ b/foot/.config/foot/foot.ini @@ -70,7 +70,8 @@ hide-when-typing=yes # alternate-scroll-mode=yes [colors] -background=1d2021 +;background=1d2021 +background=282828 foreground=ebdbb2 regular0=282828 regular1=cc241d diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 8deea76..1acff48 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -52,6 +52,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "lazy.nvim": { "branch": "main", "commit": "623e00cabbc908f635150e73d4250cf4f241d919" }, ======= @@ -81,6 +82,12 @@ ======= "lazy.nvim": { "branch": "main", "commit": "06f835d0b4b62d9d26fe0ec4190b981f2f5632d2" }, >>>>>>> 5e64830 (update) +======= + "lazy.nvim": { "branch": "main", "commit": "06f835d0b4b62d9d26fe0ec4190b981f2f5632d2" }, +======= + "lazy.nvim": { "branch": "main", "commit": "623e00cabbc908f635150e73d4250cf4f241d919" }, +>>>>>>> d78e6c9 (Re-set up laptop) +>>>>>>> dfaeefd (Re-set up laptop) "litee.nvim": { "branch": "main", "commit": "bf366a1414fd0f9401631ac8884f2f9fa4bf18d2" }, "lsp_lines.nvim": { "branch": "main", "commit": "dcff567b3a2d730f31b6da229ca3bb40640ec5a6" }, "lsp_signature.nvim": { "branch": "master", "commit": "6f6252f63b0baf0f2224c4caea33819a27f3f550" }, diff --git a/zsh/.zshenv b/zsh/.zshenv index 7ae939b..ea4fbed 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -1,5 +1,4 @@ ZDOTDIR=$HOME/.config/zsh [ -f "$HOME/.cargo/env" ] && . "$HOME/.cargo/env" - if [ -e /home/leon/.nix-profile/etc/profile.d/nix.sh ]; then . /home/leon/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer