diff --git a/todos-pulsar.md b/todos-pulsar.md index cb9479f..0ed3e40 100644 --- a/todos-pulsar.md +++ b/todos-pulsar.md @@ -2,3 +2,5 @@ ppm install atom-jinja2 autocomplete-cmake autocomplete-cmake copy-highlighted editorconfig fonts graphviz-preview-plus ide-bash ide-clangd ide-rust jinja2 language-arduino language-armasm language-autoit language-batch language-bison-flex language-cmake language-cython language-dg language-diff language-docker language-dot language-glsl language-haskell language-ini language-latex language-lua language-markdown language-scala language-systemverilog language-velocity language-verilog language-vhdl language-zonefile lines MagicPython markdown-preview-plus markdown-table-editor nix on-save pigments pulsar-ide-python railscast-theme-markup remote-atom selection-highlight shell-it simple-align zotero-citations # resolved ppm install atom-ide-base atom-ide-code-format atom-ide-datatip atom-ide-definitions atom-ide-hyperclick atom-ide-markdown-service atom-ide-outline atom-ide-signature-help atom-jinja2 autocomplete-cmake busy-signal copy-highlighted editorconfig fonts graphviz-preview-plus ide-bash ide-clangd ide-rust intentions language-arduino language-armasm language-autoit language-batch language-bison-flex language-cmake language-cython language-dg language-diff language-docker language-dot language-glsl language-haskell language-ini language-latex language-lua language-markdown language-scala language-systemverilog language-velocity language-verilog language-vhdl language-zonefile lines linter linter-ui-default MagicPython markdown-preview-plus markdown-table-editor nix on-save pigments pulsar-ide-python railscast-theme-markup remote-atom selection-highlight shell-it simple-align zotero-citations +# new +git-blame diff --git a/users/pbsds/home/default.nix b/users/pbsds/home/default.nix index bf27fea..8bcc9bc 100644 --- a/users/pbsds/home/default.nix +++ b/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 diff --git a/users/pbsds/home/profiles/git.nix b/users/pbsds/home/profiles/git.nix index efd9de3..3304387 100644 --- a/users/pbsds/home/profiles/git.nix +++ b/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=.";