diff --git a/common/users.nix b/common/users.nix index ea05716..3f1611b 100644 --- a/common/users.nix +++ b/common/users.nix @@ -69,6 +69,7 @@ in options = [ "--cmd cd" ]; }; }; + xdg.enable = true; }; }; diff --git a/flake.lock b/flake.lock index 895df87..bc33c14 100644 --- a/flake.lock +++ b/flake.lock @@ -291,11 +291,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "lastModified": 1708655239, + "narHash": "sha256-ZrP/yACUvDB+zbqYJsln4iwotbH6CTZiTkANJ0AgDv4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "cbc4211f0afffe6dfd2478a62615dd5175a13f9a", "type": "github" }, "original": { diff --git a/linux/blitzar/gui.nix b/linux/blitzar/gui.nix index 7cee480..1dd2fee 100644 --- a/linux/blitzar/gui.nix +++ b/linux/blitzar/gui.nix @@ -1,86 +1,96 @@ -{ config, pkgs, ... }: +{ config, ... }: let usr = config.constants.userName; in { - home-manager.users.${usr} = { - home.packages = with pkgs; [ - exactaudiocopy - haruna - lutris - miru - nvtop-amd - picard - qbittorrent-qt5 - sweet - sweet-nova - tauon - telegram-desktop - thunderbird - wallpaper-engine-kde-plugin - wineWowPackages.waylandFull - winetricks - yorha-sound-theme - yuzu - ] ++ (with libsForQt5; [ - polonium - qt5.qtwebsockets - ]); - programs = { - firefox.enable = true; - gpg.enable = true; - kitty = { + home-manager.users.${usr} = { config, pkgs, ... }: + let xdgCfg = config.xdg; in { + gtk = { enable = true; - settings = { - background_opacity = "0.96"; - remember_window_size = "no"; + gtk2.configLocation = "${xdgCfg.configHome}/gtk-2.0/gtkrc"; + theme = { + name = "Sweet-Dark"; + package = pkgs.sweet; }; - theme = "Tokyo Night Moon"; }; - obs-studio.enable = true; - zathura = { - enable = true; - options = { - notification-error-bg = "#1d2021"; - notification-error-fg = "#fb4934"; - notification-warning-bg = "#1d2021"; - notification-warning-fg = "#fabd2f"; - notification-bg = "#1d2021"; - notification-fg = "#b8bb26"; - completion-bg = "#504945"; - completion-fg = "#ebdbb2"; - completion-group-bg = "#3c3836"; - completion-group-fg = "#928374"; - completion-highlight-bg = "#83a598"; - completion-highlight-fg = "#504945"; - index-bg = "#504945"; - index-fg = "#ebdbb2"; - index-active-bg = "#83a598"; - index-active-fg = "#504945"; - inputbar-bg = "#1d2021"; - inputbar-fg = "#ebdbb2"; - statusbar-bg = "#504945"; - statusbar-fg = "#ebdbb2"; - highlight-color = "#fabd2f"; - highlight-active-color = "#fe8019"; - default-bg = "#1d2021"; - default-fg = "#ebdbb2"; - render-loading = "true"; - render-loading-bg = "#1d2021"; - render-loading-fg = "#ebdbb2"; - recolor = "true"; - recolor-darkcolor = "#ebdbb2"; - recolor-lightcolor = "#1d2021"; - recolor-keephue = "true"; + home.packages = with pkgs; [ + exactaudiocopy + haruna + lutris + nvtop-amd + picard + qbittorrent-qt5 + sweet-nova + tauon + telegram-desktop + thunderbird + wallpaper-engine-kde-plugin + wineWowPackages.waylandFull + winetricks + yorha-sound-theme + yuzu + ] ++ (with libsForQt5; [ + polonium + qt5.qtwebsockets + ]); + programs = { + firefox.enable = true; + gpg = { + enable = true; + homedir = "${xdgCfg.dataHome}/gnupg"; + }; + kitty = { + enable = true; + settings = { + background_opacity = "0.96"; + remember_window_size = "no"; + }; + theme = "Tokyo Night Moon"; + }; + obs-studio.enable = true; + zathura = { + enable = true; + options = { + notification-error-bg = "#1d2021"; + notification-error-fg = "#fb4934"; + notification-warning-bg = "#1d2021"; + notification-warning-fg = "#fabd2f"; + notification-bg = "#1d2021"; + notification-fg = "#b8bb26"; + completion-bg = "#504945"; + completion-fg = "#ebdbb2"; + completion-group-bg = "#3c3836"; + completion-group-fg = "#928374"; + completion-highlight-bg = "#83a598"; + completion-highlight-fg = "#504945"; + index-bg = "#504945"; + index-fg = "#ebdbb2"; + index-active-bg = "#83a598"; + index-active-fg = "#504945"; + inputbar-bg = "#1d2021"; + inputbar-fg = "#ebdbb2"; + statusbar-bg = "#504945"; + statusbar-fg = "#ebdbb2"; + highlight-color = "#fabd2f"; + highlight-active-color = "#fe8019"; + default-bg = "#1d2021"; + default-fg = "#ebdbb2"; + render-loading = "true"; + render-loading-bg = "#1d2021"; + render-loading-fg = "#ebdbb2"; + recolor = "true"; + recolor-darkcolor = "#ebdbb2"; + recolor-lightcolor = "#1d2021"; + recolor-keephue = "true"; + }; + }; + }; + services = { + easyeffects.enable = true; + gpg-agent = { + enable = true; + pinentryFlavor = "qt"; }; }; }; - services = { - easyeffects.enable = true; - gpg-agent = { - enable = true; - pinentryFlavor = "qt"; - }; - }; - }; programs = { dconf.enable = true; diff --git a/template/context/flake.nix b/template/context/flake.nix index cc42ef0..2497136 100644 --- a/template/context/flake.nix +++ b/template/context/flake.nix @@ -10,6 +10,9 @@ in { devShells.default = pkgs.mkShell { packages = with pkgs; [ texlive.combined.scheme-full ]; + TEXMFHOME = "$XDG_DATA_HOME/texmf"; + TEXMFVAR = "$XDG_CACHE_HOME/texlive/texmf-var"; + EXMFCONFIG = "$XDG_CONFIG_HOME/texlive/texmf-config"; }; }); }