ølkaølkafosf

base.nix

@@ -67,7 +67,10 @@
   nix.settings.min-free =  3 * 1024 * 1024 * 1024;
   nix.settings.max-free = 20 * 1024 * 1024 * 1024;
 
-  services.thermald.enable = lib.mkIf (config.nixpkgs.system == "x86_64-linux") true;
+  services.thermald.enable = lib.mkIf (lib.all (x: x) [
+      (config.nixpkgs.system == "x86_64-linux")
+      (!config.boot.isContainer or false)
+    ]) true;
 
   # System fonts
   # Nice to have when X-forwading on headless machines

users/pbsds/default.nix

@@ -4,7 +4,7 @@
 
   environment.systemPackages = with pkgs; [
     micro
-    vimv
+    edir
     xclip
     fzf
     rmate-sh

users/pbsds/home/default.nix

@@ -33,10 +33,11 @@
       nix run nixpkgs#atom -- --disable-gpu --in-process-gpu --no-sandbox "$@"
     }
 
-    function vpn {
-    	ip="$(dig +short -x a $1 | tail -n 1)"
-    	( set -x; sshuttle 0.0.0.0/0 --disable-ipv6 --dns -r "$1" -x $ip -x 127.0.0.1 -x 172.0.0.0/8 )
-    }
+    if [[ -n "''${SSH_CLIENT-}" || -n "''${SSH_TTY-}" || -z "''${WAYLAND_DISPLAY-}" ]]; then
+      alias clip="xclip -sel clip -i -rmlastnl -t text/plain";
+    else
+      alias clip="wl-copy --trim-newline --type text/plain";
+    fi
   '';
 
   home.packages = with pkgs; [
@@ -65,7 +66,7 @@
     vgmstream
     ffmpeg-full
 
-    (pkgs.termsvg or pkgs.unstable.termsvg)
+    /* (pkgs.termsvg or pkgs.unstable.termsvg) */
 
     lolcat
     toilet
@@ -94,8 +95,6 @@
     #comma # collides with nix-index-database
     nix-search-cli # nix-search
 
-    #sshuttle
-
     #cargo
     #cargo-edit
 
@@ -127,10 +126,6 @@
 
     #TODO: vpn
 
-    # TODO: fix both wayland, and x-forwarding
-    #clip = "( if command -v wl-copy >/dev/null; then wl-copy --trim-newline --type text/plain; else xclip -sel clip -t text/plain -rmlastnl -i; fi )";
-    clip = "xclip -sel clip -i -rmlastnl -t text/plain";
-
     # TODO: ps1?
     pwd-fqdn = ''echo "$(whoami)@$(hostname -f):$(printf "%q" "$(realpath .)/")"'';
 

users/pbsds/home/profiles/desktop.nix

@@ -30,6 +30,8 @@
 
     libreoffice
 
+    remote-exec
+
     (pkgs.zxtune or unstable.zxtune or null)
 
     f3d

users/pbsds/home/profiles/git.nix

@@ -4,6 +4,7 @@
     #git
     gh
     hub
+    tea
     colordiff
   ];
 
@@ -49,7 +50,6 @@
   home.shellAliases = {
     # git gud
     gs     = "git status";
-    gb     = "git blame";
     gl     = "git log --oneline --color | head -n 30";
     glg    = "git log --all --decorate --oneline --graph";
     gpra   = "git pull --rebase --autostash";
@@ -62,11 +62,11 @@
     gcp    = "git cherry-pick";
     gca    = "git commit --amend";
     gcara  = "git commit --amend --reset-author";
-    gpo    = "git push origin";
-    gpasr  = "git pull --autostash --rebase";
-    #gfr    = "git fetch origin master && git rebase FETCH_HEAD";
     gfr    = "git pull --rebase";
-    gp     = "git pull --rebase --autostash";
+    gc     = "git branch | cut -c2- | gum choose | xargs git checkout";
+    gbrm   = "git fetch origin; git branch --merged | cut -c3- | grep -vE '^(main|master)$' | gum choose --no-limit --header 'Which branches to delete:' | xargs git branch -D";
+    #gb     = "git blame";
+    #gpo    = "git push origin";
   };
 
 }

users/pbsds/home/profiles/shell.nix

@@ -82,6 +82,8 @@
   #home.shellAliases.mv = "mv -i";
   #home.shellAliases.cp = "cp -i";
 
+  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; [
     rsync
     bind.dnsutils # dig