laksjdalskdalskdj

users/pbsds/home/default.nix

@@ -83,27 +83,31 @@
 
     librespeed-cli
 
+    /* flox */
+    /* devenv */
     /* cachix */
     /* nix-template */
     nix-output-monitor
     nix-du
     nix-tree
     nix-visualize
-    (pkgs.nix-inspect or unstable.nix-inspect)
-    (pkgs.nix-btm or unstable.nix-btm)
-    unstable.nixpkgs-review
+    nix-inspect
+    nix-btm
+    unstable.nixpkgs-review bubblewrap
     unstable.nixpkgs-hammering
     unstable.nix-update
     unstable.nix-init
     unstable.deadnix
     unstable.statix
-    /* unstable.nixtract # extract derivation graph */
+    /* unstable.nixtract */
     unstable.nixfmt-rfc-style
     nurl
     manix
     #comma # collides with nix-index-database
     nix-search-cli # nix-search
     devenv
+    nix-fast-build
+    nix-eval-jobs
 
     #cargo
     #cargo-update

users/pbsds/home/profiles/git.nix

@@ -75,6 +75,7 @@
     gl     = "git log --oneline --color | head -n 30";
     glg    = "git log --all --decorate --oneline --graph";
     gpra   = "git pull --rebase --autostash";
+    gprau  = ''git pull --rebase --autostash upstream "$(git branch 2>/dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/')"'';
     gd     = "git diff";
     gdwd   = "git diff --word-diff";
     gdwdr  = "git diff --word-diff --word-diff-regex=.";