From 7cec90c2f2dc0017a6d4086e858d5225b998206b Mon Sep 17 00:00:00 2001 From: genofire Date: Wed, 14 Jun 2023 18:41:21 +0200 Subject: [PATCH] update --- home/default.nix | 12 +++++++-- home/desktop-gnome.nix | 55 ++++++++++++++++++++++++++++++++--------- home/desktop-sway.nix | 2 +- home/desktop.nix | 21 ++++++++++++---- home/firefox.nix | 19 ++++++++++++++ nixos/desktop-gnome.nix | 1 - nixos/desktop.nix | 4 +++ 7 files changed, 93 insertions(+), 21 deletions(-) diff --git a/home/default.nix b/home/default.nix index 23d3d59..2d20e03 100644 --- a/home/default.nix +++ b/home/default.nix @@ -158,7 +158,15 @@ programs.git = { enable = true; - extraConfig.init.defaultBranch = "main"; + extraConfig = { + init.defaultBranch = "main"; + filter.lfs = { + required = "true"; + clean = "git-lfs clean -- %f"; + smudge = "git-lfs smudge -- %f"; + process = "git-lfs filter-process"; + }; + }; }; programs.neovim = { enable = false; @@ -179,7 +187,7 @@ programs.helix = { enable = true; - languages = []; + languages.language = []; settings = { theme = "base16_default"; editor = { diff --git a/home/desktop-gnome.nix b/home/desktop-gnome.nix index 230ea8b..fa851b7 100644 --- a/home/desktop-gnome.nix +++ b/home/desktop-gnome.nix @@ -3,21 +3,22 @@ imports = [./desktop.nix]; dconf.settings = { + "com/gexperts/Tilix" = { + "focus-follow-mouse" = true; + }; "org/gnome/mutter" = { + "workspaces-only-on-primary" = true; # display: partly scale (like 150% or 125%) "experimental-features" = [ "scale-monitor-framebuffer" ]; }; - # key bindings - "org/gnome/shell/keybindings" = { - "switch-to-application-1" = []; - "switch-to-application-2" = []; - "switch-to-application-3" = []; - "switch-to-application-4" = []; - "switch-to-application-5" = []; - "switch-to-application-6" = []; - "switch-to-application-7" = []; - "switch-to-application-8" = []; - "switch-to-application-9" = []; + "org/gnome/desktop/input-sources" = { + "sources" = [ + (lib.hm.gvariant.mkTuple ["xkb" "de"]) + (lib.hm.gvariant.mkTuple ["xkb" "us"]) + ]; + }; + "org/gnome/desktop/sound" = { + "allow-volume-above-100-percent" = true; }; "org/gnome/desktop/wm/keybindings" = { "toggle-maximized" = [ "z" ]; @@ -51,10 +52,40 @@ "move-to-workspace-9" = [ "9" ]; "move-to-workspace-10" = [ "0" ]; }; + "org/gnome/shell" = { + "enabled-extensions" = [ + "places-menu@gnome-shell-extensions.gcampax.github.com" + "drive-menu@gnome-shell-extensions.gcampax.github.com" + "screenshot-window-sizer@gnome-shell-extensions.gcampax.github.com" + "auto-move-windows@gnome-shell-extensions.gcampax.github.com" + "pop-shell@system76.com" + "gsconnect@andyholmes.github.io" + ]; + }; + # key bindings + "org/gnome/shell/keybindings" = { + "switch-to-application-1" = []; + "switch-to-application-2" = []; + "switch-to-application-3" = []; + "switch-to-application-4" = []; + "switch-to-application-5" = []; + "switch-to-application-6" = []; + "switch-to-application-7" = []; + "switch-to-application-8" = []; + "switch-to-application-9" = []; + }; }; # programs.firefox.nativeMessagingHosts.gsconnect = true; - programs.firefox.enableGnomeExtensions = true; + + # new/replace + # programs.firefox.enableGnomeExtensions = true; + # TODO hä services.gnome.gnome-browser-connector.enable = true; + # programs.firefox.package = pkgs.firefox.overwrite { + # cfg = { + # enableGnomeExtensions = true; + # }; + #}; home.packages = with pkgs; [ tilix diff --git a/home/desktop-sway.nix b/home/desktop-sway.nix index 7324e20..3303042 100644 --- a/home/desktop-sway.nix +++ b/home/desktop-sway.nix @@ -427,7 +427,7 @@ exec_always "cat /proc/acpi/button/lid/*/state | grep -q open && swaymsg output # xdg.portal.enable = true; # xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-wlr ]; - programs.mako = { + services.mako = { enable = true; font = "monospace 7"; iconPath = "/home/genofire/.nix-profile/share/icons/Adwaita/:/home/genofire/.nix-profile/share/icons/hicolor/"; diff --git a/home/desktop.nix b/home/desktop.nix index d7a4f77..a8c780f 100644 --- a/home/desktop.nix +++ b/home/desktop.nix @@ -31,13 +31,12 @@ # gotify-desktop # use ntfy.sh instatt # apps virt-manager - lens + openlens evince gthumb gnome.seahorse gnome.cheese nextcloud-client - thunderbird-wayland dino # xmpp onlyoffice-bin libreoffice-fresh @@ -53,10 +52,10 @@ }) python310Packages.keyring graphviz-nox - # - tootle # mastodon + tootle # mastodon # fractal # matrix - # TODO fractal-next - # fluffychat + fractal-next + fluffychat cozy # audiobooks ]; gtk = { @@ -117,4 +116,16 @@ # # package = pkgs.firefox-devedition-bin; # package = pkgs.librewolf; }; + programs.thunderbird = { + enable = true; + package = pkgs.thunderbird-wayland; + settings = { + "general.useragent.override" = ""; + "privacy.donottrackheader.enabled" = true; + }; + profiles.default = { + isDefault = true; + withExternalGnupg = true; + }; + }; } diff --git a/home/firefox.nix b/home/firefox.nix index d9d7bea..16f212a 100644 --- a/home/firefox.nix +++ b/home/firefox.nix @@ -1,5 +1,10 @@ { pkgs, ... }: { + nixpkgs.config.packageOverrides = pkgs: { + nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") { + inherit pkgs; + }; + }; programs.firefox = { # package = pkgs.librewolf; # package = pkgs.firefox-wayland; @@ -17,7 +22,21 @@ #---- "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; "browser.newtabpage.activity-stream.showSponsored" = false; + #---- + "privacy.donottrackheader.enabled" = true; + # all cockies from cross-site blocked + "network.cookie.cookieBehavior" = 1; + # tracking in all tabs + "privacy.trackingprotection.enabled" = true; + "privacy.trackingprotection.cryptomining.enabled" = true; + "privacy.trackingprotection.fingerprinting.enabled" = true; }; + extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + # ublock-origin + # umatrix + # browserpass-ce + # tree-style-tab + ]; userChrome = '' @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); diff --git a/nixos/desktop-gnome.nix b/nixos/desktop-gnome.nix index 1525275..021e679 100644 --- a/nixos/desktop-gnome.nix +++ b/nixos/desktop-gnome.nix @@ -24,7 +24,6 @@ gnome.networkmanager-openvpn gnome.gnome-power-manager gnomeExtensions.pop-shell - gnomeExtensions.sound-output-device-chooser ]; programs.kdeconnect.package = pkgs.gnomeExtensions.gsconnect; } diff --git a/nixos/desktop.nix b/nixos/desktop.nix index 4fb3a07..a79949c 100644 --- a/nixos/desktop.nix +++ b/nixos/desktop.nix @@ -34,6 +34,10 @@ ## android-tools ]; + # syncthing + networking.firewall.allowedTCPPorts = [ 22000 ]; + networking.firewall.allowedUDPPorts = [ 22000 ]; + programs.browserpass.enable = true; # smartcard