chore: move theme definition to separate file

This commit is contained in:
Nydragon 2024-06-27 17:45:20 +02:00
parent ae9d1d71bd
commit ab4f7ab638
No known key found for this signature in database
GPG key ID: 14AA30A865EA1209
6 changed files with 49 additions and 70 deletions

View file

@ -5,7 +5,7 @@
pkgs,
...
}:
rec {
{
imports = [
./firefox
./fish
@ -15,11 +15,11 @@ rec {
./thunderbird
./git
./vscodium
./themes/catppuccin.nix
];
dconf = {
enable = true;
settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
settings."org/virt-manager/virt-manager/connections" = {
autoconnect = [ "qemu:///system" ];
uris = [ "qemu:///system" ];
@ -28,30 +28,6 @@ rec {
services.blueman-applet.enable = true;
qt.platformTheme.name = "gtk";
gtk = {
enable = true;
theme = {
name = "Catppuccin-Frappe-Compact-Lavender-Dark";
package = pkgs.catppuccin-gtk.override {
accents = [ "lavender" ];
size = "compact";
variant = "frappe";
};
};
iconTheme = {
name = "Papirus-Dark";
package = pkgs.catppuccin-papirus-folders.override {
accent = "lavender";
flavor = "frappe";
};
};
cursorTheme = with home.pointerCursor; {
inherit name package size;
};
};
programs.direnv = {
enable = true;
nix-direnv.enable = true;
@ -62,14 +38,6 @@ rec {
inherit username;
inherit homeDirectory;
pointerCursor = {
gtk.enable = true;
x11.enable = true;
name = "catppuccin-frappe-lavender-cursors";
package = pkgs.catppuccin-cursors.frappeLavender;
size = 32;
};
packages =
let
pk = with pkgs; [

View file

@ -25,7 +25,7 @@ lib.mkIf osConfig.programs.firefox.enable {
definedAliases = [ "@nixpkg" ];
};
"NixOS Wiki" = {
urls = [ { template = "https://wiki.nixos.org/index.php?search={searchTerms}"; } ];
urls = [ { template = "https://wiki.nixos.org/w/index.php?search={searchTerms}"; } ];
icon = nixicon;
definedAliases = [ "@nixwiki" ];
};

View file

@ -138,7 +138,9 @@ lib.mkIf osConfig.programs.hyprland.enable {
"$mod, X, fullscreen, 1"
"$mod, F, fullscreen, 0"
"$mod, N, exec, ${pkgs.swaynotificationcenter}/bin/swaync-client -t"
"$mod, U, exec, ${pkgs.hyprpicker}/bin/hyprpicker -r -z & ${pkgs.hyprshot}/bin/hyprshot -o ~/Pictures/screenshots -m region"
"$mod CTRL, U, exec, ${pkgs.hyprpicker}/bin/hyprpicker -r -z & ${pkgs.hyprshot}/bin/hyprshot -o ~/Pictures/screenshots -m window"
"$mod SHIFT, U, exec, ${pkgs.hyprshot}/bin/hyprshot -o ~/Pictures/screenshots -m active -m output"
]
++ (
# workspaces

View file

@ -0,0 +1,39 @@
{ pkgs, ... }:
rec {
qt.platformTheme.name = "gtk";
dconf = {
enable = true;
settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
};
gtk = {
enable = true;
theme = {
name = "Catppuccin-Frappe-Compact-Lavender-Dark";
package = pkgs.catppuccin-gtk.override {
accents = [ "lavender" ];
size = "compact";
variant = "frappe";
};
};
iconTheme = {
name = "Papirus-Dark";
package = pkgs.catppuccin-papirus-folders.override {
accent = "lavender";
flavor = "frappe";
};
};
cursorTheme = with home.pointerCursor; {
inherit name package size;
};
};
home.pointerCursor = {
gtk.enable = true;
x11.enable = true;
name = "catppuccin-frappe-lavender-cursors";
package = pkgs.catppuccin-cursors.frappeLavender;
size = 32;
};
}

View file

@ -40,6 +40,7 @@
];
};
services.dbus.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
@ -54,6 +55,7 @@
hyprland.enable = true;
};
security.polkit.enable = true;
users = {
defaultUserShell = pkgs.fish;
users.${username} = {

View file

@ -5,7 +5,7 @@
...
}:
{
home-manager.users.${username} = rec {
home-manager.users.${username} = {
imports = [
../../home/firefox
../../home/fish
@ -18,51 +18,19 @@
../../home/hyprland
../../home/hyprlock
../../home/hypridle
../../home/themes/catppuccin.nix
];
programs.direnv = {
enable = true;
nix-direnv.enable = true;
};
dconf = {
enable = true;
settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
};
qt.platformTheme.name = "gtk";
gtk = {
enable = true;
theme = {
name = "Catppuccin-Frappe-Compact-Lavender-Dark";
package = pkgs.catppuccin-gtk.override {
accents = [ "lavender" ];
size = "compact";
variant = "frappe";
};
};
iconTheme = {
name = "Papirus-Dark";
package = pkgs.catppuccin-papirus-folders.override {
accent = "lavender";
flavor = "frappe";
};
};
cursorTheme = with home.pointerCursor; {
inherit name package size;
};
};
services.blueman-applet.enable = true;
home = {
stateVersion = config.system.stateVersion;
inherit username;
pointerCursor = {
gtk.enable = true;
x11.enable = true;
name = "catppuccin-frappe-lavender-cursors";
package = pkgs.catppuccin-cursors.frappeLavender;
size = 32;
};
packages =
let