diff --git a/configuration.nix b/configuration.nix index 7a27dba..b28a892 100644 --- a/configuration.nix +++ b/configuration.nix @@ -9,6 +9,7 @@ ./system-modules/cache.nix ./system-modules/calendar.nix ./system-modules/dm.nix + ./system-modules/davfs.nix ./system-modules/docker.nix ./system-modules/fcitx5.nix ./system-modules/fonts.nix diff --git a/flake-modules/colors.json b/flake-modules/colors.json index 2723ac7..d4e8eee 100644 --- a/flake-modules/colors.json +++ b/flake-modules/colors.json @@ -27,15 +27,15 @@ }, "NxNORTH": { "base": { - "foreground": "#d7e3f3", - "background": "#050b13" + "foreground": "#dbe7ef", + "background": "#070d11" }, "to_alter": { - "accent": "#6291cf", - "secondary": "#5f5fd2", - "tertiary": "#999999", - "special": "#cf9f61", - "weird": "#c461cf" + "accent": "#72a2bf", + "secondary": "#fc3535", + "tertiary": "#83ae8a", + "special": "#bf8f71", + "weird": "#a871bf" } }, "NxDCS": { diff --git a/home-modules/calendar.nix b/home-modules/calendar.nix index 8a8af67..5a56748 100644 --- a/home-modules/calendar.nix +++ b/home-modules/calendar.nix @@ -2,27 +2,29 @@ v = "nxc"; user = "lennart"; domain = hyper.domain; - calendars = [ + calendars = let + bs = "https://n.${domain}/remote.php/dav/calendars/lennart"; + in [ { name = "Preservation"; primary = true; - url = "https://${v}.${domain}/${user}/calendars/preservation/"; + url = "${bs}/preservation/"; color = "#dddddd"; } { name = "Effort"; - url = "https://${v}.${domain}/${user}/calendars/effort/"; + url = "${bs}/effort/"; color = "#dd2222"; } { name = "Experience"; - url = "https://${v}.${domain}/${user}/calendars/experience/"; + url = "${bs}/experience/"; color = "#2222dd"; } { name = "Leisure"; # name = "Exposure"; - url = "https://${v}.${domain}/${user}/calendars/leisure/"; + url = "${bs}/leisure/"; # url = "https://${v}.${domain}/${user}/exposure/"; color = "#22aa22"; } @@ -32,11 +34,11 @@ # color = "#8800CC"; # } # { - { - name = "Family"; - url = "https://${v}.${domain}/shared/calendars/family/"; - color = "#dddd22"; - } + # { + # name = "Family"; + # url = "${bs}/family/"; + # color = "#dddd22"; + # } { name = "Sleep as Android"; url = secrets.calendar.sleep-as-android-url; @@ -79,7 +81,7 @@ in { inherit primary; remote = { inherit url name; - userName = hyper.user; # my globally set username + userName = user; }; }; in lib.attrsets.mergeAttrsList ( @@ -99,7 +101,7 @@ in { "calendar.registry.${to_safe_name calendar.name}.name" = name; "calendar.registry.${to_safe_name calendar.name}.type" = type; "calendar.registry.${to_safe_name calendar.name}.uri" = url; - "calendar.registry.${to_safe_name calendar.name}.username" = hyper.user; + "calendar.registry.${to_safe_name calendar.name}.username" = user; "calendar.registry.${to_safe_name calendar.name}.readOnly" = read-only; }) calendars ) // { diff --git a/home-modules/chatterino.nix b/home-modules/chatterino.nix index ca479cc..491063e 100644 --- a/home-modules/chatterino.nix +++ b/home-modules/chatterino.nix @@ -52,7 +52,7 @@ in { home = { packages = with pkgs; [ unstable.chatterino2 - streamlink + unstable.streamlink # mpv ]; file = { diff --git a/home-modules/firefox/userContent.nix b/home-modules/firefox/userContent.nix index 97e85c4..99e9de1 100644 --- a/home-modules/firefox/userContent.nix +++ b/home-modules/firefox/userContent.nix @@ -20,7 +20,7 @@ in /* css */ '' /* new-tab */ @-moz-document url-prefix(about:home), url-prefix(about:newtab) { - :root{ + :root { --newtab-background-color-secondary: rgba(${f background},0.5) !important; } body, html { @@ -31,6 +31,29 @@ in /* css */ '' } } + @-moz-document url-prefix("https://n.nx2.site/") { + :root, [data-theme-dark] { + --color-main-background: #00000055; + --color-main-background-rgb: 0,0,0; + --color-primary-element-light: #550000; + } + .app-navigation, .app-content { + background: rgba(0,0,0,0.8) !important; + backdrop-filter: blur(5px) !important; + } + .files-list__row-head, .files-list__tfoot { + background: rgba(0,0,0,0.5) !important; + } + .fc-day-today { + background: #ff000055 !important; + } + .files-list__thead { + background: transparent !important; + } + } + + + @-moz-document domain(reddit.com) { header { background-color: rgba(${f background},${builtins.toString rice.transparency}) !important; @@ -231,6 +254,7 @@ in /* css */ '' border: ${toString rice.border-width}px solid ${border} !important; } } + '' # @-moz-document domain(chatgpt.com) { # body, html , .bg-token-sidebar-surface-primary { diff --git a/system-modules/davfs.nix b/system-modules/davfs.nix new file mode 100644 index 0000000..45ff4f6 --- /dev/null +++ b/system-modules/davfs.nix @@ -0,0 +1,19 @@ +{ pkgs, ... }@all: with all; let + # user = "lennart"; +in { + services.davfs2 = { + enable = true; + settings = { + globalSection = { + use_locks = true; + }; + sections = { + "${hyper.home}/webdav" = { + gui_optimize = true; + }; + }; + }; + }; + users.users."${hyper.user}".extraGroups = [ "davfs2" ]; +} + diff --git a/system-modules/dm.nix b/system-modules/dm.nix index a9d0f18..44c8c89 100644 --- a/system-modules/dm.nix +++ b/system-modules/dm.nix @@ -18,8 +18,8 @@ package = pkgs.ly; settings = with rice.color; let h = rice.lib.nohash; in { allow_empty_password = false; - # animation = "matrix"; - animation = "gameoflife"; + animation = "matrix"; + # animation = "gameoflife"; animation_timeout_sec = 0; # forever asterisk = "*"; auth_fails = 10; diff --git a/system-modules/nix.nix b/system-modules/nix.nix index 651f9ac..5fcbe0b 100644 --- a/system-modules/nix.nix +++ b/system-modules/nix.nix @@ -3,12 +3,12 @@ experimental-features = [ "nix-command" "flakes" ]; substituters = [ "https://cache.nixos.org/" - "https://cache.nixos-cuda.org" + # "https://cache.nixos-cuda.org" "https://nix-community.cachix.org" ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M=" + # "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M=" ]; }; }