diff --git a/hm-modules/xonsh/default.nix b/hm-modules/xonsh/default.nix index c4035fa8..382651ff 100644 --- a/hm-modules/xonsh/default.nix +++ b/hm-modules/xonsh/default.nix @@ -61,6 +61,20 @@ in xontrib load direnv xontrib load fish_completer + # >>> mamba initialize >>> + # !! Contents within this block are managed by 'mamba init' !! + $MAMBA_EXE = "/etc/profiles/per-user/xyno/bin/micromamba" + $MAMBA_ROOT_PREFIX = "/Users/xyno/micromamba" + import sys as _sys + from types import ModuleType as _ModuleType + _mod = _ModuleType("xontrib.mamba", + 'Autogenerated from $($MAMBA_EXE shell hook -s xonsh -p $MAMBA_ROOT_PREFIX)') + __xonsh__.execer.exec($($MAMBA_EXE shell hook -s xonsh -p $MAMBA_ROOT_PREFIX), + glbs=_mod.__dict__, + filename='$($MAMBA_EXE shell hook -s xonsh -p $MAMBA_ROOT_PREFIX)') + _sys.modules["xontrib.mamba"] = _mod + del _sys, _mod, _ModuleType + # <<< mamba initialize <<< ''; programs.vscode.userSettings."terminal.integrated.profiles.osx" = { xonsh = { diff --git a/hosts/daedalus/default.nix b/hosts/daedalus/default.nix index cae795c8..c9c33ce8 100644 --- a/hosts/daedalus/default.nix +++ b/hosts/daedalus/default.nix @@ -21,8 +21,14 @@ with lib.my; "docker-compose" "leoafarias/fvm/fvm" # flutter version manager "cocoapods" # flutter/other ios shit + + "borgbackup" # time machine can eat my ass ]; casks = [ + "plexamp" + "vorta" # (borgbackup GUI) time machine can eat my ass + "grandperspective" + "xquartz" "hammerspoon" "kicad" "android-platform-tools" @@ -36,7 +42,6 @@ with lib.my; "openlens" "ferdium" "discord" - "finicky" "vlc" "rectangle" "floorp" @@ -167,6 +172,8 @@ with lib.my; mosh pandoc + tectonic + micromamba bitwarden-cli diff --git a/nixos-modules/user/default.nix b/nixos-modules/user/default.nix index e53d31ea..40b9e746 100644 --- a/nixos-modules/user/default.nix +++ b/nixos-modules/user/default.nix @@ -56,7 +56,7 @@ in users.extraUsers.${username} = { isNormalUser = true; uid = uid; - extraGroups = [ "wheel" ] ++ extraGroups; + extraGroups = [ "wheel" "cdrom" ] ++ extraGroups; shell = pkgs.zsh; openssh.authorizedKeys.keys = pubkeys.ragon.user ++ extraAuthorizedKeys; hashedPasswordFile = config.age.secrets.ragonPasswd.path;