diff --git a/flake.lock b/flake.lock index 080958f..c09df02 100644 --- a/flake.lock +++ b/flake.lock @@ -234,6 +234,7 @@ "nixcord": "nixcord", "nixpkgs": "nixpkgs_3", "tt-discord": "tt-discord", + "tt-gtk": "tt-gtk", "tt-schemes": "tt-schemes", "tt-terminal": "tt-terminal" } @@ -290,6 +291,22 @@ "url": "https://git.lucy.rip/lucy/tinted-discord.git" } }, + "tt-gtk": { + "flake": false, + "locked": { + "lastModified": 1781724602, + "narHash": "sha256-UOBqSP+4PcbcR9S2hvhsH/V3U6ldFfV+QIjuObIgmTU=", + "ref": "refs/heads/main", + "rev": "f4d739fdb3c24886db4ceefac6e88703aca78bf6", + "revCount": 5, + "type": "git", + "url": "https://git.lucy.rip/lucy/tinted-gtk.git" + }, + "original": { + "type": "git", + "url": "https://git.lucy.rip/lucy/tinted-gtk.git" + } + }, "tt-schemes": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 1a67bc1..b139ee8 100644 --- a/flake.nix +++ b/flake.nix @@ -20,6 +20,10 @@ url = "git+https://git.lucy.rip/lucy/tinted-discord.git"; flake = false; }; + tt-gtk = { + url = "git+https://git.lucy.rip/lucy/tinted-gtk.git"; + flake = false; + }; }; outputs = diff --git a/modules/hosts/base/configuration.nix b/modules/hosts/base/configuration.nix index 5fc63ea..02ee02e 100644 --- a/modules/hosts/base/configuration.nix +++ b/modules/hosts/base/configuration.nix @@ -9,6 +9,21 @@ boot.loader.efi.canTouchEfiVariables = true; networking.networkmanager.enable = true; boot.kernelPackages = pkgs.linuxPackages_latest; + security.polkit = { + enable = true; + enablePkexecWrapper = true; + }; + xdg.portal = { + enable = true; + xdgOpenUsePortal = true; + extraPortals = [ + pkgs.xdg-desktop-portal-gtk + pkgs.xdg-desktop-portal-gnome + ]; + config = { + common.default = [ "gnome" ]; + }; + }; nix.settings.experimental-features = [ "nix-command" "flakes" @@ -25,7 +40,7 @@ enable = true; pulse.enable = true; }; - + nixpkgs.config.allowUnfree = true; users.users.lucy = { isNormalUser = true; @@ -41,6 +56,12 @@ git clang xournalpp + ripgrep + bat + ani-cli + thunar + thunar-volman + ]; programs.xppen = { enable = true; diff --git a/modules/hosts/base/home.nix b/modules/hosts/base/home.nix index 5b1f5bc..a65698a 100644 --- a/modules/hosts/base/home.nix +++ b/modules/hosts/base/home.nix @@ -1,4 +1,5 @@ { + inputs, pkgs, config, ... @@ -49,45 +50,25 @@ in }; cursorTheme.name = "macOS"; cursorTheme.size = 24; - gtk3.extraCss = '' - @define-color theme_bg_color ${c.base00}; - @define-color theme_fg_color ${c.base05}; - @define-color theme_base_color ${c.base00}; - @define-color theme_text_color ${c.base05}; - @define-color theme_selected_bg_color ${c.base0D}; - @define-color theme_selected_fg_color ${c.base00}; - @define-color insensitive_bg_color ${c.base01}; - @define-color insensitive_fg_color ${c.base03}; - @define-color borders ${c.base02}; - @define-color warning_color ${c.base0A}; - @define-color error_color ${c.base08}; - @define-color success_color ${c.base0B}; - ''; - gtk4.extraCss = '' - @define-color window_bg_color ${c.base00}; - @define-color window_fg_color ${c.base05}; - @define-color view_bg_color ${c.base00}; - @define-color view_fg_color ${c.base05}; - @define-color headerbar_bg_color ${c.base01}; - @define-color headerbar_fg_color ${c.base05}; - @define-color headerbar_border_color ${c.base02}; - @define-color sidebar_bg_color ${c.base01}; - @define-color sidebar_fg_color ${c.base05}; - @define-color card_bg_color ${c.base01}; - @define-color card_fg_color ${c.base05}; - @define-color popover_bg_color ${c.base01}; - @define-color popover_fg_color ${c.base05}; - @define-color dialog_bg_color ${c.base01}; - @define-color dialog_fg_color ${c.base05}; - @define-color accent_bg_color ${c.base0D}; - @define-color accent_fg_color ${c.base00}; - @define-color accent_color ${c.base0D}; - @define-color destructive_bg_color ${c.base08}; - @define-color destructive_color ${c.base08}; - @define-color warning_color ${c.base0A}; - @define-color error_color ${c.base08}; - @define-color success_color ${c.base0B}; - ''; + gtk3.extraCss = builtins.readFile (config.scheme inputs.tt-gtk); + gtk4.extraCss = builtins.readFile (config.scheme inputs.tt-gtk); + }; + xdg.portal = { + enable = true; + config = { + niri = { + default = [ + "gnome" + "gtk" + ]; + "org.freedesktop.impl.portal.Access" = [ "gtk" ]; + + "org.freedesktop.impl.portal.Notification" = [ "gtk" ]; + "org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ]; + }; + }; + }; + services.polkit-gnome.enable = true; # polkit dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark"; }