From 5db6b40d2ef28a3fa21cf468af70c23cfa4c33f2 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Tue, 3 Oct 2023 09:18:50 -0400 Subject: [PATCH] feat(gtk): add dconf settings to set gtk theme and use new icon them --- config/hypr/main.conf | 4 ++-- nixos/configuration.nix | 1 - nixos/home/bashdots.nix | 2 -- nixos/home/dconf.nix | 24 ++++++++++++++++++++++++ nixos/home/hyprland.nix | 4 +--- nixos/home/main.nix | 3 ++- nixos/home/packages.nix | 7 ------- 7 files changed, 29 insertions(+), 16 deletions(-) create mode 100644 nixos/home/dconf.nix diff --git a/config/hypr/main.conf b/config/hypr/main.conf index 0d8d4e00..2992fcf4 100644 --- a/config/hypr/main.conf +++ b/config/hypr/main.conf @@ -15,11 +15,11 @@ exec-once = $HYPR_PATH/lisgd.sh & # See https://wiki.hyprland.org/Configuring/Keywords/ for more # Execute your favorite apps at launch -exec-once = bash -c "sleep 3; XDG_DATA_DIRS=$kora nm-applet" +exec-once = bash -c "sleep 3; nm-applet" exec-once = bash -c "sleep 4; blueberry-tray" exec-once = bash -c "sleep 5; nextcloud --background" -exec-once = XDG_DATA_DIRS=$kora ags +exec-once = ags exec-once = gnome-keyring-daemon --start --components=secrets exec-once = squeekboard diff --git a/nixos/configuration.nix b/nixos/configuration.nix index aac0f033..3412b337 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -30,7 +30,6 @@ environment.sessionVariables = { NIXPKGS_ALLOW_UNFREE = "1"; - GTK_THEME = "Dracula"; QT_QPA_PLATFORMTHEME = "qt5ct"; QT_FONT_DPI = "125"; }; diff --git a/nixos/home/bashdots.nix b/nixos/home/bashdots.nix index aaab59d5..d5d7a89d 100644 --- a/nixos/home/bashdots.nix +++ b/nixos/home/bashdots.nix @@ -43,8 +43,6 @@ ls = "ls -lah --color=auto"; cp = "cp -r"; - ags = "XDG_DATA_DIRS=/home/matt/.config/share ags"; - tup = "tailscale up --login-server https://headscale.nelim.org"; pc = "mosh matt@10.0.0.248 -- tmux -2u new -At laptop"; diff --git a/nixos/home/dconf.nix b/nixos/home/dconf.nix new file mode 100644 index 00000000..b10a279d --- /dev/null +++ b/nixos/home/dconf.nix @@ -0,0 +1,24 @@ +{ ... }: + +{ + dconf.settings = { + "org/virt-manager/virt-manager/connections" = { + autoconnect = ["qemu:///system"]; + uris = ["qemu:///system"]; + }; + + "apps/seahorse/listing" = { + keyrings-selected = [ "gnupg://" ]; + }; + + "org/gtk/settings/file-chooser" = { + show-hidden = true; + }; + + "org/gnome/desktop/interface" = { + color-scheme = "prefer-dark"; + gtk-theme = "Dracula"; + icon-theme = "Flat-Remix-Violet-Dark"; + }; + }; +} diff --git a/nixos/home/hyprland.nix b/nixos/home/hyprland.nix index 088422a5..c10b27e1 100644 --- a/nixos/home/hyprland.nix +++ b/nixos/home/hyprland.nix @@ -4,7 +4,7 @@ in { home.packages = [ pkgs.sassc - pkgs.kora-icon-theme + pkgs.flat-remix-icon-theme pkgs.coloryou ]; @@ -29,7 +29,6 @@ in extraConfig = '' env = XDG_DATA_DIRS, ${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}:${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}:$XDG_DATA_DIRS - $kora = "$HOME/.config/share" env = AGS_PATH, ${configDir}/ags/bin env = HYPR_PATH, ${configDir}/hypr/scripts @@ -42,7 +41,6 @@ in # https://www.reddit.com/r/NixOS/comments/vc3srj/comment/iccqxw1/?utm_source=share&utm_medium=web2x&context=3 xdg.configFile = { - "share/icons/hicolor".source = "${pkgs.kora-icon-theme}/share/icons/kora-pgrey"; "../.themes/Dracula".source = "${pkgs.dracula-theme}/share/themes/Dracula"; "Kvantum/Dracula".source = "${pkgs.dracula-theme}/share/Kvantum/Dracula"; diff --git a/nixos/home/main.nix b/nixos/home/main.nix index b3c9ef02..271b2c3a 100644 --- a/nixos/home/main.nix +++ b/nixos/home/main.nix @@ -1,4 +1,4 @@ -{ home-manager, ... }: +{ home-manager, ... }: { ## Global config to add home-manager module @@ -19,6 +19,7 @@ home-manager.users.matt = { imports = [ + ./dconf.nix ./hyprland.nix ./bashdots.nix ./dotfiles.nix diff --git a/nixos/home/packages.nix b/nixos/home/packages.nix index 11598eef..b4445645 100644 --- a/nixos/home/packages.nix +++ b/nixos/home/packages.nix @@ -1,13 +1,6 @@ { pkgs, ... }: { - dconf.settings = { - "org/virt-manager/virt-manager/connections" = { - autoconnect = ["qemu:///system"]; - uris = ["qemu:///system"]; - }; - }; - programs = { obs-studio = {