Compare commits

..

3 commits

Author SHA1 Message Date
Nick
65417d1809 feat: deleted dumb file 2025-01-19 02:31:40 -06:00
Nick
3b455e6133 feat: added regreet 2025-01-19 02:31:05 -06:00
Nick
aac47aa93b feat: forgejo test 2025-01-19 01:59:28 -06:00
24 changed files with 177 additions and 135 deletions

File diff suppressed because one or more lines are too long

0
config/themes/palettes/brogrammer/default.nix Normal file → Executable file
View file

0
config/themes/palettes/chalk/default.nix Normal file → Executable file
View file

0
config/themes/palettes/deep-oceanic-next/default.nix Normal file → Executable file
View file

0
config/themes/palettes/espresso/default.nix Normal file → Executable file
View file

0
config/themes/palettes/flat/default.nix Normal file → Executable file
View file

0
config/themes/palettes/framer/default.nix Normal file → Executable file
View file

0
config/themes/palettes/github/default.nix Normal file → Executable file
View file

0
config/themes/palettes/hardcore/default.nix Normal file → Executable file
View file

0
config/themes/palettes/one/black/default.nix Normal file → Executable file
View file

0
config/themes/palettes/one/dark/default.nix Normal file → Executable file
View file

0
config/themes/palettes/one/light/default.nix Normal file → Executable file
View file

0
config/themes/palettes/sparky/default.nix Normal file → Executable file
View file

View file

@ -1,19 +1,16 @@
{flake, ...}: let { flake, ... }:
inherit let
(flake.config.people) inherit (flake.config.people)
user0 user0
; ;
inherit inherit (flake.config.people.users.${user0})
(flake.config.people.users.${user0})
aliases aliases
; ;
inherit inherit (flake.config.machines.devices)
(flake.config.machines.devices)
synology synology
server server
; ;
inherit inherit (flake.config.services)
(flake.config.services)
instances instances
; ;
@ -42,7 +39,8 @@
"thing" "thing"
instances.synology.name instances.synology.name
]; ];
in { in
{
name = "Self Hosted"; name = "Self Hosted";
toolbar = false; toolbar = false;
bookmarks = [ bookmarks = [
@ -58,7 +56,7 @@ in {
} }
{ {
name = instances.forgejo.label; name = instances.forgejo.label;
url = "https://${instances.forgejo.subdomain}.${instances.web.domains.url0}"; url = "https://${instances.forgejo.subdomain}.${instances.web.domains.url3}";
tags = [ tags = [
instances.forgejo.name instances.forgejo.name
"forge" "forge"
@ -166,21 +164,17 @@ in {
{ {
name = "${instances.syncthing.label} (${instances.synology.label})"; name = "${instances.syncthing.label} (${instances.synology.label})";
url = "http://${synology.ip.address0}:${toString instances.syncthing.ports.port0}"; url = "http://${synology.ip.address0}:${toString instances.syncthing.ports.port0}";
tags = tags = [
[
"synology" "synology"
] ] ++ syncthingTags;
++ syncthingTags;
keyword = instances.syncthing.label; keyword = instances.syncthing.label;
} }
{ {
name = "${instances.syncthing.label} (Desktop)"; name = "${instances.syncthing.label} (Desktop)";
url = "http://localhost:${toString instances.syncthing.ports.port0}"; url = "http://localhost:${toString instances.syncthing.ports.port0}";
tags = tags = [
[
"desktop" "desktop"
] ] ++ syncthingTags;
++ syncthingTags;
keyword = instances.syncthing.label; keyword = instances.syncthing.label;
} }
{ {

View file

@ -12,7 +12,8 @@ let
"tube" "tube"
"yt" "yt"
]; ];
in { in
{
name = "Social Media"; name = "Social Media";
toolbar = false; toolbar = false;
bookmarks = [ bookmarks = [
@ -39,6 +40,16 @@ in {
tags = discordTags; tags = discordTags;
keyword = "Discord"; keyword = "Discord";
} }
{
name = "Facebook";
url = "https://www.facebook.com/";
tags = [
"facebook"
"face"
"book"
];
keyword = "Face";
}
{ {
name = "Gmail"; name = "Gmail";
url = "https://mail.google.com/mail/u/0/#inbox"; url = "https://mail.google.com/mail/u/0/#inbox";
@ -156,11 +167,9 @@ in {
{ {
name = "YouTube Studio"; name = "YouTube Studio";
url = "https://studio.youtube.com/channel/UCy9yYcDx2XuVVgcWLJJDoxw"; url = "https://studio.youtube.com/channel/UCy9yYcDx2XuVVgcWLJJDoxw";
tags = tags = [
[
"studio" "studio"
] ] ++ youtubeTags;
++ youtubeTags;
keyword = "Studio"; keyword = "Studio";
} }
{ {

View file

@ -1,7 +1,6 @@
{pkgs, ...}: { pkgs, ... }:
builtins.attrValues { builtins.attrValues {
inherit inherit (pkgs)
(pkgs)
nil nil
nixfmt-rfc-style nixfmt-rfc-style
nixd nixd

View file

@ -13,12 +13,6 @@
}; };
}; };
elm = {
binary = {
path_lookup = true;
};
};
haskell = { haskell = {
path_lookup = true; path_lookup = true;
}; };

View file

@ -8,7 +8,7 @@ in
alternate_scroll = "off"; alternate_scroll = "off";
blinking = "off"; blinking = "off";
copy_on_select = true; copy_on_select = true;
dock = "right"; dock = "bottom";
detect_venv = { detect_venv = {
on = { on = {
directories = [ directories = [

View file

@ -67,11 +67,19 @@ in
}; };
hyprland = { hyprland = {
imports = builtins.attrValues { inherit (modules) hyprland; }; imports = builtins.attrValues {
inherit (modules)
hyprland
;
};
}; };
server = { server = {
imports = builtins.attrValues { inherit (modules) services; }; imports = builtins.attrValues {
inherit (modules)
services
;
};
}; };
shared = { shared = {

View file

@ -1,15 +1,12 @@
{ {
imports = imports = map (file: ./${file}.nix) [
map
(file: ./${file}.nix)
[
"geoclue2" "geoclue2"
"greetd" "greetd"
"network" "network"
"hypridle" "hypridle"
"hyprland" "hyprland"
"hyprlock" "hyprlock"
# "regreet" "regreet"
"swaylock" "swaylock"
"thunar" "thunar"
"wayland" "wayland"

View file

@ -13,18 +13,18 @@ in
programs.regreet = { programs.regreet = {
enable = true; enable = true;
package = pkgs.greetd.regreet; package = pkgs.greetd.regreet;
settings = { # settings = {
appearance = { # appearance = {
greeting_msg = "Back for more, I see."; # greeting_msg = "Back for more, I see.";
}; # };
GTK = { # GTK = {
application_prefer_dark_theme = true; # application_prefer_dark_theme = true;
cursor_theme_name = lib.mkForce "catppuccin-macchiato-dark-cursors"; # cursor_theme_name = lib.mkForce "catppuccin-macchiato-dark-cursors";
font_name = lib.mkForce "${font.name} ${font.size.desktop}"; # font_name = lib.mkForce "${font.name} ${font.size.desktop}";
icon_theme_name = lib.mkForce "Papirus-Dark"; # icon_theme_name = lib.mkForce "Papirus-Dark";
theme_name = lib.mkForce "catppuccin-macchiato-mauve-compact"; # theme_name = lib.mkForce "catppuccin-macchiato-mauve-compact";
}; # };
}; # };
# theme = { # theme = {
# name = "catppuccin-macchiato-mauve-compact"; # name = "catppuccin-macchiato-mauve-compact";
# package = pkgs.catppuccin-gtk.override { # package = pkgs.catppuccin-gtk.override {

View file

@ -1 +1,5 @@
{ programs.nh = { enable = true; }; } {
programs.nh = {
enable = true;
};
}

View file

@ -38,7 +38,7 @@ in
HTTP_PORT = service.ports.port0; HTTP_PORT = service.ports.port0;
}; };
# If you need to start from scratch, don't forget to turn this off again # If you need to start from scratch, don't forget to turn this off again
service.DISABLE_REGISTRATION = false; service.DISABLE_REGISTRATION = true;
actions = { actions = {
ENABLED = true; ENABLED = true;
DEFAULT_ACTIONS_URL = "github"; DEFAULT_ACTIONS_URL = "github";

View file

@ -275,6 +275,7 @@ body.theme-mastodon-light.layout-single-column {
--color-light-purple: #9588a6; --color-light-purple: #9588a6;
--color-dark-electric-blue: #9088a6; --color-dark-electric-blue: #9088a6;
--color-bg-75: #ffffffbf; --color-bg-75: #ffffffbf;
--color-bg-90: #ffffffe6;
--color-accent: var(--color-accent-dark); --color-accent: var(--color-accent-dark);
--color-ghost-button-text: var(--color-accent-dark); --color-ghost-button-text: var(--color-accent-dark);
--color-bg-compose-form: rgb(147 136 166 / .2); --color-bg-compose-form: rgb(147 136 166 / .2);
@ -586,6 +587,12 @@ body.layout-single-column {
box-shadow: 2px 4px 15px rgba(0, 0, 0, .2); box-shadow: 2px 4px 15px rgba(0, 0, 0, .2);
} }
/* Search icon fix for 4.4.0-alpha.1+mementomods-2024-12-15 changes */
.layout-single-column .search__icon {
right: 0;
top: 0;
}
.layout-single-column .list-editor__search .search__icon .icon { .layout-single-column .list-editor__search .search__icon .icon {
margin: 15px; margin: 15px;
} }
@ -683,11 +690,6 @@ body.layout-single-column {
display: inherit; display: inherit;
} }
/* Hide empty status cards alltogether (Mastodon 4.1.5-2023-07-29) */
.layout-single-column .status-card:has(.icon-file-text) {
display: none;
}
/* Hide empty YouTube description */ /* Hide empty YouTube description */
.layout-single-column .status-card__description:empty { .layout-single-column .status-card__description:empty {
display: none; display: none;
@ -790,9 +792,17 @@ body.layout-single-column {
color: var(--color-light-text); color: var(--color-light-text);
} }
/* Setting boxes */
.layout-single-column .column-header__collapsible-inner {
background-color: var(--color-bg);
border-color: var(--color-border);
}
/* Column-header border */ /* Column-header border */
.layout-single-column .column-header__collapsible { .layout-single-column .column-header__collapsible {
border-bottom: 1px solid var(--color-border); border-bottom: 1px solid var(--color-border);
border-left: 0;
border-right: 0;
} }
.layout-single-column .column-header__collapsible, .layout-single-column .column-header__collapsible,
@ -1482,9 +1492,8 @@ body.embed .detailed-status__display-avatar > img,
border: 0; border: 0;
} }
/* Nice active effect in the column header */
.layout-single-column .column-header__wrapper.active { .layout-single-column .column-header__wrapper.active {
box-shadow: var(--active-header-box-shadow); box-shadow: none;
} }
.layout-single-column .column-header__wrapper.active::before { .layout-single-column .column-header__wrapper.active::before {
@ -1680,9 +1689,6 @@ body.embed .video-player,
.layout-single-column .media-gallery__preview, .layout-single-column .media-gallery__preview,
.layout-single-column .video-player { .layout-single-column .video-player {
margin-left: calc(var(--size-avatar) + var(--gap-default)); margin-left: calc(var(--size-avatar) + var(--gap-default));
max-height: 430px;
/* stylelint-disable-next-line */
width: unset !important;
} }
body.embed [data-component="Video"] > div { body.embed [data-component="Video"] > div {
@ -1747,6 +1753,23 @@ body.embed .detailed-status .video-player,
margin-left: calc(var(--size-avatar) + var(--gap-default)); margin-left: calc(var(--size-avatar) + var(--gap-default));
} }
.layout-single-column .media-gallery.media-gallery__item--tall,
.layout-single-column .media-gallery.media-gallery--layout-1,
.layout-single-column .media-gallery.media-gallery--layout-2,
.layout-single-column .media-gallery.media-gallery--layout-3,
.layout-single-column .media-gallery.media-gallery--layout-4,
.layout-single-column .media-gallery__preview,
.layout-single-column .video-player {
max-height: 430px;
/* stylelint-disable-next-line */
width: unset !important;
}
.layout-single-column .media-gallery:has(.spoiler-button) .media-gallery__preview {
/* stylelint-disable-next-line */
width: 100% !important;
}
/* Detailed status update */ /* Detailed status update */
.layout-single-column .detailed-status .status__content { .layout-single-column .detailed-status .status__content {
font-size: var(--font-size-bigger); font-size: var(--font-size-bigger);
@ -3638,7 +3661,10 @@ body .compose-form .compose-form__uploads {
.layout-single-column .load-more path, .layout-single-column .load-more path,
.layout-single-column .account__domain-pill__popout__parts > div:nth-child(2) path, .layout-single-column .account__domain-pill__popout__parts > div:nth-child(2) path,
.layout-single-column .column-header__button .icon-sliders > path, .layout-single-column .column-header__button .icon-sliders > path,
.compose-form .icon-close > path { .compose-form .icon-close > path,
.layout-single-column .item-list .lists__item__title path,
.layout-single-column .lists__item .icon-button.active path,
.layout-single-column .dialog-modal__content .lists__item__title path {
display: none; display: none;
} }
@ -3750,6 +3776,14 @@ body .compose-form .compose-form__uploads {
background-image: var(--icon-sliders); background-image: var(--icon-sliders);
} }
.column-header__button.active .icon-sliders {
/* Use contrast icon */
background-image: var(--icon-sliders-contrast);
/* Disable rotate */
transform: none;
}
/* Administration icon */ /* Administration icon */
.layout-single-column .column-link .icon-tachometer { .layout-single-column .column-link .icon-tachometer {
--size-icon: 24px; --size-icon: 24px;
@ -3968,6 +4002,18 @@ body .compose-form .compose-form__uploads {
padding: 0; padding: 0;
} }
/* Fix back button background on mobile */
.app-body:not(.layout-multiple-columns):has(.column-back-button) .tabs-bar__wrapper::after {
background-color: var(--color-bg-90);
content: "";
height: 50px;
left: 0;
position: absolute;
top: 0;
width: 100%;
z-index: -1;
}
.layout-single-column .columns-area__panels__main { .layout-single-column .columns-area__panels__main {
width: calc(100% - var(--width-side-panel)); width: calc(100% - var(--width-side-panel));
} }
@ -3999,7 +4045,6 @@ body .compose-form .compose-form__uploads {
/* Mobile */ /* Mobile */
@media screen and (max-width: 889px) { @media screen and (max-width: 889px) {
/* Better blur overlay for ui-header */ /* Better blur overlay for ui-header */
.layout-single-column .ui::after { .layout-single-column .ui::after {
backdrop-filter: blur(12px); backdrop-filter: blur(12px);
@ -4251,6 +4296,11 @@ body .compose-form .compose-form__uploads {
overflow: hidden; overflow: hidden;
} }
/* Fix double border on media */
.layout-single-column .media-gallery .media-gallery__item .media-gallery__gifv {
border: 0;
}
/* Exception for your own profile media gallery */ /* Exception for your own profile media gallery */
.layout-single-column .account-gallery__container .media-gallery__gifv { .layout-single-column .account-gallery__container .media-gallery__gifv {
border-radius: 0; border-radius: 0;
@ -4271,10 +4321,13 @@ body .compose-form .compose-form__uploads {
/* Embeds outside Mastodon */ /* Embeds outside Mastodon */
body.embed { body.embed {
/* stylelint-disable-next-line */
background-color: #0e1014 !important;
/* Make sure with !important */ /* Make sure with !important */
/* stylelint-disable-next-line */ /* stylelint-disable-next-line */
background: transparent !important;
border: 0; border: 0;
/* stylelint-disable-next-line */
overflow: hidden !important;
} }
body.embed .entry .detailed-status { body.embed .entry .detailed-status {
@ -4517,30 +4570,12 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu
color: transparent; color: transparent;
} }
/* More compact header on mobile, thanks for the idea @nileane@nileane.fr! https://github.com/nileane/TangerineUI-for-Mastodon */ /* Header on mobile */
@media screen and (max-width: 1174px) { @media screen and (max-width: 1174px) {
.app-body:not(.layout-multiple-columns) .ui__header {
background-color: transparent;
border-bottom: 0;
}
.app-body:not(.layout-multiple-columns) .ui__header .ui__header__logo { .app-body:not(.layout-multiple-columns) .ui__header .ui__header__logo {
margin-left: 3px; margin-left: 3px;
} }
.app-body:not(.layout-multiple-columns) .tabs-bar__wrapper {
border-bottom: 0;
border-radius: 0;
box-shadow: none;
display: block;
height: 55px;
inset-inline-end: 105px;
inset-inline-start: 45px;
margin-bottom: -2px;
position: fixed;
top: 0;
}
/* stylelint-disable-next-line */ /* stylelint-disable-next-line */
.app-body:not(.layout-multiple-columns):not(:has(.ui .ui__header__links > .button[href="/auth/sign_in"])) .tabs-bar__wrapper { .app-body:not(.layout-multiple-columns):not(:has(.ui .ui__header__links > .button[href="/auth/sign_in"])) .tabs-bar__wrapper {
z-index: 3; z-index: 3;
@ -4550,47 +4585,47 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu
display: none; display: none;
} }
.app-body:not(.layout-multiple-columns)
:is(
.column-header,
.column-back-button,
.column-header__button,
.column-header__back-button
) {
background-color: transparent;
border: 0;
height: 55px;
margin: 0;
}
.app-body .column-header__icon { .app-body .column-header__icon {
display: none; display: none;
} }
/* Set a backdrop blur background to both top bars */ .app-body:not(.layout-multiple-columns) .columns-area__panels {
.app-body:not(.layout-multiple-columns) .ui::after { z-index: 2;
/* stylelint-disable-next-line */
-webkit-backdrop-filter: blur(20px);
backdrop-filter: blur(20px);
border-bottom: 1px solid var(--color-border);
content: "";
height: 55px;
left: 0;
position: fixed;
top: 0;
width: 100%;
z-index: 1;
} }
/* Remove margin between column settings and column header */ /* Set a backdrop blur background to both top bars */
.app-body:not(.layout-multiple-columns) .column-header__collapsible { .app-body:not(.layout-multiple-columns) .ui__header {
background-color: var(--color-bg-90);
height: 55px;
z-index: 5;
}
.app-body:not(.layout-multiple-columns):has(.column-header) .tabs-bar__wrapper::after {
background-color: var(--color-bg-90);
content: "";
height: 49px;
left: 0; left: 0;
position: fixed; position: absolute;
right: 0; top: 0;
width: 100%;
z-index: 0;
}
.ui:has([href="/auth/sign_in"]) .tabs-bar__wrapper::after,
.ui:has(.compose-form__submit) .tabs-bar__wrapper::after {
display: none;
}
.layout-single-column .column-header__collapsible {
border-bottom: 1px solid var(--color-border);
}
.layout-single-column .column-header__collapsible-inner {
background-color: var(--color-bg-90);
} }
.app-body:not(.layout-multiple-columns) .column-header__collapsible:not(.collapsed) { .app-body:not(.layout-multiple-columns) .column-header__collapsible:not(.collapsed) {
border-bottom: 1px solid var(--color-border); border-bottom: 0;
} }
} }
@ -4658,6 +4693,7 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu
.layout-single-column .notification-group--favourite .icon-star, .layout-single-column .notification-group--favourite .icon-star,
.layout-single-column .notification-favourite .icon-star { .layout-single-column .notification-favourite .icon-star {
background-image: var(--icon-heart-notification); background-image: var(--icon-heart-notification);
background-repeat: no-repeat;
} }
.layout-single-column .notification__filter-bar .icon-star, .layout-single-column .notification__filter-bar .icon-star,
@ -4764,7 +4800,7 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu
position: absolute; position: absolute;
} }
.star-icon.icon-button--with-counter .icon-button__counter { .layout-single-column.no-reduce-motion .star-icon.icon-button--with-counter .icon-button__counter {
margin-left: 20px; margin-left: 20px;
} }
@ -4817,6 +4853,7 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu
.layout-single-column .notification-group--favourite .icon-star, .layout-single-column .notification-group--favourite .icon-star,
.layout-single-column .notification-favourite .icon-star { .layout-single-column .notification-favourite .icon-star {
background-image: var(--icon-star-notification); background-image: var(--icon-star-notification);
background-repeat: no-repeat;
} }
.layout-single-column .notification__filter-bar .active .icon-star { .layout-single-column .notification__filter-bar .active .icon-star {
@ -4856,6 +4893,7 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu
top: 0; top: 0;
transform: none; transform: none;
width: unset; width: unset;
height: unset !important;
} }
.layout-single-column.no-reduce-motion .icon-button.star-icon.active .icon-star { .layout-single-column.no-reduce-motion .icon-button.star-icon.active .icon-star {
@ -4973,7 +5011,7 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu
} }
.layout-single-column button.icon-button.icon-button--with-counter.activate.star-icon > .icon-star { .layout-single-column button.icon-button.icon-button--with-counter.activate.star-icon > .icon-star {
left: -34px !important; left: 0 !important;
position: absolute !important; position: absolute !important;
top: unset !important; top: unset !important;
} }