diff options
| -rwxr-xr-x | bin/gc | 21 | ||||
| -rwxr-xr-x | bin/reconfigure | 7 | ||||
| -rwxr-xr-x | bin/update | 9 | ||||
| -rw-r--r-- | etc/guix/home.scm | 1 | ||||
| -rw-r--r-- | etc/guix/system.scm | 3 | ||||
| -rw-r--r-- | etc/sh/rc | 17 | ||||
| -rwxr-xr-x | opt/aux/gen-e-list.sh | 1 |
7 files changed, 1 insertions, 58 deletions
@@ -18,7 +18,6 @@ help() { TYPE what to do GC on (default: all): - guix - - nix - trash - tmpdir - docker @@ -93,25 +92,6 @@ gc_guix() { fi } -gc_nix() { - if [ ! -e /nix/ ]; then - return - fi - - PROFILES=' - /nix/var/nix/profiles/per-user/root/channels - /nix/var/nix/profiles/system - ' - - for p in $PROFILES; do - pass show "$(hostname)"/andreh | head -n1 | - sudo -iS nix-env --delete-generations old -p "$p" - done - nix-env --delete-generations old - nix-store --gc - nix-collect-garbage -d -} - gc_trash() { yes | trash-empty } @@ -137,7 +117,6 @@ gc_docker() { TYPES=' guix -nix trash tmpdir docker diff --git a/bin/reconfigure b/bin/reconfigure index 8e81855..58ed772 100755 --- a/bin/reconfigure +++ b/bin/reconfigure @@ -21,7 +21,6 @@ help() { Switches the system: - reconfigure the Guix "home" environment; - Guix "system" if it exists; - - NixOS if it exists. Examples: @@ -94,12 +93,6 @@ if [ -e /run/current-system/configuration.scm ]; then sudo -ES guix system -v3 reconfigure "$XDG_CONFIG_HOME"/guix/system.scm fi -if [ -e /etc/nixos/configuration.nix ]; then - pass show "$HOSTNAME"/andreh | - head -n1 | - sudo -S nixos-rebuild switch -fi - guix home -v3 reconfigure "$XDG_CONFIG_HOME"/guix/home.scm bins > /dev/null @@ -64,15 +64,6 @@ done shift $((OPTIND - 1)) -HOSTNAME="$(hostname)" -if [ -e /etc/nixos/configuration.nix ]; then - pass show "$HOSTNAME"/andreh | - head -n1 | - sudo -S nix-channel --update -else - nix-channel --update -fi - guix pull -v3 rfc -u 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") @@ -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)'$ ' diff --git a/opt/aux/gen-e-list.sh b/opt/aux/gen-e-list.sh index e47db69..e891d17 100755 --- a/opt/aux/gen-e-list.sh +++ b/opt/aux/gen-e-list.sh @@ -8,7 +8,6 @@ set -eu $XDG_CONFIG_HOME/sh/rc $XDG_CONFIG_HOME/guix/home.scm $XDG_CONFIG_HOME/guix/system.scm - $XDG_CONFIG_HOME/nix/configuration.nix EOF find \ |