mirror of
https://github.com/elkowar/dots-of-war.git
synced 2024-12-25 21:52:23 +00:00
Re-set up laptop
This commit is contained in:
parent
6507a36364
commit
9235c9a0a7
3 changed files with 9 additions and 2 deletions
|
@ -70,7 +70,8 @@ hide-when-typing=yes
|
||||||
# alternate-scroll-mode=yes
|
# alternate-scroll-mode=yes
|
||||||
|
|
||||||
[colors]
|
[colors]
|
||||||
background=1d2021
|
;background=1d2021
|
||||||
|
background=282828
|
||||||
foreground=ebdbb2
|
foreground=ebdbb2
|
||||||
regular0=282828
|
regular0=282828
|
||||||
regular1=cc241d
|
regular1=cc241d
|
||||||
|
|
|
@ -52,6 +52,7 @@
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
"lazy.nvim": { "branch": "main", "commit": "623e00cabbc908f635150e73d4250cf4f241d919" },
|
"lazy.nvim": { "branch": "main", "commit": "623e00cabbc908f635150e73d4250cf4f241d919" },
|
||||||
=======
|
=======
|
||||||
|
@ -81,6 +82,12 @@
|
||||||
=======
|
=======
|
||||||
"lazy.nvim": { "branch": "main", "commit": "06f835d0b4b62d9d26fe0ec4190b981f2f5632d2" },
|
"lazy.nvim": { "branch": "main", "commit": "06f835d0b4b62d9d26fe0ec4190b981f2f5632d2" },
|
||||||
>>>>>>> 5e64830 (update)
|
>>>>>>> 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" },
|
"litee.nvim": { "branch": "main", "commit": "bf366a1414fd0f9401631ac8884f2f9fa4bf18d2" },
|
||||||
"lsp_lines.nvim": { "branch": "main", "commit": "dcff567b3a2d730f31b6da229ca3bb40640ec5a6" },
|
"lsp_lines.nvim": { "branch": "main", "commit": "dcff567b3a2d730f31b6da229ca3bb40640ec5a6" },
|
||||||
"lsp_signature.nvim": { "branch": "master", "commit": "6f6252f63b0baf0f2224c4caea33819a27f3f550" },
|
"lsp_signature.nvim": { "branch": "master", "commit": "6f6252f63b0baf0f2224c4caea33819a27f3f550" },
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
ZDOTDIR=$HOME/.config/zsh
|
ZDOTDIR=$HOME/.config/zsh
|
||||||
|
|
||||||
[ -f "$HOME/.cargo/env" ] && . "$HOME/.cargo/env"
|
[ -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
|
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
|
||||||
|
|
Loading…
Reference in a new issue