diff --git a/configs/default.nix b/configs/default.nix index b0aa677..eda99a3 100644 --- a/configs/default.nix +++ b/configs/default.nix @@ -111,6 +111,9 @@ in { }; }; overlays = [ + (self: super: { + scripts = import { pkgs = super; lib = super.lib; }; + }) # (import ) ]; }; @@ -151,6 +154,10 @@ in { isNormalUser = true; }; } + { + environment.systemPackages = with pkgs; [ k3b bashburn brasero ]; + users.users.me.extraGroups = [ "cdrom" ]; + } { sound.enable = true; @@ -176,6 +183,7 @@ in { take = pkgs.writers.writeDash "take" '' mkdir "$1" && cd "$1" ''; + swallow = command: "${pkgs.scripts.swallow}/bin/swallow ${command}"; in { "ß" = "${pkgs.utillinux}/bin/setsid"; cat = "${pkgs.bat}/bin/bat --style=plain"; @@ -199,6 +207,8 @@ in { take = "source ${take}"; tmux = "${pkgs.tmux}/bin/tmux -2"; tree = "${pkgs.exa}/bin/exa --tree"; + sxiv = swallow "${pkgs.sxiv}/bin/sxiv"; + zathura = swallow "${pkgs.zathura}/bin/zathura"; us = "${pkgs.systemd}/bin/systemctl --user"; wcd = "source ${wcd}"; weechat = "${pkgs.openssh}/bin/ssh kmein@prism.r -t tmux attach"; diff --git a/configs/i3.nix b/configs/i3.nix index 2d01036..42c0ead 100644 --- a/configs/i3.nix +++ b/configs/i3.nix @@ -21,12 +21,14 @@ let ${pkgs.coreutils}/bin/tr '[A-Za-z]' '[N-ZA-Mn-za-m]' ''; "ipa" = pkgs.writers.writeDash "ipa" '' - ${scripts.ipa}/bin/ipa + ${pkgs.scripts.ipa}/bin/ipa + ''; + "betacode" = pkgs.writers.writeDash "betacode" '' + ${pkgs.scripts.betacode}/bin/betacode ''; }; }; - scripts = import { inherit pkgs lib; }; myLib = import { inherit pkgs; }; inherit (myLib) writeTOML; diff --git a/configs/mpv.nix b/configs/mpv.nix index 1adff5c..ace30c5 100644 --- a/configs/mpv.nix +++ b/configs/mpv.nix @@ -1,9 +1,11 @@ { pkgs, ... }: { environment.systemPackages = with pkgs; [ - (mpv-with-scripts.override { scripts = [ mpvScripts.mpris ]; }) + mpv mpv-poll ]; + environment.shellAliases.mpv = "${pkgs.utillinux}/bin/setsid -f ${pkgs.mpv}/bin/mpv"; + home-manager.users.me.xdg.configFile = { "mpv/input.conf".text = '' Alt+RIGHT add video-rotate 90 diff --git a/configs/newsboat.nix b/configs/newsboat.nix index b098d87..6c8493c 100644 --- a/configs/newsboat.nix +++ b/configs/newsboat.nix @@ -1,9 +1,8 @@ -{ pkgs, config, lib, ... }: +{ pkgs, config, ... }: let newsboat-home = "${config.users.users.me.home}/cloud/syncthing/common/newsboat"; - scripts = import { inherit pkgs lib; }; - linkhandler-bin = "${scripts.linkhandler}/bin/linkhandler"; + linkhandler-bin = "${pkgs.scripts.linkhandler}/bin/linkhandler"; newsboat-config = pkgs.writeText "config" '' auto-reload no diff --git a/configs/packages/default.nix b/configs/packages/default.nix index 962ce81..8a27db5 100644 --- a/configs/packages/default.nix +++ b/configs/packages/default.nix @@ -1,6 +1,4 @@ -{ pkgs, lib, ... }: -let scripts = import { inherit pkgs lib; }; -in { +{ pkgs, lib, ... }: { imports = [ ./krebs.nix ./writing.nix @@ -100,14 +98,16 @@ in { zoom-us # video conferencing pdfgrep # search in pdf pdftk # pdf toolkit - nur.repos.kmein.python3Packages.spotify-cli-linux + evince # for viewing pdf annotations youtubeDL bc # calculator scripts.favicon scripts.ipa # XSAMPA to IPA converter + scripts.betacode # ancient greek betacode to unicode converter nur.repos.kmein.daybook nur.repos.kmein.mahlzeit nur.repos.kmein.slide + scripts.swallow # window swallowing scripts.genius scripts.instaget scripts.literature-quote diff --git a/configs/tmux.nix b/configs/tmux.nix index df866d9..24eb975 100644 --- a/configs/tmux.nix +++ b/configs/tmux.nix @@ -23,11 +23,6 @@ set -g status-right "#[fg=colour255,bg=colour237,bold] %Y-%m-%d #[default]#[fg=colour12,bg=colour233] %H:%M " set -g status-justify left - set -g pane-active-border-fg colour237 - set -g pane-border-fg colour237 - set -g pane-active-border-bg default - set -g pane-border-bg default - set -g status-position bottom set -g mouse on diff --git a/packages/scripts/default.nix b/packages/scripts/default.nix index 9415236..4f1305e 100644 --- a/packages/scripts/default.nix +++ b/packages/scripts/default.nix @@ -115,12 +115,27 @@ in { packages = [ pkgs.st pkgs.fzf pkgs.dash pkgs.bash ]; }; + swallow = wrapScript { + script = ./swallow.sh; + name = "swallow"; + packages = [ pkgs.xdo ]; + }; + ipa = wrapScript { script = ./ipa.py; name = "ipa"; packages = [ pkgs.python3 ]; }; + betacode = pkgs.writers.writePython3Bin "betacode" { + libraries = [ pkgs.nur.repos.kmein.python3Packages.betacode ]; + } '' + import betacode.conv + import sys + + sys.stdout.write(betacode.conv.beta_to_uni(sys.stdin.read())) + ''; + scrot-dmenu = wrapScript { script = ./scrot-dmenu.sh; name = "dmenu-scrot"; diff --git a/packages/scripts/swallow.sh b/packages/scripts/swallow.sh new file mode 100755 index 0000000..7543c2f --- /dev/null +++ b/packages/scripts/swallow.sh @@ -0,0 +1,7 @@ +#!/bin/sh +# https://github.com/salman-abedin/devour/blob/master/devour.sh + +id=$(xdo id) +xdo hide +$("$@") > /dev/null 2>&1 +xdo show "$id"