Compare commits
No commits in common. "ee324d57afeff9c9875b94c4dea2fd7f86301de5" and "048e6a6bb47793563791c7089aea2615a96668ea" have entirely different histories.
ee324d57af
...
048e6a6bb4
|
@ -1,4 +1,4 @@
|
|||
args@{
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
|
@ -77,23 +77,44 @@ in {
|
|||
settings = import ./starship.toml.nix flake.self.theme.withHashtag;
|
||||
};
|
||||
|
||||
programs.bash = import ./bash args;
|
||||
programs.bash = import ./bash {
|
||||
inherit config;
|
||||
inherit pkgs;
|
||||
inherit lib;
|
||||
};
|
||||
|
||||
programs.fzf = import ./fzf args;
|
||||
programs.fzf = import ./fzf {
|
||||
inherit config;
|
||||
inherit pkgs;
|
||||
};
|
||||
|
||||
programs.neovim = import ./nvim {
|
||||
inherit config;
|
||||
inherit pkgs;
|
||||
inherit lib;
|
||||
};
|
||||
|
||||
programs.neovim = import ./nvim args;
|
||||
# Ensure nvim backup directory gets created
|
||||
# Workaround for E510: Can't make backup file (add ! to override)
|
||||
xdg.dataFile."nvim/backup/.keep".text = "";
|
||||
xdg.dataFile."nvim/json-schemas/.keep".text = "";
|
||||
xdg.dataFile."nvim/templates/.keep".text = "";
|
||||
|
||||
programs.git = import ./git args;
|
||||
xdg.configFile."git/config".text = import ./.config/git/config.nix args;
|
||||
xdg.configFile."git/gitmessage".text = import ./.config/git/gitmessage.nix args;
|
||||
xdg.configFile."git/global_gitignore".text = import ./.config/git/global_gitignore.nix args;
|
||||
programs.git = import ./git {};
|
||||
xdg.configFile."git/config".text = import ./.config/git/config.nix {
|
||||
inherit config;
|
||||
inherit pkgs;
|
||||
};
|
||||
xdg.configFile."git/gitmessage".text = import ./.config/git/gitmessage.nix {
|
||||
inherit config;
|
||||
inherit pkgs;
|
||||
};
|
||||
xdg.configFile."git/global_gitignore".text = import ./.config/git/global_gitignore.nix {
|
||||
inherit config;
|
||||
inherit pkgs;
|
||||
};
|
||||
|
||||
programs.direnv = import ./direnv args;
|
||||
programs.direnv = import ./direnv {};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,17 +1,15 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
flake,
|
||||
...
|
||||
}: {
|
||||
enable = true;
|
||||
defaultCommand = "fd --hidden --type f --exclude .git";
|
||||
defaultOptions = with flake.self.theme.withHashtag; [
|
||||
"--color=bg+:${base01},bg:${base00},spinner:${base0C},hl:${base0D}"
|
||||
"--color=fg:${base04},header:${base0D},info:${base0A},pointer:${base0C}"
|
||||
"--color=marker:${base0C},fg+:${base02},prompt:${base0A},hl+:${base0D}"
|
||||
defaultOptions = [
|
||||
"--color=bg+:#2d2a2e,bg:#1a181a,spinner:#ef9062,hl:#7accd7"
|
||||
"--color=fg:#d3d1d4,header:#7accd7,info:#e5c463,pointer:#ef9062"
|
||||
"--color=marker:#ef9062,fg+:#303030,prompt:#e5c463,hl+:#7accd7"
|
||||
];
|
||||
|
||||
# Use ble.sh for completions, see
|
||||
# modules/terminal-life/bash/default.nix -> bleopt complete_menu_style=desc
|
||||
# and https://github.com/akinomyoga/ble.sh/wiki/Manual-%C2%A77-Completion
|
||||
|
|
|
@ -2,10 +2,10 @@ self:
|
|||
with self; ''
|
||||
set -e
|
||||
|
||||
RECORDER_PID=$(${procps}/bin/ps aux | ${gnugrep}/bin/grep "wf-recorder" | ${gnugrep}/bin/grep -v grep | ${gawk}/bin/awk '{print $2}')
|
||||
RECORDER_PID=$(${procps}/bin/ps aux | ${gnugrep}/bin/grep "\--class screen-recorder" | ${gnugrep}/bin/grep -v grep | ${gawk}/bin/awk '{print $2}')
|
||||
NUM_PID=$(echo -n $RECORDER_PID | ${coreutils}/bin/wc -w)
|
||||
if (( NUM_PID > 0 )); then
|
||||
FILE_LOCATION=$(${procps}/bin/ps aux | ${gnugrep}/bin/grep "wf-recorder" | ${gnugrep}/bin/grep -v grep | ${gawk}/bin/awk '{print $NF}')
|
||||
FILE_LOCATION=$(${procps}/bin/ps aux | ${gnugrep}/bin/grep "\--class screen-recorder" | ${gnugrep}/bin/grep -v grep | ${gawk}/bin/awk '{print $NF}')
|
||||
kill $RECORDER_PID
|
||||
${libnotify}/bin/notify-send "Recorded to $FILE_LOCATION"
|
||||
exit 0
|
||||
|
@ -21,6 +21,8 @@ with self; ''
|
|||
RESOLUTION="$(echo $GEOMETRY | ${gawk}/bin/awk '{print $2}')"
|
||||
FILE_LOCATION="$HOME/Videos/Screenrecordings/$(${coreutils}/bin/date +%Y%m%d_%Hh%Mm%Ss)_$RESOLUTION.mp4"
|
||||
echo "Recording $GEOMETRY into $FILE_LOCATION"
|
||||
${wf-recorder}/bin/wf-recorder -g "$GEOMETRY" -f "$FILE_LOCATION"
|
||||
${alacritty}/bin/alacritty \
|
||||
--class screen-recorder \
|
||||
-e ${wf-recorder}/bin/wf-recorder -g "$GEOMETRY" -f "$FILE_LOCATION"
|
||||
${libnotify}/bin/notify-send "Recording to $FILE_LOCATION"
|
||||
''
|
||||
|
|
Loading…
Reference in a new issue