pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:elitherl/dotfiles

Browse source
This commit is contained in:
Evie Litherland-Smith 2023-02-13 10:35:43 +00:00
parent c0caa0e82c 46c4460d92
commit 0664b2424e
5 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -21,7 +21,7 @@ POWERLEVEL_DIR := $(ZSH_CUSTOM_DIR)/themes/powerlevel10k
TPM_REPO := https://github.com/tmux-plugins/tpm TPM_REPO := https://github.com/tmux-plugins/tpm
TPM_DIR := $(HOME)/.tmux/plugins/tpm TPM_DIR := $(HOME)/.tmux/plugins/tpm
.PHONY: all clean link unlink install uninstall packages .PHONY: all clean link unlink install uninstall pacman
all: link install all: link install
@ -35,7 +35,7 @@ unlink:
for link in $(SSH_TARGETS); do rm "$$link"; done for link in $(SSH_TARGETS); do rm "$$link"; done
rmdir $(HOME)/.ssh/sockets rmdir $(HOME)/.ssh/sockets
install: packages $(ZSH_DIR) $(POWERLEVEL_DIR) $(ZSH_TARGETS) $(PACKER_DIR) $(TPM_DIR) install: $(ZSH_DIR) $(POWERLEVEL_DIR) $(ZSH_TARGETS) $(PACKER_DIR) $(TPM_DIR)
python3 -m pip list | grep -E "libtmux.*0\.16\.1" > /dev/null ||\ python3 -m pip list | grep -E "libtmux.*0\.16\.1" > /dev/null ||\
python3 -m pip install --user libtmux==0.16.1 python3 -m pip install --user libtmux==0.16.1
@ -43,7 +43,7 @@ uninstall:
rm -rf $(ZSH_DIR) rm -rf $(ZSH_DIR)
rm -rf $(PACKER_DIR) rm -rf $(PACKER_DIR)
packages: pacman:
sort -h pkglist.txt -o pkglist.txt sort -h pkglist.txt -o pkglist.txt
pacman -T - < pkglist.txt ||\ pacman -T - < pkglist.txt ||\
sudo pacman --needed -S - < pkglist.txt sudo pacman --needed -S - < pkglist.txt

1
config/nvim/lua/config/feline.lua
View file

@ -442,6 +442,7 @@ require("feline").setup({
force_inactive = { force_inactive = {
filetypes = { filetypes = {
"NvimTree", "NvimTree",
"Trouble",
"packer", "packer",
"dap-repl", "dap-repl",
"dapui_scopes", "dapui_scopes",

2
config/nvim/lua/config/tabby.lua
View file

@ -156,7 +156,7 @@ vim.api.nvim_create_autocmd({ "SessionLoadPost", "ColorScheme" }, {
---------------------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------------------
-- Feline -- Feline
local filename = require("tabby.filename") local filename = require("tabby.module.filename")
local cwd = function() local cwd = function()
return "" .. vim.fn.fnamemodify(vim.fn.getcwd(), ":t") .. " " return "" .. vim.fn.fnamemodify(vim.fn.getcwd(), ":t") .. " "

1
config/wezterm/wezterm.lua
View file

@ -1,4 +1,5 @@
return { return {
font_size = 14,
disable_default_key_bindings = true, disable_default_key_bindings = true,
window_background_opacity = 0.95, window_background_opacity = 0.95,
color_scheme = "nightfox", color_scheme = "nightfox",

8
home/zprofile
View file

@ -1,6 +1,8 @@
export PYENV_ROOT="$HOME/.pyenv" command -v pyenv && {
export PATH="$PYENV_ROOT/bin:$PATH" export PYENV_ROOT="$HOME/.pyenv"
eval "$(pyenv init --path)" echo $PATH | grep -i pyenv > /dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
eval "$(pyenv init --path)"
}
if [[ -e $HOME/.ssh/id_ed25519 ]] if [[ -e $HOME/.ssh/id_ed25519 ]]
then then