home/modules/firefox/config/bookmarks/config/flake/selfHosted.nix

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

home/modules/firefox/config/bookmarks/config/socialMedia.nix

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

home/modules/zed/config/extraPackages/default.nix

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

home/modules/zed/config/userSettings/config/lsp/default.nix

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

home/modules/zed/config/userSettings/config/terminal/default.nix

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

nixos/default.nix

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

nixos/modules/hyprland/default.nix

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

nixos/modules/hyprland/regreet.nix

@@ -13,18 +13,18 @@ in
   programs.regreet = {
     enable = true;
     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 = {
     #   name = "catppuccin-macchiato-mauve-compact";
     #   package = pkgs.catppuccin-gtk.override {

nixos/modules/nh.nix

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

nixos/modules/services/forgejo.nix

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

nixos/modules/services/mastodon/twitter.txt

@@ -275,7 +275,6 @@ body.theme-mastodon-light.layout-single-column {
   --color-light-purple: #9588a6;
   --color-dark-electric-blue: #9088a6;
   --color-bg-75: #ffffffbf;
-  --color-bg-90: #ffffffe6;
   --color-accent: var(--color-accent-dark);
   --color-ghost-button-text: var(--color-accent-dark);
   --color-bg-compose-form: rgb(147 136 166 / .2);
@@ -587,12 +586,6 @@ body.layout-single-column {
   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 {
   margin: 15px;
 }
@@ -690,6 +683,11 @@ body.layout-single-column {
   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 */
 .layout-single-column .status-card__description:empty {
   display: none;
@@ -792,17 +790,9 @@ body.layout-single-column {
   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 */
 .layout-single-column .column-header__collapsible {
   border-bottom: 1px solid var(--color-border);
-  border-left: 0;
-  border-right: 0;
 }
 
 .layout-single-column .column-header__collapsible,
@@ -1492,8 +1482,9 @@ body.embed .detailed-status__display-avatar > img,
   border: 0;
 }
 
+/* Nice active effect in the column header */
 .layout-single-column .column-header__wrapper.active {
-  box-shadow: none;
+  box-shadow: var(--active-header-box-shadow);
 }
 
 .layout-single-column .column-header__wrapper.active::before {
@@ -1689,6 +1680,9 @@ body.embed .video-player,
 .layout-single-column .media-gallery__preview,
 .layout-single-column .video-player {
   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 {
@@ -1753,23 +1747,6 @@ body.embed .detailed-status .video-player,
   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 */
 .layout-single-column .detailed-status .status__content {
   font-size: var(--font-size-bigger);
@@ -3661,10 +3638,7 @@ body .compose-form .compose-form__uploads {
 .layout-single-column .load-more path,
 .layout-single-column .account__domain-pill__popout__parts > div:nth-child(2) 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;
 }
 
@@ -3776,14 +3750,6 @@ body .compose-form .compose-form__uploads {
   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 */
 .layout-single-column .column-link .icon-tachometer {
   --size-icon: 24px;
@@ -4002,18 +3968,6 @@ body .compose-form .compose-form__uploads {
     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 {
     width: calc(100% - var(--width-side-panel));
   }
@@ -4045,6 +3999,7 @@ body .compose-form .compose-form__uploads {
 /* Mobile */
 @media screen and (max-width: 889px) {
 
+
   /* Better blur overlay for ui-header */
   .layout-single-column .ui::after {
     backdrop-filter: blur(12px);
@@ -4296,11 +4251,6 @@ body .compose-form .compose-form__uploads {
   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 */
 .layout-single-column .account-gallery__container .media-gallery__gifv {
   border-radius: 0;
@@ -4321,13 +4271,10 @@ body .compose-form .compose-form__uploads {
 
 /* Embeds outside Mastodon */
 body.embed {
-  /* stylelint-disable-next-line */
-  background-color: #0e1014 !important;
   /* Make sure with !important */
   /* stylelint-disable-next-line */
+  background: transparent !important;
   border: 0;
-  /* stylelint-disable-next-line */
-  overflow: hidden !important;
 }
 
 body.embed .entry .detailed-status {
@@ -4570,12 +4517,30 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu
   color: transparent;
 }
 
-/* Header on mobile */
+/* More compact header on mobile, thanks for the idea @nileane@nileane.fr! https://github.com/nileane/TangerineUI-for-Mastodon */
 @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 {
     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 */
   .app-body:not(.layout-multiple-columns):not(:has(.ui .ui__header__links > .button[href="/auth/sign_in"])) .tabs-bar__wrapper {
     z-index: 3;
@@ -4585,47 +4550,47 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu
     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 {
     display: none;
   }
 
-  .app-body:not(.layout-multiple-columns) .columns-area__panels {
-    z-index: 2;
-  }
-
   /* Set a backdrop blur background to both top bars */
-  .app-body:not(.layout-multiple-columns) .ui__header {
+  .app-body:not(.layout-multiple-columns) .ui::after {
-    background-color: var(--color-bg-90);
+    /* stylelint-disable-next-line */
-    height: 55px;
+    -webkit-backdrop-filter: blur(20px);
-    z-index: 5;
+    backdrop-filter: blur(20px);
-  }
+    border-bottom: 1px solid var(--color-border);
-
-  .app-body:not(.layout-multiple-columns):has(.column-header) .tabs-bar__wrapper::after {
-    background-color: var(--color-bg-90);
     content: "";
-    height: 49px;
+    height: 55px;
     left: 0;
-    position: absolute;
+    position: fixed;
     top: 0;
     width: 100%;
-    z-index: 0;
+    z-index: 1;
   }
 
-  .ui:has([href="/auth/sign_in"]) .tabs-bar__wrapper::after,
+  /* Remove margin between column settings and column header */
-  .ui:has(.compose-form__submit) .tabs-bar__wrapper::after {
+  .app-body:not(.layout-multiple-columns) .column-header__collapsible {
-    display: none;
+    left: 0;
-  }
+    position: fixed;
-
+    right: 0;
-  .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) {
-    border-bottom: 0;
+    border-bottom: 1px solid var(--color-border);
   }
 }
 
@@ -4693,7 +4658,6 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu
 .layout-single-column .notification-group--favourite .icon-star,
 .layout-single-column .notification-favourite .icon-star {
   background-image: var(--icon-heart-notification);
-  background-repeat: no-repeat;
 }
 
 .layout-single-column .notification__filter-bar .icon-star,
@@ -4800,7 +4764,7 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu
   position: absolute;
 }
 
-.layout-single-column.no-reduce-motion .star-icon.icon-button--with-counter .icon-button__counter {
+.star-icon.icon-button--with-counter .icon-button__counter {
   margin-left: 20px;
 }
 
@@ -4853,7 +4817,6 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu
 .layout-single-column .notification-group--favourite .icon-star,
 .layout-single-column .notification-favourite .icon-star {
   background-image: var(--icon-star-notification);
-  background-repeat: no-repeat;
 }
 
 .layout-single-column .notification__filter-bar .active .icon-star {
@@ -4893,7 +4856,6 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu
   top: 0;
   transform: none;
   width: unset;
-  height: unset !important;
 }
 
 .layout-single-column.no-reduce-motion .icon-button.star-icon.active .icon-star {
@@ -5011,7 +4973,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 {
-  left: 0 !important;
+  left: -34px !important;
   position: absolute !important;
   top: unset !important;
 }
@@ -5497,4 +5459,4 @@ div[tabindex="-1"] + div[tabindex="-1"] > .status__wrapper > .status-reply.statu
   }
 }
 
-2/2: If you prefer stars remove this line too */
+2/2: If you prefer stars remove this line too */