aboutsummaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorEuAndreh <eu@euandre.org>2024-01-12 08:45:53 -0300
committerEuAndreh <eu@euandre.org>2024-01-12 08:45:53 -0300
commit3b2d27457db9ef8911893fa1b843560f1ccab2eb (patch)
treef2912096f65014593c44b88bd129743e4337f58b /etc
parentetc/sh/rc: Use "\" as a shortcut in vi(1) for saving a file (diff)
downloaddotfiles-3b2d27457db9ef8911893fa1b843560f1ccab2eb.tar.gz
dotfiles-3b2d27457db9ef8911893fa1b843560f1ccab2eb.tar.xz
Remove Nix/NixOS support from configuration and utilities
Diffstat (limited to 'etc')
-rw-r--r--etc/guix/home.scm1
-rw-r--r--etc/guix/system.scm3
-rw-r--r--etc/sh/rc17
3 files changed, 1 insertions, 20 deletions
diff --git a/etc/guix/home.scm b/etc/guix/home.scm
index c5a21bc..7182ded 100644
--- a/etc/guix/home.scm
+++ b/etc/guix/home.scm
@@ -739,7 +739,6 @@ libraries/software/operating systems
cpio
pv
httpd ;; for htpasswd
- nixfmt
acl
attr
diff --git a/etc/guix/system.scm b/etc/guix/system.scm
index 1745130..71d200f 100644
--- a/etc/guix/system.scm
+++ b/etc/guix/system.scm
@@ -21,7 +21,6 @@
desktop
docker
mail
- nix
pm
security-token
sound
@@ -138,7 +137,6 @@ Seiko Epson Color Ink Jet Printers.")
(append
(map (compose list specification->package+output symbol->string)
'(nss-certs
- nix
cups
ghc
ghc-xmonad-contrib
@@ -157,7 +155,6 @@ Seiko Epson Color Ink Jet Printers.")
(service docker-service-type)
(service libvirt-service-type)
(service virtlog-service-type)
- (service nix-service-type)
(simple-service 'add-wireguard-aliases hosts-service-type
(list
(host "10.0.0.0" "toph")
diff --git a/etc/sh/rc b/etc/sh/rc
index c4a488d..ee27678 100644
--- a/etc/sh/rc
+++ b/etc/sh/rc
@@ -167,7 +167,6 @@ add_prefix() {
export PREFIX="$XDG_PREFIX/var/mkg"
add_prefix "$PREFIX"
add_prefix "$XDG_PREFIX"
-add_prefix "$HOME/.nix-profile"
for d in "$XDG_PREFIX"/opt/bin-dirs/*; do
path_add PATH "$PATH" "$d"
@@ -289,20 +288,6 @@ guix_env() {
printf ')'
}
-in_nix_shell() {
- if [ -z "${IN_NIX_SHELL:-}" ]; then
- return
- fi
-
- printf '\n'
- color -c blacki '~> '
- color -c purpleb "$IN_NIX_SHELL "
- color -c purple 'nix-shell '
- printf '('
- color -c blueb "${name:-}"
- printf ')'
-}
-
in_ssh_session() {
if [ -n "${SSH_CLIENT:-}" ]; then
color -c blackb '\\u'
@@ -329,7 +314,7 @@ vcs_status() {
fi
}
-PS1='`error_marker`'$(timestamp)' '$(path)'`direnv_status``makeflags_status` `shell_status``vcs_status``guix_env``in_nix_shell`
+PS1='`error_marker`'$(timestamp)' '$(path)'`direnv_status``makeflags_status` `shell_status``vcs_status``guix_env`
'$(in_ssh_session)'$ '