From 72402fb9fd83cb13ed03b178e43d9d00e29dd5a0 Mon Sep 17 00:00:00 2001 From: atagen Date: Fri, 1 Mar 2024 01:50:37 +1100 Subject: [PATCH] plasma 6 --- flake.lock | 36 +++++++++---------- home/home.nix | 24 ++++++++++--- home/programs/firefox.nix | 76 ++++++++++++++++++++++++++++++++++----- home/programs/plasma.nix | 21 +++++++++-- system/configuration.nix | 8 ++--- 5 files changed, 128 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index db3df00..2044031 100644 --- a/flake.lock +++ b/flake.lock @@ -92,11 +92,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { @@ -210,11 +210,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1708995997, - "narHash": "sha256-klcPKN0HAaj1wDW5CSSGxRVoXXl4/Yflg9kQfZq2aRI=", + "lastModified": 1709201369, + "narHash": "sha256-L1n9nSYMvkHFctaMkIuCfBMxJ6qGhgsta0SBi0Gcld0=", "owner": "helix-editor", "repo": "helix", - "rev": "f46a09ab4f945273c7baf32e58438b501914fabb", + "rev": "d0bb77447138f5f70f96b174a8f29045a956c8c4", "type": "github" }, "original": { @@ -230,11 +230,11 @@ ] }, "locked": { - "lastModified": 1708988456, - "narHash": "sha256-RCz7Xe64tN2zgWk+MVHkzg224znwqknJ1RnB7rVqUWw=", + "lastModified": 1709204054, + "narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=", "owner": "nix-community", "repo": "home-manager", - "rev": "1d085ea4444d26aa52297758b333b449b2aa6fca", + "rev": "2f3367769a93b226c467551315e9e270c3f78b15", "type": "github" }, "original": { @@ -494,11 +494,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1708807242, - "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=", + "lastModified": 1709150264, + "narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a", + "rev": "9099616b93301d5cf84274b184a3a5ec69e94e08", "type": "github" }, "original": { @@ -526,11 +526,11 @@ }, "nur": { "locked": { - "lastModified": 1709022682, - "narHash": "sha256-+EDCJTDWBE5Eec5fUrUbAUzy6moSm+fh/ytXfFyCDR4=", + "lastModified": 1709211057, + "narHash": "sha256-Bd+pOFvVxfiF5LbLq4RsuhCAP++gPhv2g9vm+7+TYqY=", "owner": "nix-community", "repo": "NUR", - "rev": "016ff0e6f2448d76aef5337ad25bb5f7b0f5ed45", + "rev": "74be1009198dc18d3c974d85f7660e6e6c1c8184", "type": "github" }, "original": { @@ -636,11 +636,11 @@ ] }, "locked": { - "lastModified": 1708999822, - "narHash": "sha256-X55GxqI3oDEfqy38Pt7xyypYNly4bkd/RajFE+FGn+A=", + "lastModified": 1709172595, + "narHash": "sha256-0oYeE5VkhnPA7YBl+0Utq2cYoHcfsEhSGwraCa27Vs8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1a618c62479a6896ac497aaa0d969c6bd8e24911", + "rev": "72fa0217f76020ad3aeb2dd9dd72490905b23b6f", "type": "github" }, "original": { diff --git a/home/home.nix b/home/home.nix index 08f47d1..071f527 100644 --- a/home/home.nix +++ b/home/home.nix @@ -61,6 +61,21 @@ in { mpv gtk-engine-murrine + ( + (plasma5Packages.polonium.override {}).overrideAttrs + (old: { + version = "1.0.0-alpha"; + + src = fetchFromGitHub { + owner = "zeroxoneafour"; + repo = "polonium"; + rev = "94ba0faac40d2fbccebdb34bb4f7d6c7d162396f"; + hash = "sha256-uoL3GfGTj/rIQdWuBY0dBdEurkusSGF8YRnUS3gtvnQ="; + }; + + npmDepsHash = "sha256-kaT3Uyq+/JkmebakG9xQuR4Kjo7vk6BzI1/LffOj/eo="; + }) + ) ] ++ pkgs.rice.fonts.pkgs ++ pkgs.rice.icons.pkgs; @@ -153,10 +168,11 @@ in { }; systemd.user.startServices = "sd-switch"; - # ezServices = with pkgs; { - # swaybg = "${lib.getExe swaybg} -i ${rice.bg.image} -m fill"; - # # swayosd = "${lib.getExe' swayosd "swayosd"} --max-volume 100"; - # }; + ezServices = with pkgs; { + ckb-next = "${lib.getExe ckb-next} -c -b"; + # swaybg = "${lib.getExe swaybg} -i ${rice.bg.image} -m fill"; + # # swayosd = "${lib.getExe' swayosd "swayosd"} --max-volume 100"; + }; xdg.enable = true; xresources.properties = with palette-hex; { diff --git a/home/programs/firefox.nix b/home/programs/firefox.nix index b2c8644..397b233 100644 --- a/home/programs/firefox.nix +++ b/home/programs/firefox.nix @@ -3,9 +3,55 @@ lib, pkgs, ... -}: { +}: let + officialAddon = name: { + install_url = lib.strings.concatStrings ["https://addons.mozilla.org/firefox/downloads/latest/" name "/latest.xpi"]; + installation_mode = "force_installed"; + }; + lock-false = { + Value = false; + Status = "locked"; + }; + lock-true = { + Value = true; + Status = "locked"; + }; +in { config.programs.firefox = { enable = true; + policies = { + DisableTelemetry = true; + DisableFirefoxStudies = true; + EnableTrackingProtection = { + Value = true; + Locked = true; + Cryptomining = true; + Fingerprinting = true; + }; + DisablePocket = true; + DisableFirefoxAccounts = true; + DisableAccounts = true; + DisableFirefoxScreenshots = true; + DisableAppUpdate = true; + DisablePrivateBrowsing = true; + + OverrideFirstRunPage = ""; + OverridePostUpdatePage = ""; + DontCheckDefaultBrowser = true; + DisplayBookmarksToolbar = "newtab"; # alternatives: "always" or "newtab" + DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on" + SearchBar = "unified"; # alternative: "separate" + + ExtensionSettings = { + "*".installation_mode = "blocked"; # blocks all addons except the ones specified below + "uBlock0@raymondhill.net" = officialAddon "ublock-origin"; + "addon@darkreader.org" = officialAddon "darkreader"; + "keepassxc-browser@keepassxc.org" = officialAddon "keepassxc-browser"; + "vimium-c@gdh1995.cn" = officialAddon "vimium-c"; + "{b86e4813-687a-43e6-ab65-0bde4ab75758}" = officialAddon "localcdn-fork-of-decentraleyes"; + "plasma-browser-integration@kde.org" = officialAddon "plasma-integration"; + }; + }; profiles.default = { id = 0; name = "Default"; @@ -14,14 +60,26 @@ "widget.use-xdg-desktop-portal.file-picker" = 1; "widget.use-xdg-desktop-portal.mime-handler" = 1; }; - extensions = with pkgs.nur.repos.rycee.firefox-addons; [ - vimium-c - darkreader - localcdn - ublock-origin - keepassxc-browser - user-agent-string-switcher - ]; + }; + + Preferences = { + "extensions.pocket.enabled" = lock-false; + "extensions.screenshots.disabled" = lock-true; + "browser.topsites.contile.enabled" = lock-false; + "browser.formfill.enable" = lock-false; + "browser.search.suggest.enabled" = lock-false; + "browser.search.suggest.enabled.private" = lock-false; + "browser.urlbar.suggest.searches" = lock-false; + "browser.urlbar.showSearchSuggestionsFirst" = lock-false; + "browser.newtabpage.activity-stream.feeds.section.topstories" = lock-false; + "browser.newtabpage.activity-stream.feeds.snippets" = lock-false; + "browser.newtabpage.activity-stream.section.highlights.includePocket" = lock-false; + "browser.newtabpage.activity-stream.section.highlights.includeBookmarks" = lock-false; + "browser.newtabpage.activity-stream.section.highlights.includeDownloads" = lock-false; + "browser.newtabpage.activity-stream.section.highlights.includeVisited" = lock-false; + "browser.newtabpage.activity-stream.showSponsored" = lock-false; + "browser.newtabpage.activity-stream.system.showSponsored" = lock-false; + "browser.newtabpage.activity-stream.showSponsoredTopSites" = lock-false; }; }; } diff --git a/home/programs/plasma.nix b/home/programs/plasma.nix index 97fcb47..735901d 100644 --- a/home/programs/plasma.nix +++ b/home/programs/plasma.nix @@ -44,7 +44,7 @@ "kwin"."MoveZoomRight" = [ ]; "kwin"."MoveZoomUp" = [ ]; "kwin"."Overview" = "Meta+W"; - "kwin"."PoloniumCycleLayouts" = "Meta+\\,none"; + "kwin"."PoloniumCycleLayouts" = ", "; "kwin"."PoloniumEngineBTree" = [ ]; "kwin"."PoloniumEngineHalf" = [ ]; "kwin"."PoloniumEngineKWin" = [ ]; @@ -317,6 +317,7 @@ "kded5rc"."Module-statusnotifierwatcher"."autoload" = true; "kded5rc"."PlasmaBrowserIntegration"."shownCount" = 3; "kdeglobals"."DirSelect Dialog"."DirSelectDialog Size" = "634,678"; + "kdeglobals"."General"."AllowKDEAppsToRememberWindowPositions" = true; "kdeglobals"."General"."XftHintStyle" = "hintslight"; "kdeglobals"."General"."XftSubPixel" = "none"; "kdeglobals"."General"."fixed" = "MesloLGS NF,9,-1,5,50,0,0,0,0,0"; @@ -647,7 +648,7 @@ "khotkeysrc"."Data_3Conditions0"."Type" = "ACTIVE_WINDOW"; "khotkeysrc"."Data_3Conditions0Window"."Comment" = "Konqueror"; "khotkeysrc"."Data_3Conditions0Window"."WindowsCount" = 1; - "khotkeysrc"."Data_3Conditions0Window0"."Class" = "^konqueror\s"; + "khotkeysrc"."Data_3Conditions0Window0"."Class" = "^konquerors"; "khotkeysrc"."Data_3Conditions0Window0"."ClassType" = 3; "khotkeysrc"."Data_3Conditions0Window0"."Comment" = "Konqueror"; "khotkeysrc"."Data_3Conditions0Window0"."Role" = "konqueror-mainwindow#1"; @@ -857,6 +858,7 @@ "khotkeysrc"."Data_3_9Triggers0"."GesturePointData" = "0,0.0625,-0.5,0.5,1,0.0625,0.0625,-0.5,0.5,0.875,0.125,0.0625,-0.5,0.5,0.75,0.1875,0.0625,-0.5,0.5,0.625,0.25,0.0625,-0.5,0.5,0.5,0.3125,0.0625,-0.5,0.5,0.375,0.375,0.0625,-0.5,0.5,0.25,0.4375,0.0625,-0.5,0.5,0.125,0.5,0.0625,0.5,0.5,0,0.5625,0.0625,0.5,0.5,0.125,0.625,0.0625,0.5,0.5,0.25,0.6875,0.0625,0.5,0.5,0.375,0.75,0.0625,0.5,0.5,0.5,0.8125,0.0625,0.5,0.5,0.625,0.875,0.0625,0.5,0.5,0.75,0.9375,0.0625,0.5,0.5,0.875,1,0,0,0.5,1"; "khotkeysrc"."Data_3_9Triggers0"."Type" = "GESTURE"; "khotkeysrc"."DirSelect Dialog"."DirSelectDialog Size[$d]" = ""; + "khotkeysrc"."General"."AllowKDEAppsToRememberWindowPositions[$d]" = ""; "khotkeysrc"."General"."ColorSchemeHash[$d]" = ""; "khotkeysrc"."General"."ColorScheme[$d]" = ""; "khotkeysrc"."General"."XftHintStyle[$d]" = ""; @@ -928,16 +930,19 @@ "kwinrc"."NightColor"."NightTemperature" = 4600; "kwinrc"."Plugins"."desktopchangeosdEnabled" = true; "kwinrc"."Plugins"."kwin4_effect_dimscreenEnabled" = true; + "kwinrc"."Plugins"."kwin4_effect_fadedesktopEnabled" = true; "kwinrc"."Plugins"."kwin4_effect_squashEnabled" = false; "kwinrc"."Plugins"."kwin4_effect_translucencyEnabled" = true; "kwinrc"."Plugins"."magiclampEnabled" = true; "kwinrc"."Plugins"."magnifierEnabled" = true; "kwinrc"."Plugins"."poloniumEnabled" = true; "kwinrc"."Plugins"."sheetEnabled" = true; + "kwinrc"."Plugins"."slideEnabled" = false; "kwinrc"."Plugins"."slidebackEnabled" = true; "kwinrc"."Plugins"."wobblywindowsEnabled" = true; "kwinrc"."Plugins"."zoomEnabled" = false; "kwinrc"."Script-polonium"."Borders" = 3; + "kwinrc"."Script-polonium"."FilterClientCaption" = "Emoji Selector"; "kwinrc"."Script-polonium"."InsertionPoint" = 2; "kwinrc"."Script-polonium"."ResizeAmount" = 16; "kwinrc"."Script-polonium"."Unfullscreen" = true; @@ -948,15 +953,27 @@ "kwinrc"."Tiling.7cee4d9c-0c6a-5563-91f4-7c81d68172ce"."tiles" = "{\"layoutDirection\":\"vertical\",\"tiles\":[]}"; "kwinrc"."Tiling.fec5a356-f9de-520a-8d72-a01616b3b699"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[]}"; "kwinrc"."Wayland"."EnablePrimarySelection" = false; + "kwinrc"."Windows"."ActiveMouseScreen" = false; + "kwinrc"."Windows"."DelayFocusInterval" = 100; "kwinrc"."Windows"."ElectricBorderMaximize" = false; "kwinrc"."Windows"."ElectricBorderTiling" = false; "kwinrc"."Windows"."FocusPolicy" = "FocusFollowsMouse"; "kwinrc"."Xwayland"."Scale" = 1; "kwinrc"."org.kde.kdecoration2"."BorderSize" = "NoSides"; "kwinrc"."org.kde.kdecoration2"."BorderSizeAuto" = false; + "kwinrulesrc"."1"."Description" = "force titlebar/frame"; + "kwinrulesrc"."1"."noborderrule" = 2; + "kwinrulesrc"."1"."types" = 1; + "kwinrulesrc"."1"."wmclasscomplete" = true; + "kwinrulesrc"."3f0e83f7-aa1a-46d8-8796-5e9d49eb1d8b"."Description" = "New window settings"; + "kwinrulesrc"."3f0e83f7-aa1a-46d8-8796-5e9d49eb1d8b"."noborderrule" = 2; + "kwinrulesrc"."3f0e83f7-aa1a-46d8-8796-5e9d49eb1d8b"."types" = 1; + "kwinrulesrc"."General"."count" = 1; + "kwinrulesrc"."General"."rules" = 1; "kxkbrc"."Layout"."Options" = "caps:escape_shifted_compose"; "kxkbrc"."Layout"."ResetOldOptions" = true; "plasma-localerc"."Formats"."LANG" = "en_AU.UTF-8"; + "plasmanotifyrc"."Notifications"."PopupPosition" = "BottomCenter"; "plasmarc"."Theme"."name" = "breeze-dark"; "plasmarc"."Wallpapers"."usersWallpapers" = "/home/bolt/.nix/wallpaper.jpg"; "systemsettingsrc"."KFileDialog Settings"."detailViewIconSize" = 16; diff --git a/system/configuration.nix b/system/configuration.nix index 8bdbf9d..8a36ba6 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -80,10 +80,10 @@ services.udisks2.enable = true; services.xserver.enable = true; # SDDM requires this - services.xserver.desktopManager.plasma5.enable = true; + services.xserver.desktopManager.plasma6.enable = true; # new plasma! services.xserver.displayManager.sddm.enable = true; - services.xserver.displayManager.defaultSession = "plasmawayland"; - environment.plasma5.excludePackages = with pkgs.libsForQt5; [ + services.xserver.displayManager.defaultSession = "plasma"; + environment.plasma6.excludePackages = with pkgs.qt6Packages; [ konsole gwenview ]; @@ -144,7 +144,7 @@ alejandra - plasma5Packages.qtstyleplugin-kvantum + qt6Packages.qtstyleplugin-kvantum ]; documentation.dev.enable = true;