commit 44a34bf73ee1826b263158b34ff647230e14d5c8
parent 167eee741b125112b48e2c17a62427c4c0b160bf
Author: Katja Ramona Sophie Kwast (zaphyra) <git@zaphyra.eu>
Date: Sun, 10 Aug 2025 14:33:53 +0200
parent 167eee741b125112b48e2c17a62427c4c0b160bf
Author: Katja Ramona Sophie Kwast (zaphyra) <git@zaphyra.eu>
Date: Sun, 10 Aug 2025 14:33:53 +0200
nix-fmt
17 files changed, 160 insertions(+), 140 deletions(-)
M
|
149
+++++++++++++++++++++++++++++++++++++++----------------------------------------
M
|
48
+++++++++++++++++++++++++++---------------------
M
|
68
+++++++++++++++++++++++++++++++++++++++++++++++---------------------
diff --git a/config/home-manager/zaphyra/programs/dino.nix b/config/home-manager/zaphyra/programs/dino.nix @@ -1,6 +1,5 @@ { config, - lib, pkgs, ... }:
diff --git a/config/home-manager/zaphyra/programs/errands.nix b/config/home-manager/zaphyra/programs/errands.nix @@ -1,6 +1,5 @@ { config, - lib, pkgs, ... }:
diff --git a/config/home-manager/zaphyra/programs/eza.nix b/config/home-manager/zaphyra/programs/eza.nix @@ -1,7 +1,4 @@ { - config, - pkgs, - lib, ... }:
diff --git a/config/home-manager/zaphyra/programs/firefox.nix b/config/home-manager/zaphyra/programs/firefox.nix @@ -142,84 +142,83 @@ bahnbonus = handler; }; - Preferences = - { - "browser.uiCustomization.state".Status = "default"; - "browser.uiCustomization.state".Value = builtins.toJSON { - currentVersion = 21; - newElementCount = 7; - seen = [ ]; - dirtyAreaCache = [ ]; - placements = { - widget-overflow-fixed-list = [ ]; - toolbar-menubar = [ "menubar-items" ]; - vertical-tabs = [ ]; - PersonalToolbar = [ ]; - unified-extensions-area = [ ]; - nav-bar = [ - "back-button" - "forward-button" - "vertical-spacer" - "stop-reload-button" - "urlbar-container" - "downloads-button" - "_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action" - "ublock0_raymondhill_net-browser-action" - "unified-extensions-button" - ]; - TabsToolbar = [ - "tabbrowser-tabs" - "new-tab-button" - ]; - }; + Preferences = { + "browser.uiCustomization.state".Status = "default"; + "browser.uiCustomization.state".Value = builtins.toJSON { + currentVersion = 21; + newElementCount = 7; + seen = [ ]; + dirtyAreaCache = [ ]; + placements = { + widget-overflow-fixed-list = [ ]; + toolbar-menubar = [ "menubar-items" ]; + vertical-tabs = [ ]; + PersonalToolbar = [ ]; + unified-extensions-area = [ ]; + nav-bar = [ + "back-button" + "forward-button" + "vertical-spacer" + "stop-reload-button" + "urlbar-container" + "downloads-button" + "_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action" + "ublock0_raymondhill_net-browser-action" + "unified-extensions-button" + ]; + TabsToolbar = [ + "tabbrowser-tabs" + "new-tab-button" + ]; }; + }; + } + // ( + { + # disable some password-manager/autofill features + "signon.generation.enabled" = false; + "signon.autofillForms" = false; + "signon.firefoxRelay.feature" = "disabled"; + "signon.management.page.breach-alerts.enabled" = false; + + # ask websites to not share or sell data + "privacy.globalprivacycontrol.enabled" = true; + + # disable warning on `abou:config` + "browser.aboutConfig.showWarning" = false; + + # disable telemetry stuff + "browser.ping-centre.telemetry" = false; + "browser.topsites.contile.enabled" = false; + "browser.crashReports.unsubmittedCheck.autoSubmit2" = false; + + # disable trending search suggestions + "browser.urlbar.suggest.trending" = false; + + # disable 'fancy' newtab page bullshit with tons of tracking and ads + "browser.startup.homepage" = "chrome://browser/content/blanktab.html"; + "browser.newtabpage.enabled" = false; + "browser.newtabpage.activity-stream.telemetry" = false; + "browser.newtabpage.activity-stream.showSearch" = false; + "browser.newtabpage.activity-stream.showSponsored" = false; + "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; + "browser.newtabpage.activity-stream.feeds.telemetry" = false; + "browser.newtabpage.activity-stream.feeds.topsites" = false; + "browser.newtabpage.activity-stream.feeds.snippets" = false; + "browser.newtabpage.activity-stream.feeds.system.topsites" = false; + "browser.newtabpage.activity-stream.feeds.section.highlights" = false; + "browser.newtabpage.activity-stream.section.highlights.includePocket" = false; + "browser.newtabpage.activity-stream.section.highlights.includeBookmarks" = false; + "browser.newtabpage.activity-stream.section.highlights.includeDownloads" = false; + "browser.newtabpage.activity-stream.section.highlights.includeVisited" = false; } - // ( - { - # disable some password-manager/autofill features - "signon.generation.enabled" = false; - "signon.autofillForms" = false; - "signon.firefoxRelay.feature" = "disabled"; - "signon.management.page.breach-alerts.enabled" = false; - - # ask websites to not share or sell data - "privacy.globalprivacycontrol.enabled" = true; - - # disable warning on `abou:config` - "browser.aboutConfig.showWarning" = false; - - # disable telemetry stuff - "browser.ping-centre.telemetry" = false; - "browser.topsites.contile.enabled" = false; - "browser.crashReports.unsubmittedCheck.autoSubmit2" = false; - - # disable trending search suggestions - "browser.urlbar.suggest.trending" = false; - - # disable 'fancy' newtab page bullshit with tons of tracking and ads - "browser.startup.homepage" = "chrome://browser/content/blanktab.html"; - "browser.newtabpage.enabled" = false; - "browser.newtabpage.activity-stream.telemetry" = false; - "browser.newtabpage.activity-stream.showSearch" = false; - "browser.newtabpage.activity-stream.showSponsored" = false; - "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; - "browser.newtabpage.activity-stream.feeds.telemetry" = false; - "browser.newtabpage.activity-stream.feeds.topsites" = false; - "browser.newtabpage.activity-stream.feeds.snippets" = false; - "browser.newtabpage.activity-stream.feeds.system.topsites" = false; - "browser.newtabpage.activity-stream.feeds.section.highlights" = false; - "browser.newtabpage.activity-stream.section.highlights.includePocket" = false; - "browser.newtabpage.activity-stream.section.highlights.includeBookmarks" = false; - "browser.newtabpage.activity-stream.section.highlights.includeDownloads" = false; - "browser.newtabpage.activity-stream.section.highlights.includeVisited" = false; + |> lib.mapAttrs ( + name: value: { + Status = "locked"; + Value = value; } - |> lib.mapAttrs ( - name: value: { - Status = "locked"; - Value = value; - } - ) - ); + ) + ); ExtensionSettings = ( [
diff --git a/config/home-manager/zaphyra/programs/fish.nix b/config/home-manager/zaphyra/programs/fish.nix @@ -1,7 +1,5 @@ { config, - pkgs, - lib, ... }:
diff --git a/config/home-manager/zaphyra/programs/gajim.nix b/config/home-manager/zaphyra/programs/gajim.nix @@ -1,6 +1,5 @@ { config, - lib, pkgs, ... }:
diff --git a/config/home-manager/zaphyra/programs/gpg.nix b/config/home-manager/zaphyra/programs/gpg.nix @@ -1,5 +1,4 @@ { - inputs, lib, pkgs, ...
diff --git a/config/home-manager/zaphyra/programs/htop.nix b/config/home-manager/zaphyra/programs/htop.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ pkgs, ... }: {
diff --git a/config/home-manager/zaphyra/programs/mcfly.nix b/config/home-manager/zaphyra/programs/mcfly.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, ... }: {
diff --git a/config/home-manager/zaphyra/programs/mpv.nix b/config/home-manager/zaphyra/programs/mpv.nix @@ -1,7 +1,5 @@ { - config, pkgs, - lib, ... }:
diff --git a/config/home-manager/zaphyra/programs/overskride.nix b/config/home-manager/zaphyra/programs/overskride.nix @@ -2,6 +2,6 @@ { - home.packages = [ pkgs.overskride ]; + home.packages = [ pkgs.overskride ]; -}- \ No newline at end of file +}
diff --git a/config/home-manager/zaphyra/programs/sherlock.nix b/config/home-manager/zaphyra/programs/sherlock.nix @@ -1,4 +1,9 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: { @@ -40,12 +45,14 @@ async = true; shortcut = false; spawn_focus = false; - actions = [{ - name = "Show on wttr.in"; - exec = "https://www.wttr.in/darmstadt"; - icon = "emblem-symbolic-link"; - method = "web_launcher"; - }]; + actions = [ + { + name = "Show on wttr.in"; + exec = "https://www.wttr.in/darmstadt"; + icon = "emblem-symbolic-link"; + method = "web_launcher"; + } + ]; } { name = "App Launcher"; @@ -65,17 +72,17 @@ }; }; - systemd.user.services.sherlock = { - Unit = { - Description = "sherlock daemon"; - After = [ "graphical-session.target" ]; - }; - Service = { - ExecStart = "${lib.getExe pkgs.sherlock-launcher} --daemonize"; - Restart = "on-failure"; - RestartSec = 5; - }; - Install.WantedBy = [ "graphical-session.target" ]; - }; + # systemd.user.services.sherlock = { + # Unit = { + # Description = "sherlock daemon"; + # After = [ "graphical-session.target" ]; + # }; + # Service = { + # ExecStart = "${lib.getExe pkgs.sherlock-launcher} --daemonize"; + # Restart = "on-failure"; + # RestartSec = 5; + # }; + # Install.WantedBy = [ "graphical-session.target" ]; + # }; -}- \ No newline at end of file +}
diff --git a/config/home-manager/zaphyra/programs/swaylock.nix b/config/home-manager/zaphyra/programs/swaylock.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: { @@ -32,4 +37,4 @@ Install.WantedBy = [ "lock.target" ]; }; -}- \ No newline at end of file +}
diff --git a/config/home-manager/zaphyra/programs/tmux.nix b/config/home-manager/zaphyra/programs/tmux.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ ... }: {
diff --git a/config/home-manager/zaphyra/programs/tuba.nix b/config/home-manager/zaphyra/programs/tuba.nix @@ -1,6 +1,5 @@ { config, - lib, pkgs, ... }:
diff --git a/config/home-manager/zaphyra/programs/yt-dlp.nix b/config/home-manager/zaphyra/programs/yt-dlp.nix @@ -1,7 +1,5 @@ { - config, pkgs, - lib, ... }:
diff --git a/config/home-manager/zaphyra/services/waybar.nix b/config/home-manager/zaphyra/services/waybar.nix @@ -1,4 +1,5 @@ { + inputs, config, homeManagerModules, pkgs, @@ -62,12 +63,12 @@ tooltip = false; format = "{icon}"; format-icons = { - notification = " "; - dnd-notification = " <span foreground='red'><sup></sup></span>"; - dnd-none = " "; - inhibited-notification = " "; - dnd-inhibited-notification = " <span foreground='red'><sup></sup></span>"; - dnd-inhibited-none = " "; + notification = "<small></small>"; + dnd-notification = ""; + dnd-none = ""; + inhibited-notification = ""; + dnd-inhibited-notification = ""; + dnd-inhibited-none = ""; }; return-type = "json"; exec-if = "which swaync-client"; @@ -108,9 +109,9 @@ ); format-ethernet = " "; - format-wifi = " {essid} ({signalStrength}%)"; - format-linked = " "; - format-disconnected = " "; + format-wifi = " {essid} ({signalStrength}%)"; + format-linked = " "; + format-disconnected = " "; }; wireplumber = { @@ -125,11 +126,30 @@ ]; format = "{icon} {volume}%"; - format-muted = ""; + format-muted = ""; format-icons = [ - "" - " " - " " + "" + "" + "" + "" + "" + ]; + }; + + return-type = "json"; + format = " {icon} {percentage}%"; + format-icons = [ + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" ]; }; @@ -147,15 +167,22 @@ }; # Connected to AC - format = " <span color='white'>{capacity}%</span>"; + format = " <span color='white'>{capacity}%</span>"; # Not connected to AC - format-discharging = "{icon} <span color='white'>{capacity}%</span>"; + format-discharging = "{icon} <span color='white'>{capacity}%</span>"; format-icons = [ - " " - " " - " " - " " - " " + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" ]; tooltip-format = "{power} W, {timeTo}"; }; @@ -217,7 +244,6 @@ padding: 0px 15px; } - #network, #wireplumber, #battery, #language { background: rgba(255, 255, 255, 0.06); padding: 0px 15px; }