Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles

This commit is contained in:
Lennart J. Kurzweg (Nx2)
2025-09-01 14:14:52 +02:00
8 changed files with 76 additions and 61 deletions

View File

@@ -1,13 +1,13 @@
{ {
"base": { "base": {
"foreground": "#dcd5f5", "foreground": "#fefefe",
"background": "#100929" "background": "#020202"
}, },
"to_alter": { "to_alter": {
"accent": "#765ad7", "accent": "#aaaaff",
"secondary": "#ce32ff", "secondary": "#aaeeff",
"tertiary": "#879eaa", "tertiary": "#aaffaa",
"special": "#bad759", "special": "#aaffaa",
"weird": "#d75991" "weird": "#ffffaa"
} }
} }

View File

@@ -12,7 +12,7 @@
/* 'icon-size': 1.2em */ /* 'icon-size': 1.2em */
)); ));
@include styleModule('cmodule-caldav_event', ( @include styleModule('cmodule-caldav_event', (
'text-color': ${secondary.base}, 'text-color': ${accent.base},
)); ));
''; '';
"hyprpanel/modules.json".text = builtins.toJSON { "hyprpanel/modules.json".text = builtins.toJSON {
@@ -24,7 +24,7 @@
hideOnEmpty = true; hideOnEmpty = true;
actions.onLeftClick = "menu:calendar"; actions.onLeftClick = "menu:calendar";
}; };
"custom/caldav_event" = { "custom/caldav_evnet" = {
execute = "caldav_event"; execute = "caldav_event";
executeOnAction = ""; executeOnAction = "";
label = "{}"; label = "{}";
@@ -44,14 +44,13 @@
"*" = { "*" = {
"left" = [ "left" = [
"volume" "volume"
(pkgs.lib.mkIf (hyper.host == "NxXPS") "battery")
# "microphone" # "microphone"
"cpu" # "cpu"
"cputemp" # "cputemp"
"ram" # "ram"
(pkgs.lib.mkIf (hyper.host == "NxXPS") "battery")
# "bluetooth" # "bluetooth"
"network" "network"
"netstat"
"windowtitle" "windowtitle"
]; ];
"middle" = [ "workspaces" ]; "middle" = [ "workspaces" ];
@@ -68,25 +67,15 @@
"bar.bluetooth.label" = true; "bar.bluetooth.label" = true;
"bar.customModules.submap.enabledIcon" = ""; "bar.customModules.submap.enabledIcon" = "[󰧹]";
"bar.customModules.submap.showSubmapName" = false; "bar.customModules.submap.showSubmapName" = false;
"bar.customModules.submap.label" = true; "bar.customModules.submap.label" = false;
"bar.customModules.submap.icon" = true; "bar.customModules.submap.icon" = true;
"bar.customModules.submap.disabledIcon" = ""; "bar.customModules.submap.disabledIcon" = "";
"bar.customModules.submap.enabledText" = "[SUBMAP]";
"bar.customModules.submap.disabledText" = "";
"bar.media.show_active_only" = true;
"bar.media.truncation_size" = 20;
"bar.windowtitle.class_name" = false;
"bar.windowtitle.label" = true;
"bar.windowtitle.custom_title" = false;
"bar.windowtitle.truncation_size" = 40;
"bar.workspaces.applicationIconEmptyWorkspace" = ""; "bar.workspaces.applicationIconEmptyWorkspace" = "";
"bar.workspaces.applicationIconOncePerWorkspace" = false; "bar.workspaces.applicationIconOncePerWorkspace" = false;
"bar.workspaces.numbered_active_indicator" = "underline"; "bar.workspaces.numbered_active_indicator" = "color";
"bar.workspaces.scroll_speed" = 1; "bar.workspaces.scroll_speed" = 1;
"bar.workspaces.showAllActive" = false; "bar.workspaces.showAllActive" = false;
"bar.workspaces.showApplicationIcons" = true; "bar.workspaces.showApplicationIcons" = true;
@@ -107,10 +96,10 @@
"theme.bar.buttons.padding_x" = "0.5rem"; "theme.bar.buttons.padding_x" = "0.5rem";
"theme.bar.buttons.battery.background" = background; "theme.bar.buttons.battery.background" = background;
"theme.bar.buttons.battery.border" = accent.base; # not seen "theme.bar.buttons.battery.border" = accent.base;
"theme.bar.buttons.battery.icon_background" = background; "theme.bar.buttons.battery.icon_background" = background;
"theme.bar.buttons.battery.icon" = secondary.base; "theme.bar.buttons.battery.icon" = accent.base;
"theme.bar.buttons.battery.text" = secondary.base; "theme.bar.buttons.battery.text" = accent.base;
"theme.bar.buttons.bluetooth.background" = background; "theme.bar.buttons.bluetooth.background" = background;
"theme.bar.buttons.bluetooth.border" = accent.base; "theme.bar.buttons.bluetooth.border" = accent.base;
@@ -266,15 +255,16 @@
"theme.bar.buttons.windowtitle.text" = secondary.base; "theme.bar.buttons.windowtitle.text" = secondary.base;
"theme.bar.buttons.workspaces.active" = accent.bright; "theme.bar.buttons.workspaces.active" = accent.bright;
"theme.bar.buttons.workspaces.available" = weird.dark; # not seen "theme.bar.buttons.workspaces.available" = accent.base;
"theme.bar.buttons.workspaces.background" = background; "theme.bar.buttons.workspaces.background" = background;
"theme.bar.buttons.workspaces.border" = accent.base; # not seen "theme.bar.buttons.workspaces.border" = accent.base;
"theme.bar.buttons.workspaces.hover" = foreground; "theme.bar.buttons.workspaces.hover" = foreground;
"theme.bar.buttons.workspaces.numbered_active_highlighted_text_color" = accent.base; # not seen "theme.bar.buttons.workspaces.numbered_active_highlighted" = accent.base;
"theme.bar.buttons.workspaces.numbered_active_highlight_padding" = "0.2em"; "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color" = accent.dark;
"theme.bar.buttons.workspaces.numbered_active_highlight_padding" = "0.4em";
"theme.bar.buttons.workspaces.numbered_active_underline_color" = accent.bright; "theme.bar.buttons.workspaces.numbered_active_underline_color" = accent.bright;
"theme.bar.buttons.workspaces.numbered_inactive_padding" = "0.2em"; "theme.bar.buttons.workspaces.numbered_inactive_padding" = "0.4em";
"theme.bar.buttons.workspaces.occupied" = accent.base; "theme.bar.buttons.workspaces.occupied" = secondary.base;
"theme.bar.buttons.workspaces.pill.width" = "4em"; "theme.bar.buttons.workspaces.pill.width" = "4em";
"theme.bar.buttons.workspaces.smartHighlight" = true; "theme.bar.buttons.workspaces.smartHighlight" = true;
"theme.bar.buttons.y_margins" = "0em"; "theme.bar.buttons.y_margins" = "0em";
@@ -505,7 +495,7 @@
"theme.notification.close_button.label" = accent.base; "theme.notification.close_button.label" = accent.base;
"theme.notification.label" = accent.base; "theme.notification.label" = accent.base;
"theme.notification.labelicon" = accent.base; "theme.notification.labelicon" = accent.base;
"theme.notification.opacity" = 1; "theme.notification.opacity" = 1.0;
"theme.notification.text" = foreground; "theme.notification.text" = foreground;
"theme.notification.time" = accent.base; "theme.notification.time" = accent.base;

View File

@@ -194,6 +194,21 @@
background-color: transparent !important; background-color: transparent !important;
} }
} }
@-moz-document domain(youtube.com) {
body, html, div#content, ytd-app, #frosted-glass.with-chipbar.ytd-app, ytd-shorts[is-dark] #cinematic-shorts-scrim.ytd-shorts {
background-color: transparent !important;
}
#background.ytd-masthead, div#background {
background-color: rgba(${rice.lib.hex-to-rgb-comma-string background}, ${builtins.toString rice.transparency}) !important;
backdrop-filter: blur(100px);
}
* {
--yt-spec-base-background: transparent;
--yt-spec-raised-background: rgba(${rice.lib.hex-to-rgb-comma-string background}, ${builtins.toString rice.transparency}) !important;
--yt-spec-menu-background: rgba(${rice.lib.hex-to-rgb-comma-string accent.dark}, ${builtins.toString rice.transparency}) !important;
--yt-spec-inverted-background: rgba(${rice.lib.hex-to-rgb-comma-string secondary.dark}, ${builtins.toString rice.transparency}) !important;
}
}
@-moz-document domain(mynixos.com) { @-moz-document domain(mynixos.com) {
body, html { body, html {

View File

@@ -110,6 +110,12 @@
mkdir $argv mkdir $argv
cd $argv cd $argv
''; '';
nx_backup = let
destination = if hyper.host == "NxNORTH" then "${hyper.home}/shared/" else "${hyper.home}/backups/";
in pkgs.lib.mkIf (hyper.host != "NxACE") ''
set RPATH (curl -s https://${hyper.domain}/latest-backup)
rsync -avz --info=progress2 -e "ssh -p ${builtins.toString secrets.ssh.port}" ${hyper.user}@ssh.${hyper.domain}:"$RPATH" ${destination}
'';
# gpg = ''; # gpg = '';
# set bold \e[1m # set bold \e[1m
# set green \e[32m # set green \e[32m

View File

@@ -139,7 +139,7 @@
weird = alter_hue(ilist=accent, hue=80) weird = alter_hue(ilist=accent, hue=80)
special = alter_hue(ilist=accent, hue=180) special = alter_hue(ilist=accent, hue=180)
foreground = alter_l(accent, 0.9) foreground = alter_l(accent, 0.9)
background = alter_l(accent, 0.1) background = alter_l(accent, 0.05)
d = { d = {
"base": { "base": {

View File

@@ -1,4 +1,4 @@
{ pkgs, ... }@all: with all; { config, pkgs, ... }@all: with all;
{ {
# sops.secrets = { # sops.secrets = {
# "wireless-networking.env" = {}; # "wireless-networking.env" = {};
@@ -15,6 +15,7 @@
}; };
enableIPv6 = true; enableIPv6 = true;
firewall.allowedTCPPorts = [ firewall.allowedTCPPorts = [
(pkgs.lib.mkIf config.services.ollama.enable 11434)
80 80
443 443
8000 8000

View File

@@ -8,16 +8,21 @@
package = pkgs.copyparty; package = pkgs.copyparty;
openFilesLimit = 8192; openFilesLimit = 8192;
settings = { settings = {
i = [ "0.0.0.0" "unix:770:copyparty:/dev/shm/party.sock" ];
p = [ 3210 3211 ]; p = [ 3210 3211 ];
no-reload = true; i = [ "0.0.0.0" "unix:770:copyparty:/dev/shm/party.sock" ];
name = "NxCopyParty";
ignored-flag = false; ignored-flag = false;
shr = "/shares"; no-reload = true;
css-browser = "https://nx2.site/copyparty/extra-browser.css";
theme = 6;
xff-hdr = "X-Forwarded-For"; # so that cpp knows the real client ip behind nginx. Must match with nginx config
rproxy = 1;
no-robots = true; no-robots = true;
rproxy = 1;
xff-hdr = "X-Forwarded-For"; # so that cpp knows the real client ip behind nginx. Must match with nginx config
shr = "/shares";
css-browser = "https://${hyper.domain}/copyparty/extra-browser.css";
theme = 6;
}; };
accounts = { accounts = {
"${hyper.user}" = { "${hyper.user}" = {

View File

@@ -90,24 +90,22 @@
default = true; default = true;
listen = dl; listen = dl;
locations = { locations = {
"/" = { "/".extraConfig = ''
extraConfig = ''
index index.html; index index.html;
''; '';
}; "~ ^(/.well-known/matrix/client)$".return = "502";
"~^(/ba)$" = { return = "301 /BA.pdf"; }; "~ ^(/.well-known/matrix/server)$".return = "502";
"/.well-known/matrix/client" = { return = "502"; }; "~ ^(/phone)$".return = "301 /cards/phone";
"/.well-known/matrix/server" = { return = "502"; }; "~ ^(/about-me)$".return = "301 /slides/about-me";
"/phone" = { return = "301 /cards/phone"; }; "~ ^(/about-this-site)$".return = "301 /slides/about-this-site";
"/about-me" = { return = "301 /slides/about-me"; }; "~ ^(/gpg)$".return = "301 /cards/gpg";
"/about-this-site" = { return = "301 /slides/about-this-site"; }; "~ ^(/contact)$".return = "301 /cards/contact";
"/gpg" = { return = "301 /cards/gpg"; }; "~ ^(/ba)$".return = "301 /BA.pdf";
"/contact" = { return = "301 /cards/contact"; };
}; };
}; };
"matrix.${hyper.domain}" = { "matrix.${hyper.domain}" = {
listen = dl; listen = dl;
locations = { "~.*" = { return = "502"; }; }; locations."~.*".return = "502";
}; };
# "pw.${hyper.domain}" = vh // { # "pw.${hyper.domain}" = vh // {
# listen = dl; # listen = dl;