greg/nixos
1
0
Fork 2
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Clean up xonshrc file

Browse Source
This commit is contained in:
Greg Hellings
2023-05-10 17:21:01 -05:00
parent efa9f107ad
commit 157772fdca
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
home/xonsh_footer.xsh
+4 -7
View File
@@ -1,10 +1,7 @@
# vim: set ft=python : # vim: set ft=python :
#$PKG_CONFIG_PATH = '/usr/local/lib/pkgconfig'
#$JAVA_HOME = '/etc/alternatives/java_sdk'
def _rebuild(args): def _rebuild(args):
import os system = uname()
system = os.uname()
if system.sysname == 'Darwin': if system.sysname == 'Darwin':
darwin-rebuild --flake ~/.config/darwin switch darwin-rebuild --flake ~/.config/darwin switch
else: else:
@@ -22,7 +19,7 @@ def _py3env(args):
vox new @(args[0]) vox new @(args[0])
def _rundock(args): def _rundock(args):
if os.path.exists('/usr/bin/podman'): if Path('/usr/bin/podman').exists():
e = 'podman' e = 'podman'
else: else:
e = 'docker' e = 'docker'
@@ -34,11 +31,11 @@ def _pip_extras(args):
# Container stuff # Container stuff
def _newdock(args): def _newdock(args):
if os.path.exists('/usr/bin/podman'): if Path('/usr/bin/podman').exists():
e = 'podman' e = 'podman'
else: else:
e = 'docker' e = 'docker'
@(e) run -P --privileged=true -e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix -v @(os.getcwd()):/dmnt -v /etc/pki:/etc/pki:ro -d --name @(args[1]) @(args[0]) /sbin/init @(e) run -P --privileged=true -e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix -v @(getcwd()):/dmnt -v /etc/pki:/etc/pki:ro -d --name @(args[1]) @(args[0]) /sbin/init
rundock @(args[1]) rundock @(args[1])
def _unknown_host(args): def _unknown_host(args):
home/xonsh_header.xsh
+9 -6
View File
@@ -1,17 +1,20 @@
# vim: set ft=python: # vim: set ft=python:
if '__NIX_DARWIN_SET_ENVIRONMENT_DONE' not in ${...} or not $__NIX_DARWIN_SET_ENVIRONMENT_DONE: from os import getcwd, uname
source-bash /etc/bashrc from pathlib import Path
#if uname().sysname == 'Darwin' and ('__NIX_DARWIN_SET_ENVIRONMENT_DONE' not in ${...} or not $__NIX_DARWIN_SET_ENVIRONMENT_DONE):
# source-bash /etc/bashrc
# set -e == $RAISE_SUBPROC_ERROR = True # set -e == $RAISE_SUBPROC_ERROR = True
# set -x == trace on; $XONSH_TRACE_SUBPROC = True # set -x == trace on; $XONSH_TRACE_SUBPROC = True
# $? == _.rtn # $? == _.rtn
import os
xontrib load direnv xontrib load direnv
# Insert to the front, because when we spawn xonsh in tmux we have raw python3 # Insert to the front, because when we spawn xonsh in tmux we have raw python3
# paths added before these. That ends up screwing with finding the python3 version # paths added before these. That ends up screwing with finding the python3 version
# with all of our dependencies that we want # with all of our dependencies that we want
$PATH.insert(0, "${config.home.homeDirectory}/.nix-profile/bin") $PATH.insert(0, Path("~/.nix-profile/bin").expanduser())
$PATH.insert(0, "${config.home.homeDirectory}/src/bin") $PATH.insert(0, Path("~/src/bin").expanduser())
$PATH.insert(0, Path("~/.local/bin").expanduser())