diff --git a/core/display.nix b/core/display.nix index b7466f3..403fc9e 100644 --- a/core/display.nix +++ b/core/display.nix @@ -103,16 +103,18 @@ #enable = true; #xdgOpenUsePortal = true; #config = { + #common."org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ]; #common.default = [ "gtk" "gnome" ]; - #hyprland.default = [ "gtk" "hyprland" "gnome" ]; + #sway.default = [ "gtk" "gnome" ]; + #hyprland.default = [ "hyprland" "gtk" "gnome" ]; #}; - #extraPortals = with pkgs; [ + #configPackages = with pkgs; [ #xdg-desktop-portal-gtk #xdg-desktop-portal-wlr #xdg-desktop-portal-gnome #xdg-desktop-portal-hyprland #]; - #configPackages = with pkgs; [ + #extraPortals = with pkgs; [ #xdg-desktop-portal-gtk #xdg-desktop-portal-wlr #xdg-desktop-portal-gnome diff --git a/home/common/default.nix b/home/common/default.nix index dd04dc1..26f8095 100644 --- a/home/common/default.nix +++ b/home/common/default.nix @@ -23,15 +23,6 @@ home = { - pointerCursor = { - gtk.enable = true; - package = pkgs.bibata-cursors; - name = "Bibata-Modern-Classic"; - size = 12; - }; - - sessionVariables.GTK_THEME = "Adwaita-dark"; - packages = with pkgs; [ ## Games @@ -89,20 +80,12 @@ nheko.enable = true; # Matrix client for qt kitties neovim = { # Zoomer text editor enable = true; - defaultEditor = true; # Default but keeping micro around + defaultEditor = true; }; }; services = { - kdeconnect = { # Mobile <-> Desktop interaction - enable = true; - indicator = true; - }; - gnome-keyring = { # GTK keyring for login/sudo/ssh/gpg prompts - enable = true; - #components = [ ]; - }; }; home = { diff --git a/home/desktop/common/default.nix b/home/desktop/common/default.nix index fa159d2..72f0750 100644 --- a/home/desktop/common/default.nix +++ b/home/desktop/common/default.nix @@ -24,89 +24,144 @@ ]; - programs = { + xdg = { + portal = { + enable = false; + xdgOpenUsePortal = false; + config = { + common."org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ]; + common.default = [ "gtk" "gnome" ]; + sway.default = [ "gtk" "gnome" ]; + hyprland.default = [ "hyprland" "gtk" "gnome" ]; + }; + configPackages = with pkgs; [ + #xdg-desktop-portal + #xdg-desktop-portal-wlr + xdg-desktop-portal-gtk + xdg-desktop-portal-gnome + xdg-desktop-portal-hyprland + ]; + extraPortals = with pkgs; [ + #xdg-desktop-portal + #xdg-desktop-portal-wlr + xdg-desktop-portal-gtk + xdg-desktop-portal-gnome + xdg-desktop-portal-hyprland + ]; + }; + #userDirs = { + #extraConfig = { + #XDG_FLAKE_DIR = "${config.home.homeDirectory}/flakes/nixdots"; + #XDG_SYNC_DIR = "${config.home.homeDirectory}/Sync"; + #}; + #}; + }; + programs = { ## For when bimbo needs to play with platters and cbf to deal with cli gnome-disks.enable = true; + ## GTK secrets management seahorse.enable = true; - ## Apparently nm-applet has a programs option nm-applet = { enable = true; #indicator = false; }; - ## idk something for nautilus nautilus-open-any-terminal = { enable = true; terminal = "kitty"; }; - }; services = { + ## Daemon for easyeffects easyeffects.enable = true; + ## GTK keyring for password prompts + gnome-keyring.enable = true; + ## Another method to enable nm-applet network-manager-applet.enable = true; + ## Mobile <-> desktop interaction + kdeconnect = { + enable = true; + indicator = true; + }; }; - home.packages = with pkgs; [ + home = { - ## auth/security - polkit-kde-agent - hyprpolkitagent - gnome-keyring - gnome-secrets - seahorse + pointerCursor = { + gtk.enable = true; + package = pkgs.bibata-cursors; + name = "Bibata-Modern-Classic"; + size = 12; + }; - ## desktop - swww # Wallpaper daemon - dconf # GTK settings tweaker - waybar # Desktop status bar - blueman # GTK bluetooth manager - ydotool # Click/Keypress emulator - wlsunset # Blue light filter - wlr-randr # Display modesetting - wl-clipboard # Clipboard service - appimage-run # Runs appimages - brightnessctl # Control display brightness - syncthing-tray # File synchronisation - networkmanager # Network manager ... - networkmanagerapplet # Tray applet for networkmanager - gnome-control-center # GUI system settings - gnome-power-manager # GUI power and battery stats - gnome-calculator # GTK calculator - gnome-calendar # GTK calendar - gsmartcontrol # GUI for smartctl (smartmontools) - pavucontrol # Volume control centre - hyprpicker # Colour picker - hyprcursor # Cursor, duh - hypridle # Sleep/idle service - hyprlock # Screen lock - hyprshot # Screenshot - nautilus # GTK File manager - swayimg # Terminal based image viewer - zathura # PDF viewer - gparted # GUI partition editor - kitty # Terminal emulator - sushi # Previewer for nautilus + sessionVariables.GTK_THEME = "Adwaita-dark"; - ## fun - peaclock # Clock, but terminal - cmatrix # Terminal, but hacker - hyfetch # Fetch, but queer + packages = with pkgs; [ + ## auth/security + polkit-kde-agent + hyprpolkitagent + gnome-keyring + gnome-secrets + seahorse + ## desktop + swww # Wallpaper daemon + dconf # GTK settings tweaker + waybar # Desktop status bar + blueman # GTK bluetooth manager + ydotool # Click/Keypress emulator + wlsunset # Blue light filter + wlr-randr # Display modesetting + wl-clipboard # Clipboard service + appimage-run # Runs appimages + brightnessctl # Control display brightness + syncthing-tray # File synchronisation + networkmanager # Network manager ... + networkmanagerapplet # Tray applet for networkmanager + gnome-control-center # GUI system settings + gnome-power-manager # GUI power and battery stats + gnome-calculator # GTK calculator + gnome-calendar # GTK calendar + gsmartcontrol # GUI for smartctl (smartmontools) + pavucontrol # Volume control centre + hyprpicker # Colour picker + hyprcursor # Cursor, duh + hypridle # Sleep/idle service + hyprlock # Screen lock + hyprshot # Screenshot + nautilus # GTK File manager + swayimg # Terminal based image viewer + zathura # PDF viewer + gparted # GUI partition editor + kitty # Terminal emulator + sushi # Previewer for nautilus - ## misc, lib, compat - gnome-themes-extra - meson - wlroots - xwayland - wayland-utils - wayland-protocols - libsForQt5.qt5ct - libnotify - libva - #gitwatch - ]; + ## fun + peaclock # Clock, but terminal + cmatrix # Terminal, but hacker + hyfetch # Fetch, but queer + + ## misc, lib, compat + gnome-themes-extra + meson + wlroots + xwayland + wayland-utils + wayland-protocols + libsForQt5.qt5ct + libnotify + libva + #gitwatch + ]; + }; + + nix.gc = { + automatic = true; + frequency = "daily"; + options = "--delete-older-than 1d"; + }; }