diff --git a/flake-modules/colors.json b/flake-modules/colors.json index ea48ae1..61eecac 100644 --- a/flake-modules/colors.json +++ b/flake-modules/colors.json @@ -1,13 +1,13 @@ { "base": { - "foreground": "#dcd5f5", - "background": "#100929" + "foreground": "#fefefe", + "background": "#020202" }, "to_alter": { - "accent": "#765ad7", - "secondary": "#ce32ff", - "tertiary": "#879eaa", - "special": "#bad759", - "weird": "#d75991" + "accent": "#aaaaff", + "secondary": "#aaeeff", + "tertiary": "#aaffaa", + "special": "#aaffaa", + "weird": "#ffffaa" } } \ No newline at end of file diff --git a/home-modules/bar/hyprpanel.nix b/home-modules/bar/hyprpanel.nix index 0b1c241..a21eb02 100644 --- a/home-modules/bar/hyprpanel.nix +++ b/home-modules/bar/hyprpanel.nix @@ -12,7 +12,7 @@ /* 'icon-size': 1.2em */ )); @include styleModule('cmodule-caldav_event', ( - 'text-color': ${secondary.base}, + 'text-color': ${accent.base}, )); ''; "hyprpanel/modules.json".text = builtins.toJSON { @@ -24,7 +24,7 @@ hideOnEmpty = true; actions.onLeftClick = "menu:calendar"; }; - "custom/caldav_event" = { + "custom/caldav_evnet" = { execute = "caldav_event"; executeOnAction = ""; label = "{}"; @@ -37,21 +37,20 @@ programs.hyprpanel = { enable = true; package = pkgs.unstable.hyprpanel; - settings = with rice.color; let + settings = with rice.color; let t = builtins.toString (builtins.ceil (rice.transparency * 100)); in { "bar.layouts" = { "*" = { "left" = [ "volume" - (pkgs.lib.mkIf (hyper.host == "NxXPS") "battery") # "microphone" - "cpu" - "cputemp" - "ram" + # "cpu" + # "cputemp" + # "ram" + (pkgs.lib.mkIf (hyper.host == "NxXPS") "battery") # "bluetooth" "network" - "netstat" "windowtitle" ]; "middle" = [ "workspaces" ]; @@ -68,25 +67,15 @@ "bar.bluetooth.label" = true; - "bar.customModules.submap.enabledIcon" = ""; + "bar.customModules.submap.enabledIcon" = "[󰧹]"; "bar.customModules.submap.showSubmapName" = false; - "bar.customModules.submap.label" = true; + "bar.customModules.submap.label" = false; "bar.customModules.submap.icon" = true; "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.applicationIconOncePerWorkspace" = false; - "bar.workspaces.numbered_active_indicator" = "underline"; + "bar.workspaces.numbered_active_indicator" = "color"; "bar.workspaces.scroll_speed" = 1; "bar.workspaces.showAllActive" = false; "bar.workspaces.showApplicationIcons" = true; @@ -107,10 +96,10 @@ "theme.bar.buttons.padding_x" = "0.5rem"; "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" = secondary.base; - "theme.bar.buttons.battery.text" = secondary.base; + "theme.bar.buttons.battery.icon" = accent.base; + "theme.bar.buttons.battery.text" = accent.base; "theme.bar.buttons.bluetooth.background" = background; "theme.bar.buttons.bluetooth.border" = accent.base; @@ -266,15 +255,16 @@ "theme.bar.buttons.windowtitle.text" = secondary.base; "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.border" = accent.base; # not seen + "theme.bar.buttons.workspaces.border" = accent.base; "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_highlight_padding" = "0.2em"; + "theme.bar.buttons.workspaces.numbered_active_highlighted" = accent.base; + "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_inactive_padding" = "0.2em"; - "theme.bar.buttons.workspaces.occupied" = accent.base; + "theme.bar.buttons.workspaces.numbered_inactive_padding" = "0.4em"; + "theme.bar.buttons.workspaces.occupied" = secondary.base; "theme.bar.buttons.workspaces.pill.width" = "4em"; "theme.bar.buttons.workspaces.smartHighlight" = true; "theme.bar.buttons.y_margins" = "0em"; @@ -505,7 +495,7 @@ "theme.notification.close_button.label" = accent.base; "theme.notification.label" = accent.base; "theme.notification.labelicon" = accent.base; - "theme.notification.opacity" = 1; + "theme.notification.opacity" = 1.0; "theme.notification.text" = foreground; "theme.notification.time" = accent.base; diff --git a/home-modules/firefox.nix b/home-modules/firefox.nix index ca0dd51..03caadd 100644 --- a/home-modules/firefox.nix +++ b/home-modules/firefox.nix @@ -194,6 +194,21 @@ 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) { body, html { diff --git a/home-modules/fish.nix b/home-modules/fish.nix index afbf122..e6a721e 100644 --- a/home-modules/fish.nix +++ b/home-modules/fish.nix @@ -110,6 +110,12 @@ mkdir $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 = ''; # set bold \e[1m # set green \e[32m diff --git a/home-modules/wallpaper-to-colors.nix b/home-modules/wallpaper-to-colors.nix index 9e84206..6f042b4 100644 --- a/home-modules/wallpaper-to-colors.nix +++ b/home-modules/wallpaper-to-colors.nix @@ -139,7 +139,7 @@ weird = alter_hue(ilist=accent, hue=80) special = alter_hue(ilist=accent, hue=180) foreground = alter_l(accent, 0.9) - background = alter_l(accent, 0.1) + background = alter_l(accent, 0.05) d = { "base": { diff --git a/system-modules/networking.nix b/system-modules/networking.nix index 0092696..246a0f5 100644 --- a/system-modules/networking.nix +++ b/system-modules/networking.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }@all: with all; +{ config, pkgs, ... }@all: with all; { # sops.secrets = { # "wireless-networking.env" = {}; @@ -15,6 +15,7 @@ }; enableIPv6 = true; firewall.allowedTCPPorts = [ + (pkgs.lib.mkIf config.services.ollama.enable 11434) 80 443 8000 diff --git a/system-modules/nx2site/copyparty.nix b/system-modules/nx2site/copyparty.nix index 93d97ca..a8dd8fe 100644 --- a/system-modules/nx2site/copyparty.nix +++ b/system-modules/nx2site/copyparty.nix @@ -8,16 +8,21 @@ package = pkgs.copyparty; openFilesLimit = 8192; settings = { - i = [ "0.0.0.0" "unix:770:copyparty:/dev/shm/party.sock" ]; + p = [ 3210 3211 ]; - no-reload = true; + i = [ "0.0.0.0" "unix:770:copyparty:/dev/shm/party.sock" ]; + name = "NxCopyParty"; + ignored-flag = false; - shr = "/shares"; - 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-reload = 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 = { "${hyper.user}" = { diff --git a/system-modules/nx2site/proxy.nix b/system-modules/nx2site/proxy.nix index a8ab99a..9c620fc 100644 --- a/system-modules/nx2site/proxy.nix +++ b/system-modules/nx2site/proxy.nix @@ -90,24 +90,22 @@ default = true; listen = dl; locations = { - "/" = { - extraConfig = '' - index index.html; - ''; - }; - "~^(/ba)$" = { return = "301 /BA.pdf"; }; - "/.well-known/matrix/client" = { return = "502"; }; - "/.well-known/matrix/server" = { return = "502"; }; - "/phone" = { return = "301 /cards/phone"; }; - "/about-me" = { return = "301 /slides/about-me"; }; - "/about-this-site" = { return = "301 /slides/about-this-site"; }; - "/gpg" = { return = "301 /cards/gpg"; }; - "/contact" = { return = "301 /cards/contact"; }; + "/".extraConfig = '' + index index.html; + ''; + "~ ^(/.well-known/matrix/client)$".return = "502"; + "~ ^(/.well-known/matrix/server)$".return = "502"; + "~ ^(/phone)$".return = "301 /cards/phone"; + "~ ^(/about-me)$".return = "301 /slides/about-me"; + "~ ^(/about-this-site)$".return = "301 /slides/about-this-site"; + "~ ^(/gpg)$".return = "301 /cards/gpg"; + "~ ^(/contact)$".return = "301 /cards/contact"; + "~ ^(/ba)$".return = "301 /BA.pdf"; }; }; "matrix.${hyper.domain}" = { listen = dl; - locations = { "~.*" = { return = "502"; }; }; + locations."~.*".return = "502"; }; # "pw.${hyper.domain}" = vh // { # listen = dl;