diff --git a/users/pbsds/home/default.nix b/users/pbsds/home/default.nix index 8097e9e..7cb523c 100644 --- a/users/pbsds/home/default.nix +++ b/users/pbsds/home/default.nix @@ -10,6 +10,7 @@ ./profiles/bat.nix #./profiles/xdg-ninja.nix ./profiles/git.nix + ./profiles/nix.nix ./profiles/pueue.nix ./profiles/gtk.nix ./profiles/micro.nix @@ -28,18 +29,6 @@ complete -F _command remote complete -F _command remote-quick fi - - # TODO: remove - function atom_nix { - #nix-shell -p atom --run "atom $(printf "%q " "$@") --in-process-gpu --no-sandbox" - #nix-shell -p atom --run "atom $(printf "%q " "$@") --no-sandbox" - nix run nixpkgs#atom -- --disable-gpu --in-process-gpu --no-sandbox "$@" - } - - nix-prefetch-sri() { - url="$1"; shift - nix hash to-sri --type sha256 "$@" "$(nix-prefetch-url "$url")" - } ''; home.packages = with pkgs; [ @@ -85,31 +74,6 @@ librespeed-cli - /* flox */ - /* devenv */ - /* cachix */ - /* nix-template */ - nix-output-monitor - nix-du - nix-tree - nix-visualize - nix-inspect - nix-btm - unstable.nixpkgs-review bubblewrap - unstable.nixpkgs-hammering - unstable.nix-update - unstable.nix-init - unstable.deadnix - unstable.statix - /* unstable.nixtract */ - unstable.nixfmt-rfc-style - nurl - manix - #comma # collides with nix-index-database - devenv - nix-fast-build - nix-eval-jobs - #cargo #cargo-update #cargo-edit @@ -158,15 +122,11 @@ # TODO: ps1? pwd-fqdn = ''echo "$(whoami)@$(hostname -f):$(printf "%q" "$(realpath .)/")"''; - manix-fzf = ''manix "" 2>/dev/null | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | fzf --preview="manix '{}'" | xargs manix''; - killall = "killall -v"; # bin = "python -c 'import sys; sys.stdout.write(sys.stdin.read().strip())' | curl -is -X POST https://i.kuklef.se/upload -F content=@- -F expiration=10d | grep '^location:' | cut -d' ' -f2-"; bin = "${lib.getExe pkgs.netcat} termbin.com 9999"; - denix = "sed -E 's@/nix/store/[^ /]+@@g'"; - denix-ellipsis = "sed -E 's@/nix/store/[^ /-]+-?@/nix/store/...@g'"; }; home.enableNixpkgsReleaseCheck = true; diff --git a/users/pbsds/home/profiles/nix.nix b/users/pbsds/home/profiles/nix.nix new file mode 100644 index 0000000..a09df49 --- /dev/null +++ b/users/pbsds/home/profiles/nix.nix @@ -0,0 +1,78 @@ +{ pkgs, ... }: +let + # why not just use functions normally? ctrl-alt-e is why! + _tmpfn_name = "_tmpfn_ex4aiNgu"; # pwgen ftw + mkArgsAlias = alias: ''${_tmpfn_name}() { unset -f ${_tmpfn_name}; ${alias}; }; ${_tmpfn_name}''; +in +{ + + home.packages = with pkgs; [ + /* flox */ + /* devenv */ + /* cachix */ + /* nix-template */ + nix-output-monitor + nix-du + nix-tree + nix-visualize + nix-inspect + nix-btm + unstable.nixpkgs-review bubblewrap + unstable.nixpkgs-hammering + unstable.nix-update + unstable.nix-init + unstable.deadnix + unstable.statix + /* unstable.nixtract */ + unstable.nixfmt-rfc-style + nurl + manix + #comma # collides with nix-index-database + devenv + nix-fast-build + nix-eval-jobs + ]; + + home.shellAliases = { + + manix-fzf = ''manix "" 2>/dev/null | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | fzf --preview="manix '{}'" | xargs manix''; + + denix = "sed -E 's@/nix/store/[^ /]+@@g'"; + denix-ellipsis = "sed -E 's@/nix/store/[^ /-]+-?@/nix/store/...@g'"; + + inom = mkArgsAlias ''nom "$@" --system i686-linux -j0''; + inix = mkArgsAlias ''nix "$@" --system i686-linux -j0''; + rnom = mkArgsAlias ''nom "$@" --system riscv64-linux -j0''; + rnix = mkArgsAlias ''nix "$@" --system riscv64-linux -j0''; + fnom = mkArgsAlias ''nom "$@" --system x86_64-freebsd -j0''; + fnix = mkArgsAlias ''nix "$@" --system x86_64-freebsd -j0''; + anom = mkArgsAlias ''nom "$@" --system aarch64-linux -j0''; + anix = mkArgsAlias ''nix "$@" --system aarch64-linux -j0''; + dnom = mkArgsAlias ''nom "$@" --system x86_64-darwin -j0''; + dnix = mkArgsAlias ''nix "$@" --system x86_64-darwin -j0''; + danom = mkArgsAlias ''nom "$@" --system aarch64-darwin -j0''; + danix = mkArgsAlias ''nix "$@" --system aarch64-darwin -j0''; + + inom-build = "nom-build --system i686-linux -j0"; + inix-build = "nix-build --system i686-linux -j0"; + rnom-build = "nom-build --system riscv64-linux -j0"; + rnix-build = "nix-build --system riscv64-linux -j0"; + fnom-build = "nom-build --system x86_64-freebsd -j0"; + fnix-build = "nix-build --system x86_64-freebsd -j0"; + anom-build = "nom-build --system aarch64-linux -j0"; + anix-build = "nix-build --system aarch64-linux -j0"; + dnom-build = "nom-build --system x86_64-darwin -j0"; + dnix-build = "nix-build --system x86_64-darwin -j0"; + danom-build = "nom-build --system aarch64-darwin -j0"; + danix-build = "nix-build --system aarch64-darwin -j0"; + + }; + + programs.bash.initExtra = '' + nix-prefetch-sri() { + url="$1"; shift + nix hash to-sri --type sha256 "$@" "$(nix-prefetch-url "$url")" + } + ''; + +} diff --git a/users/pbsds/home/profiles/shell.nix b/users/pbsds/home/profiles/shell.nix index 698f346..3040b9a 100644 --- a/users/pbsds/home/profiles/shell.nix +++ b/users/pbsds/home/profiles/shell.nix @@ -2,8 +2,9 @@ let - _tmp_func_name = "_tmp_func_Oaw5aifeeniezeiquonaipheNahthae9caik4Rai"; # pwgen ftw - mkArgsAlias = alias: ''${_tmp_func_name}() { unset -f ${_tmp_func_name}; ${alias}; }; ${_tmp_func_name}''; + # why not just use functions normally? ctrl-alt-e is why! + _tmpfn_name = "_tmpfn_ex4aiNgu"; # pwgen ftw + mkArgsAlias = alias: ''${_tmpfn_name}() { unset -f ${_tmpfn_name}; ${alias}; }; ${_tmpfn_name}''; in @@ -134,32 +135,6 @@ in home.shellAliases.nlocate = "nix-locate --top-level --regex"; home.shellAliases.nlocateo = mkArgsAlias ''nix-locate --top-level --regex "$@" | tr -s ' ' | cut -d' ' -f4''; - home.shellAliases.inom = mkArgsAlias ''nom "$@" --system i686-linux -j0''; - home.shellAliases.inix = mkArgsAlias ''nix "$@" --system i686-linux -j0''; - home.shellAliases.rnom = mkArgsAlias ''nom "$@" --system riscv64-linux -j0''; - home.shellAliases.rnix = mkArgsAlias ''nix "$@" --system riscv64-linux -j0''; - home.shellAliases.fnom = mkArgsAlias ''nom "$@" --system x86_64-freebsd -j0''; - home.shellAliases.fnix = mkArgsAlias ''nix "$@" --system x86_64-freebsd -j0''; - home.shellAliases.anom = mkArgsAlias ''nom "$@" --system aarch64-linux -j0''; - home.shellAliases.anix = mkArgsAlias ''nix "$@" --system aarch64-linux -j0''; - home.shellAliases.dnom = mkArgsAlias ''nom "$@" --system x86_64-darwin -j0''; - home.shellAliases.dnix = mkArgsAlias ''nix "$@" --system x86_64-darwin -j0''; - home.shellAliases.danom = mkArgsAlias ''nom "$@" --system aarch64-darwin -j0''; - home.shellAliases.danix = mkArgsAlias ''nix "$@" --system aarch64-darwin -j0''; - - home.shellAliases.inom-build = "nom-build --system i686-linux -j0"; - home.shellAliases.inix-build = "nix-build --system i686-linux -j0"; - home.shellAliases.rnom-build = "nom-build --system riscv64-linux -j0"; - home.shellAliases.rnix-build = "nix-build --system riscv64-linux -j0"; - home.shellAliases.fnom-build = "nom-build --system x86_64-freebsd -j0"; - home.shellAliases.fnix-build = "nix-build --system x86_64-freebsd -j0"; - home.shellAliases.anom-build = "nom-build --system aarch64-linux -j0"; - home.shellAliases.anix-build = "nix-build --system aarch64-linux -j0"; - home.shellAliases.dnom-build = "nom-build --system x86_64-darwin -j0"; - home.shellAliases.dnix-build = "nix-build --system x86_64-darwin -j0"; - home.shellAliases.danom-build = "nom-build --system aarch64-darwin -j0"; - home.shellAliases.danix-build = "nix-build --system aarch64-darwin -j0"; - home.shellAliases.kaomoji = "curl -s 'https://kaomoji.ru/en/' | htmlq tr td span --text | grep . | shuf | head -n1"; home.packages = lib.filter (x: x != null) (with pkgs; [