Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles
This commit is contained in:
@@ -44,7 +44,7 @@
|
||||
"*" = {
|
||||
"left" = [
|
||||
"volume"
|
||||
"battery"
|
||||
(pkgs.lib.mkIf (hyper.host == "NxXPS") "battery")
|
||||
# "microphone"
|
||||
"cpu"
|
||||
"cputemp"
|
||||
|
||||
@@ -52,7 +52,7 @@ in {
|
||||
packages = with pkgs; [
|
||||
chatterino2
|
||||
streamlink
|
||||
mpv
|
||||
# mpv
|
||||
];
|
||||
file = {
|
||||
".local/share/chatterino/Settings/settings.json".text = with secrets.chatterino; /* json */ ''
|
||||
|
||||
@@ -67,13 +67,13 @@
|
||||
|
||||
/* New tab page */
|
||||
--newtab-background-color : ${background} !important;
|
||||
--newtab-background-color-secondary : ${background} !important;
|
||||
--newtab-background-color-secondary : ${secondary.dark} !important;
|
||||
--newtab-text-primary-color : ${foreground} !important;
|
||||
--newtab-text-secondary-color : ${secondary.base} !important;
|
||||
--newtab-search-icon-color : ${accent.base} !important;
|
||||
|
||||
--tabpanel-background-color : transparent !important;
|
||||
background : rgba(${rice.lib.hex-to-rgb-comma-string background}, ${builtins.toString rice.transparency}) !important;
|
||||
background : linear-gradient(180deg,rgba(${rice.lib.hex-to-rgb-comma-string secondary.dark}, ${builtins.toString rice.transparency}) 0%, rgba(${rice.lib.hex-to-rgb-comma-string background}, ${builtins.toString rice.transparency}) 100%) !important;
|
||||
}
|
||||
.tabbrowser-tab[selected="true"] {
|
||||
color: ${background} !important;
|
||||
|
||||
@@ -10,7 +10,7 @@ let
|
||||
second = { name = "desc:Sony SONY TV 0x01010101"; resolution = "1920x1080"; position = "0x0"; scale = "1.0"; };
|
||||
};
|
||||
north = {
|
||||
main = { name = "desc:Iiyama North America PL3270Q na"; resolution = "2560x1440"; position = "1920x150"; scale = "1.0"; };
|
||||
main = { name = "desc:Iiyama North America PL3270Q na"; resolution = "2560x1440"; position = "1920x0"; scale = "1.0"; };
|
||||
left = { name = "desc:Philips Consumer Electronics Company 273PLPH AU11423002132"; resolution = "1920x1080"; position = "0x0"; scale = "1.0"; };
|
||||
# right = { name = "HDMI-A-2"; resolution = "1920x1080"; position = "4480x360"; scale = "1.0"; };
|
||||
};
|
||||
|
||||
80
home-modules/mpv.nix
Normal file
80
home-modules/mpv.nix
Normal file
@@ -0,0 +1,80 @@
|
||||
{ pkgs, ... }@all: with all; {
|
||||
programs.mpv = {
|
||||
enable = true;
|
||||
package = pkgs.mpv;
|
||||
config = {
|
||||
# osc = false; # Disables the on-screen controller (seekbar, volume, etc.)
|
||||
# osd-bar = false; # Disables the on-screen display progress bar
|
||||
demuxer-max-back-bytes = 4294967296; # Sets the maximum number of bytes to buffer for seeking backwards
|
||||
demuxer-max-bytes = 4294967296; # Sets the maximum number of bytes to buffer for seeking forwards
|
||||
interpolation = true; # Enables frame interpolation for smoother playback
|
||||
video-sync = "display-resample"; # Synchronizes video playback to the display's refresh rate
|
||||
sub-visibility = true; # Hides subtitles by default
|
||||
sub-auto = "fuzzy"; # Automatically loads subtitles if their filename is similar to the video file
|
||||
sub-font = rice.font.base.name;
|
||||
# sub-blur = 10; # this blurs the whole thing, text aswell
|
||||
sub-color = rice.color.accent.bright;
|
||||
sub-back-color = "${rice.color.background}${rice.lib.float-to-drune 0.8}"; # does not seem to work
|
||||
# sub-border-size = 0;
|
||||
sub-border-style = "opaque-box";
|
||||
background-color = "${rice.color.background}"; # transparency breaks blur on hyprland sometimes, so just rgb
|
||||
alang = "en,eng,de,ger"; # Sets preferred audio languages in order
|
||||
slang = "en,eng,de,ger"; # Sets preferred subtitle languages in order
|
||||
vlang = "en,eng,de,ger"; # Sets preferred video languages in order
|
||||
save-position-on-quit = true; # Saves the playback position when quitting
|
||||
ignore-path-in-watch-later-config = true; # Ignores the path in the watch-later configuration
|
||||
ytdl-format = "bestvideo[height<=?1080]+bestaudio/best"; # Sets the format for downloading YouTube videos
|
||||
vo = pkgs.lib.mkIf hyper.nvidia.enable "gpu";
|
||||
hwdec = if hyper.nvidia.enable then "no" else "no"; # bugged
|
||||
};
|
||||
scripts = with pkgs.mpvScripts; [
|
||||
mpris # use media keys
|
||||
thumbfast # thumbnails on timeline hover
|
||||
# uosc # custom ui
|
||||
sponsorblock
|
||||
];
|
||||
bindings = {
|
||||
"O" = ''no-osd cycle-values glsl-shaders "~~/shaders/invert.glsl" ""; show-text "Invert Shader"'';
|
||||
# "tab" = ''script-binding uosc/toggle-ui'';
|
||||
# "space" = ''cycle pause; script-binding uosc/flash-pause-indicator'';
|
||||
# "right" = ''seek 5'';
|
||||
# "left" = ''seek -5'';
|
||||
# "shift+right" = ''seek 30; script-binding uosc/flash-timeline'';
|
||||
# "shift+left" = ''seek -30; script-binding uosc/flash-timeline'';
|
||||
# "m" = ''no-osd cycle mute; script-binding uosc/flash-volume'';
|
||||
# "up" = ''no-osd add volume 10; script-binding uosc/flash-volume'';
|
||||
# "down" = ''no-osd add volume -10; script-binding uosc/flash-volume'';
|
||||
# "[" = ''no-osd add speed -0.25; script-binding uosc/flash-speed'';
|
||||
# "]" = ''no-osd add speed 0.25; script-binding uosc/flash-speed'';
|
||||
# "\\" = ''no-osd set speed 1; script-binding uosc/flash-speed'';
|
||||
# ">" = ''script-binding uosc/next; script-message-to uosc flash-elements top_bar,timeline'';
|
||||
# "<" = ''script-binding uosc/prev; script-message-to uosc flash-elements top_bar,timeline>'';
|
||||
};
|
||||
scriptOpts = {
|
||||
thumbfast = {
|
||||
spawn_first = true;
|
||||
network = true;
|
||||
hwdec = true;
|
||||
};
|
||||
uosc = {
|
||||
timeline_size = 25;
|
||||
timeline_persistency = "paused,audio";
|
||||
progress = "always";
|
||||
progress_size = 4;
|
||||
progress_line_width = 4;
|
||||
controls = "subtitles,<has_many_audio>audio,<has_many_video>video,<has_many_edition>editions,<stream>stream-quality";
|
||||
top_bar = "never";
|
||||
refine = "text_width";
|
||||
};
|
||||
};
|
||||
};
|
||||
xdg.configFile."mpv/shaders/invert.glsl".text = /* glsl */ ''
|
||||
//!HOOK LUMA
|
||||
//!BIND HOOKED
|
||||
vec4 hook()
|
||||
{
|
||||
float luma = LUMA_texOff(0).x;
|
||||
return vec4(1.0 - luma);
|
||||
}
|
||||
'';
|
||||
}
|
||||
@@ -11,8 +11,7 @@
|
||||
theme = "matrix";
|
||||
provider = {
|
||||
ollama = {
|
||||
apiKey = "KEY";
|
||||
disabled = false;
|
||||
name = "Ollama (local)";
|
||||
npm = "@ai-sdk/openai-compatible";
|
||||
options = {
|
||||
baseURL = "http://localhost:11434/v1";
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
home.packages = with pkgs; [
|
||||
chromium
|
||||
element-desktop
|
||||
mpv
|
||||
qbittorrent
|
||||
unstable.spotify
|
||||
wl-clipboard
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
lolcat
|
||||
lynx
|
||||
mediainfo
|
||||
mpv
|
||||
neofetch
|
||||
pastel
|
||||
pdfgrep
|
||||
|
||||
8
home-modules/programming/glsl.nix
Normal file
8
home-modules/programming/glsl.nix
Normal file
@@ -0,0 +1,8 @@
|
||||
{ pkgs, ... }@all: with all;
|
||||
{
|
||||
home = {
|
||||
packages = with pkgs; [
|
||||
glsl_analyzer
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -1,7 +1,9 @@
|
||||
{ pkgs, ... }@all: with all;
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
unar
|
||||
{ pkgs, ... }@all: with all; let
|
||||
tfc = pkgs.latest.xdg-desktop-portal-termfilechooser;
|
||||
in {
|
||||
home.packages = [
|
||||
pkgs.unar
|
||||
tfc
|
||||
];
|
||||
|
||||
programs.yazi = {
|
||||
@@ -328,6 +330,12 @@
|
||||
border_symbol = "│";
|
||||
border_style = { fg = border; };
|
||||
};
|
||||
tabs = {
|
||||
active = { fg = accent.dark; bg = accent.base; };
|
||||
inactive = { fg = secondary.base; bg = secondary.dark; };
|
||||
# sep_inner =
|
||||
# sep_outer =
|
||||
};
|
||||
status = {
|
||||
separator_open = " "; #"";
|
||||
separator_close = " "; #"";
|
||||
@@ -397,73 +405,23 @@
|
||||
};
|
||||
};
|
||||
xdg = {
|
||||
# # https://github.com/hunkyburrito/xdg-desktop-portal-termfilechooser/pull/44
|
||||
configFile = let
|
||||
wrapper = pkgs.writeShellApplication { name = "yazi-wrapper.sh"; text = /*bash*/ ''
|
||||
set -ex
|
||||
|
||||
multiple="$1"
|
||||
directory="$2"
|
||||
save="$3"
|
||||
path="$4"
|
||||
out="$5"
|
||||
|
||||
cmd="yazi"
|
||||
termcmd="''${TERMCMD:-kitty --title 'termfilechooser'}"
|
||||
|
||||
if [ "$save" = "1" ]; then
|
||||
# save a file
|
||||
set -- --chooser-file="$out" "$path"
|
||||
elif [ "$directory" = "1" ]; then
|
||||
# upload files from a directory
|
||||
set -- --chooser-file="$out" --cwd-file="$out" "$path"
|
||||
elif [ "$multiple" = "1" ]; then
|
||||
# upload multiple files
|
||||
set -- --chooser-file="$out" "$path"
|
||||
else
|
||||
# upload only 1 file
|
||||
set -- --chooser-file="$out" "$path"
|
||||
fi
|
||||
|
||||
command="$termcmd $cmd"
|
||||
for arg in "$@"; do
|
||||
# escape double quotes
|
||||
escaped=$(printf "%s" "$arg" | sed -E 's/[\"\(\)\{\}\|]//g')
|
||||
# escape spaces
|
||||
command="$command \"$escaped\""
|
||||
done
|
||||
|
||||
sh -c "$command"
|
||||
'';};
|
||||
in {
|
||||
"xdg-desktop-portal-termfilechooser/config".text = ''
|
||||
configFile."xdg-desktop-portal-termfilechooser/config" = {
|
||||
force = true;
|
||||
text = ''
|
||||
[filechooser]
|
||||
cmd=${wrapper}/bin/yazi-wrapper.sh
|
||||
cmd=${tfc}/share/xdg-desktop-portal-termfilechooser/yazi-wrapper.sh
|
||||
env=TERMCMD=ghostty --title="terminal-file-picker -e"
|
||||
default_dir=$HOME
|
||||
open_mode=suggested
|
||||
save_mode=last
|
||||
'';
|
||||
# "xdg-desktop-portal-termfilechooser/config".text = ''
|
||||
# [filechooser]
|
||||
# cmd=${pkgs.latest.xdg-desktop-portal-termfilechooser}/share/xdg-desktop-portal-termfilechooser/yazi-wrapper.sh
|
||||
# env=TERMCMD=ghostty --title="terminal-file-picker -e"
|
||||
# default_dir=$HOME
|
||||
# open_mode=suggested
|
||||
# save_mode=last
|
||||
# '';
|
||||
};
|
||||
portal = {
|
||||
enable = true;
|
||||
extraPortals = [ pkgs.latest.xdg-desktop-portal-termfilechooser ];
|
||||
config = {
|
||||
common = {
|
||||
"org.freedesktop.impl.portal.FileChooser" = "termfilechooser";
|
||||
};
|
||||
};
|
||||
xdgOpenUsePortal = true;
|
||||
config.common."org.freedesktop.impl.portal.FileChooser" = "termfilechooser";
|
||||
extraPortals = [ tfc ];
|
||||
};
|
||||
};
|
||||
home.sessionVariables = {
|
||||
GTK_USE_PORTAL = "1";
|
||||
};
|
||||
home.sessionVariables."GTK_USE_PORTAL" = "1";
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
completion-fg = foreground;
|
||||
completion-highlight-bg = background;
|
||||
completion-highlight-fg = accent.base;
|
||||
default-bg = "rgba(${f background},${t})";
|
||||
default-bg = "rgba(${f accent.dark},${t})";
|
||||
default-fg = foreground;
|
||||
highlight-active-color = "rgba(${f accent.base},0.5)";
|
||||
highlight-color = "rgba(${f secondary.base},0.5)";
|
||||
|
||||
Reference in New Issue
Block a user