diff --git a/assets/screenshot.png b/assets/screenshot.png index 985fcf4..e856da1 100644 Binary files a/assets/screenshot.png and b/assets/screenshot.png differ diff --git a/flake.lock b/flake.lock index 11f5a6b..7e637dc 100644 --- a/flake.lock +++ b/flake.lock @@ -244,11 +244,11 @@ }, "secrets": { "locked": { - "lastModified": 1737589360, - "narHash": "sha256-s4tCUlvzXpQQ1wJ7ZcslfVuszmQlmnp7bnoZRdnBZuw=", + "lastModified": 1746041665, + "narHash": "sha256-8j4PSYVf0lLV7QCEMxbJcSidP82tGTR/UUOCRg0lcFs=", "ref": "refs/heads/master", - "rev": "2cfed436d84594b4d4a73843095c75c644628dfe", - "revCount": 4, + "rev": "4243708e72569b4568b774bddb251954d4c51447", + "revCount": 5, "type": "git", "url": "ssh://git@git.caem.dev/caem/secrets.git" }, diff --git a/modules/home/caem/desktop/gnome/default.nix b/modules/home/caem/desktop/gnome/default.nix index a57294c..b8076a5 100644 --- a/modules/home/caem/desktop/gnome/default.nix +++ b/modules/home/caem/desktop/gnome/default.nix @@ -18,13 +18,13 @@ in { "image/png" = "org.gnome.Loupe.desktop"; "image/tiff" = "org.gnome.Loupe.desktop"; "image/webp" = "org.gnome.Loupe.desktop"; - "video/mp4" = "umpv.desktop"; - "video/mpeg" = "umpv.desktop"; - "video/ogg" = "umpv.desktop"; - "video/webm" = "umpv.desktop"; - "video/x-matroska" = "umpv.desktop"; - "video/x-msvideo" = "umpv.desktop"; - "video/quicktime" = "umpv.desktop"; + "video/mp4" = "mpv.desktop"; + "video/mpeg" = "mpv.desktop"; + "video/ogg" = "mpv.desktop"; + "video/webm" = "mpv.desktop"; + "video/x-matroska" = "mpv.desktop"; + "video/x-msvideo" = "mpv.desktop"; + "video/quicktime" = "mpv.desktop"; "x-scheme-handler/mailto" = "tutanota-desktop.desktop"; }; }; @@ -61,10 +61,21 @@ in { accent-directories.extensionUuid just-perfection.extensionUuid quick-settings-tweaker.extensionUuid + mpris-label.extensionUuid + weather-or-not.extensionUuid + dash-to-dock.extensionUuid + rounded-window-corners-reborn.extensionUuid + unite.extensionUuid ]; favorite-apps = [ "firefox-esr.desktop" + "emacs.desktop" "com.mitchellh.ghostty.desktop" + "signal-desktop.desktop" + "vesktop.desktop" + "tutanota-desktop.desktop" + "element-desktop.desktop" + "tidal-hifi.desktop" "org.gnome.Nautilus.desktop" ]; }; @@ -73,10 +84,60 @@ in { events-button = false; quick-settings-dark-mode = false; world-clock = false; + panel-size = 28; }; "org/gnome/shell/extensions/quick-settings-tweaks" = { notifications-enabled = false; }; + "org/gnome/shell/extensions/mpris-label" = { + divider-string = " - "; + extension-index = 0; + extension-place = "right"; + icon-padding = 5; + left-padding = 0; + right-padding = 0; + second-field = "xesam:title"; + use-whitelisted-sources-only = true; + mpris-sources-whitelist = "tidal-hifi"; + }; + "org/gnome/shell/extensions/unite" = { + extend-left-box = false; + greyscale-try-icons = false; + hide-activities-button = "never"; + hide-app-menu-icon = false; + hide-window-titlebars = "never"; + notifications-position = "center"; + reduce-panel-spacing = true; + show-appmenu-button = true; + show-desktop-name = false; + show-window-buttons = "never"; + show-window-title = "never"; + use-activities-text = false; + }; + "org/gnome/shell/extensions/weatherornot" = { + position = "right"; + }; + "org/gnome/shell/extensions/dash-to-dock" = { + always-center-icons = false; + apply-custom-theme = false; + background-color = "rgb(27,27,27)"; + custom-background-color = true; + background-opacity = 0.95; + custom-theme-shrink = true; + dash-max-icon-size = 48; + dock-fixed = true; + dock-position = "LEFT"; + extend-height = true; + height-fraction = 0.9; + hide-tooltip = false; + hot-keys = false; + show-apps-always-in-the-edge = true; + show-mounts = false; + show-icons-emblems = true; + show-show-apps-button = true; + show-trash = false; + transparency-mode = "FIXED"; + }; "org/gnome/desktop/wm/preferences" = { audible-bell = false; num-workspaces = 9; diff --git a/modules/nixos/desktop/gnome/default.nix b/modules/nixos/desktop/gnome/default.nix index 829f39c..ce3f08e 100644 --- a/modules/nixos/desktop/gnome/default.nix +++ b/modules/nixos/desktop/gnome/default.nix @@ -42,7 +42,11 @@ accent-directories just-perfection quick-settings-tweaker - forge + mpris-label + weather-or-not + dash-to-dock + rounded-window-corners-reborn + unite ]); environment.persistence."/nix/persist" = { diff --git a/modules/nixos/multimedia/web/firefox/default.nix b/modules/nixos/multimedia/web/firefox/default.nix index dc9c46e..09f1100 100644 --- a/modules/nixos/multimedia/web/firefox/default.nix +++ b/modules/nixos/multimedia/web/firefox/default.nix @@ -4,6 +4,24 @@ environment.systemPackages = with pkgs; [ tor-browser firefox-esr + (pkgs.makeDesktopItem { + name = "org.mozilla.firefox-esr"; + desktopName = "Firefox ESR"; + exec = "firefox-esr %U"; + icon = "firefox-esr"; + comment = "Browse the Web"; + categories = [ "Network" "WebBrowser" ]; + startupNotify = true; + mimeTypes = [ + "text/html" + "text/xml" + "application/xhtml+xml" + "application/vnd.mozilla.xul+xml" + "x-scheme-handler/http" + "x-scheme-handler/https" + "x-scheme-handler/ftp" + ]; + }) ]; environment.persistence."/nix/persist" = { diff --git a/overlays/nixpak/firefox-esr.nix b/overlays/nixpak/firefox-esr.nix index bd23c01..8236aaa 100644 --- a/overlays/nixpak/firefox-esr.nix +++ b/overlays/nixpak/firefox-esr.nix @@ -1,13 +1,13 @@ -# Shamelessly stolen most parts from here: -# https://github.com/ryan4yin/nix-config/blob/7deed26cc5a3af2072b8c89a688f265607babc80/hardening/nixpaks/firefox.nix -# https://github.com/schizofox/schizofox/blob/cdf69b2a445ff12680657a3bd44ce7c406bf2ae6/flake/modules/home-manager/default.nix - # NOTE: This overlay package is not compatible with the `programs.firefox` module # for both NixOS and home-manager. If you want to modify the configuration of # Firefox, you have to do it through modifying the overrides for the intermediary # package below. This configuration already sets sane defaults so it shouldn't be needed # but it is there in case you want it. +# Shamelessly stolen most parts from here: +# https://github.com/ryan4yin/nix-config/blob/7deed26cc5a3af2072b8c89a688f265607babc80/hardening/nixpaks/firefox.nix +# https://github.com/schizofox/schizofox/blob/cdf69b2a445ff12680657a3bd44ce7c406bf2ae6/flake/modules/home-manager/default.nix + { cfgPath, ... }: final: prev: { firefox-esr = let intermediary-firefox-esr = let