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

Remove neovim as submodule

Browse source
This commit is contained in:
Evie Litherland-Smith 2023-06-16 14:33:04 +01:00
parent 6cbc00f9ec
commit 384d2bfc58
3 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitmodules vendored
View file

@ -1,4 +0,0 @@
[submodule "nvim"]
path = nvim
url = https://git.xenia.me.uk/xenia/nvim.git
branch = main

10
Makefile
View file

@ -2,18 +2,16 @@ $(eval HOSTNAME=$(shell hostname))
HOMEMANAGER_CONFIG := $(PWD)/home/$(HOSTNAME)/$(USER).nix HOMEMANAGER_CONFIG := $(PWD)/home/$(HOSTNAME)/$(USER).nix
CONFIG_DIR := $(if $(XDG_CONFIG_HOME), $(XDG_CONFIG_HOME), $(HOME)/.config) CONFIG_DIR := $(if $(XDG_CONFIG_HOME), $(XDG_CONFIG_HOME), $(HOME)/.config)
HOMEMANAGER_CONFIG_DIR := $(CONFIG_DIR)/home-manager HOMEMANAGER_CONFIG_DIR := $(CONFIG_DIR)/home-manager
SUBMODULES := $(CONFIG_DIR)/nvim
.PHONY: default clean nixos home /etc/nixos/config .PHONY: default clean nixos home /etc/nixos/config
default: $(SUBMODULES) default:
command -v nix > /dev/null || exit 1 command -v nix > /dev/null || exit 1
[ -e /etc/nixos/ ] && make nixos || make home [ -e /etc/nixos/ ] && make nixos || make home
bat cache --build bat cache --build
clean: clean:
-[ -e /etc/nixos ] && sudo rm /etc/nixos/config || rm -rf $(HOMEMANAGER_CONFIG_DIR) [ -e /etc/nixos ] && sudo rm /etc/nixos/config || rm -rf $(HOMEMANAGER_CONFIG_DIR)
-rm $(SUBMODULES)
nixos: /etc/nixos/config nixos: /etc/nixos/config
sudo nixos-rebuild switch sudo nixos-rebuild switch
@ -32,7 +30,3 @@ $(HOMEMANAGER_CONFIG_DIR)/home.nix: $(HOMEMANAGER_CONFIG) $(HOMEMANAGER_CONFIG_D
$(CONFIG_DIR) $(HOMEMANAGER_CONFIG_DIR): $(CONFIG_DIR) $(HOMEMANAGER_CONFIG_DIR):
mkdir -p $@ mkdir -p $@
$(SUBMODULES): $(CONFIG_DIR)/%: %
$(SUBMODULES):
-ln -s $$(readlink -f $?) $(CONFIG_DIR)/

1
nvim

@ -1 +0,0 @@
Subproject commit 8dd36f4d456162dcbec743232ae729a63eb231bc