From 5fe54fe3daa4b14eca7f4fe15dfb188af754d500 Mon Sep 17 00:00:00 2001 From: k3t Date: Mon, 23 Mar 2026 16:53:09 -0600 Subject: [PATCH] updates, switch to qutebrowser, etc --- flake.lock | 18 ++++---- home/cfg/gtk.nix | 22 ++++++++++ home/cfg/keepassxc.nix | 1 + home/desktop.nix | 1 + hosts/desktop/configuration.nix | 2 - modules/desktop-common.nix | 75 ++++++++++++++++----------------- 6 files changed, 70 insertions(+), 49 deletions(-) create mode 100644 home/cfg/gtk.nix diff --git a/flake.lock b/flake.lock index c5db88d..1837afb 100755 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1774007980, - "narHash": "sha256-FOnZjElEI8pqqCvB6K/1JRHTE8o4rer8driivTpq2uo=", + "lastModified": 1774293042, + "narHash": "sha256-OEBV+Y5I4Ldu98k0KvGXRfJYh+jjE8ocCSL/dxTGs1s=", "owner": "nix-community", "repo": "home-manager", - "rev": "9670de2921812bc4e0452f6e3efd8c859696c183", + "rev": "bc357c75e3142a31b849ba49c5299fb52c61cf59", "type": "github" }, "original": { @@ -60,11 +60,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1773533765, - "narHash": "sha256-qonGfS2lzCgCl59Zl63jF6dIRRpvW3AJooBGMaXjHiY=", + "lastModified": 1774018263, + "narHash": "sha256-HHYEwK1A22aSaxv2ibhMMkKvrDGKGlA/qObG4smrSqc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f8e82243fd601afb9f59ad230958bd073795cbfe", + "rev": "2d4b4717b2534fad5c715968c1cece04a172b365", "type": "github" }, "original": { @@ -108,11 +108,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1773821835, - "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", + "lastModified": 1774106199, + "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", + "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", "type": "github" }, "original": { diff --git a/home/cfg/gtk.nix b/home/cfg/gtk.nix new file mode 100644 index 0000000..4c2b2f3 --- /dev/null +++ b/home/cfg/gtk.nix @@ -0,0 +1,22 @@ +{ pkgs, ... }: { + gtk = { + enable = true; + colorScheme = "dark"; + cursorTheme = { + name = "WhiteSur-cursors"; + package = pkgs.whitesur-cursors; + }; + theme = { + name = "Materia-dark"; + package = pkgs.materia-theme; + }; + gtk3 = { + enable = true; + colorScheme = "dark"; + }; + gtk4 = { + enable = true; + colorScheme = "dark"; + }; + }; +} \ No newline at end of file diff --git a/home/cfg/keepassxc.nix b/home/cfg/keepassxc.nix index da8b8e1..87d8967 100644 --- a/home/cfg/keepassxc.nix +++ b/home/cfg/keepassxc.nix @@ -8,6 +8,7 @@ SSHAgent.Enabled = true; SSHAgent.UseOpenSSH = true; Browser.Enabled = true; + GUI.ApplicationTheme = "dark"; }; }; xdg.autostart.enable = true; diff --git a/home/desktop.nix b/home/desktop.nix index 85a4558..40d778e 100644 --- a/home/desktop.nix +++ b/home/desktop.nix @@ -3,5 +3,6 @@ ./common.nix ./cfg/keepassxc.nix ./cfg/kitty.nix + ./cfg/gtk.nix ]; } diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index 360bd7c..4728049 100755 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -32,8 +32,6 @@ nicotine-plus lutris prismlauncher - wineWowPackages.waylandFull - virt-viewer winetricks ]; }; diff --git a/modules/desktop-common.nix b/modules/desktop-common.nix index 3927beb..c1c7257 100755 --- a/modules/desktop-common.nix +++ b/modules/desktop-common.nix @@ -166,36 +166,37 @@ enableSSHSupport = true; }; programs.kdeconnect.enable = true; - programs.firefox = { - enable = true; - package = pkgs.librewolf; - policies = { - DisableTelemetry = true; - DisableFirefoxStudies = true; - Preferences = { - "cookiebanners.service.mode.privateBrowsing" = 2; # Block cookie banners in private browsing - "cookiebanners.service.mode" = 2; # Block cookie banners - "privacy.donottrackheader.enabled" = true; - "privacy.fingerprintingProtection" = true; - "privacy.resistFingerprinting" = true; - "privacy.trackingprotection.emailtracking.enabled" = true; - "privacy.trackingprotection.enabled" = true; - "privacy.trackingprotection.fingerprinting.enabled" = true; - "privacy.trackingprotection.socialtracking.enabled" = true; - }; - ExtensionSettings = { - "jid1-ZAdIEUB7XOzOJw@jetpack" = { - install_url = "https://addons.mozilla.org/firefox/downloads/latest/duckduckgo-for-firefox/latest.xpi"; - installation_mode = "force_installed"; - }; - "uBlock0@raymondhill.net" = { - install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi"; - installation_mode = "force_installed"; - }; - }; - }; - }; - environment.etc."firefox/policies/policies.json".target = "librewolf/policies/policies.json"; + + #environment.etc."firefox/policies/policies.json".target = "librewolf/policies/policies.json"; + #programs.firefox = { + # enable = true; + # package = pkgs.librewolf; + # policies = { + # DisableTelemetry = true; + # DisableFirefoxStudies = true; + # Preferences = { + # "cookiebanners.service.mode.privateBrowsing" = 2; # Block cookie banners in private browsing + # "cookiebanners.service.mode" = 2; # Block cookie banners + # "privacy.donottrackheader.enabled" = true; + # "privacy.fingerprintingProtection" = true; + # "privacy.resistFingerprinting" = true; + # "privacy.trackingprotection.emailtracking.enabled" = true; + # "privacy.trackingprotection.enabled" = true; + # "privacy.trackingprotection.fingerprinting.enabled" = true; + # "privacy.trackingprotection.socialtracking.enabled" = true; + # }; + # ExtensionSettings = { + # "jid1-ZAdIEUB7XOzOJw@jetpack" = { + # install_url = "https://addons.mozilla.org/firefox/downloads/latest/duckduckgo-for-firefox/latest.xpi"; + # installation_mode = "force_installed"; + # }; + # "uBlock0@raymondhill.net" = { + # install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi"; + # installation_mode = "force_installed"; + # }; + # }; + # }; + #}; networking.firewall = { allowedTCPPortRanges = [ @@ -218,12 +219,17 @@ vscode.fhs signal-desktop spotify + easyeffects pulseaudio kdePackages.kwallet + virt-viewer + (qutebrowser.override { + enableWideVine = true; + }) (pkgs.kodi-wayland.withPackages (kodiPkgs: with kodiPkgs; [ inputstream-adaptive inputstream-ffmpegdirect - inputstream-rtmp + inputstream-rtmp inputstreamhelper bluetooth-manager vfs-sftp @@ -231,8 +237,6 @@ vfs-libarchive urllib3 upnext - trakt - trakt-module sponsorblock invidious simplecache @@ -249,11 +253,6 @@ visualization-goom visualization-fishbmc visualization-matrix - visualization-pictureit - visualization-shadertoy - visualization-spectrum - visualization-starburst - visualization-waveform ])) ]; };