add new wallpapers, back to fish and syntax changes

This commit is contained in:
Jo 2025-02-22 17:46:38 +01:00
parent 5266d697de
commit 8e37d6e64f
14 changed files with 102 additions and 89 deletions

View file

@ -55,6 +55,7 @@ in {
userSettings = {
"files.autoSave" = "on";
"workbench.colorTheme" = "Catppuccin Macchiato";
"window.titleBarStyle" = "custom";
"[nix]" = {
"editor.tabSize" = 2;

View file

@ -5,18 +5,16 @@
osConfig,
namespace,
...
}:
let
}: let
inherit (lib) mkIf mkOption;
inherit (lib.${namespace}) mkOpt;
cfg = config.${namespace}.desktop.gnome;
in
{
in {
options.${namespace}.desktop.gnome = with lib.types; {
enabled-extensions = mkOption {
type = listOf package;
default = with pkgs.gnomeExtensions; [ dash-to-dock user-themes blur-my-shell appindicator unite color-picker clipboard-history ];
example = [ dash-to-dock blur-my-shell ];
default = with pkgs.gnomeExtensions; [dash-to-dock user-themes blur-my-shell appindicator unite color-picker clipboard-history];
example = [dash-to-dock blur-my-shell];
description = "Specify gnome extensions to install.";
};
favorite-apps = mkOption {
@ -44,7 +42,7 @@ in
enable-blur = mkOpt bool false "Whether to enable blur-my-shell application blur.";
};
};
wallpaper = mkOpt str (builtins.toString ./wallpapers/arcane/jinx_flare.jpg) "Specify the path of your prefered Gnome wallpaper.";
wallpaper = mkOpt str (builtins.toString ./wallpapers/retro/snowy-map.png) "Specify the path of your prefered Gnome wallpaper.";
};
config = mkIf osConfig.${namespace}.desktop.gnome.enable {

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

View file

@ -3,13 +3,11 @@
config,
pkgs,
...
}:
let
}: let
inherit (lib) mkOption;
palette = (pkgs.lib.importJSON (config.catppuccin.sources.palette + "/palette.json")).${config.catppuccin.flavor}.colors;
in
{
options.palette = mkOption { type = lib.types.attrsOf lib.types.raw; };
in {
options.palette = mkOption {type = lib.types.attrsOf lib.types.raw;};
config = {
inherit palette;

View file

@ -3,12 +3,10 @@
config,
namespace,
...
}:
let
}: let
inherit (lib) mkEnableOption mkIf;
cfg = config.${namespace}.themes.catppuccin.black-box;
in
{
in {
options.${namespace}.themes.catppuccin.black-box = {
enable = mkEnableOption "Whether to enable the catppuccin theme for black-box.";
};

View file

@ -1,6 +1,3 @@
{
lib,
...
}: {
{lib, ...}: {
home.file.".config/fish/themes/Catppuccin\ Macchiato.theme".source = lib.snowfall.fs.get-file "resources/apps/fish/Catppuccin\ Macchiato.theme";
}

View file

@ -4,16 +4,15 @@
config,
pkgs,
...
}:
let
}: let
inherit (lib) mkEnableOption mkIf;
# Stolen from Oli @ git.gay, basically just themes default libadwaita components.
css = pkgs.writeTextFile {
name = "gtk-css";
text = ''
@define-color accent_color ${config.palette.maroon.hex};
@define-color accent_bg_color ${config.palette.maroon.hex};
@define-color accent_color ${config.palette.blue.hex};
@define-color accent_bg_color ${config.palette.blue.hex};
@define-color accent_fg_color ${config.palette.base.hex};
@define-color destructive_color ${config.palette.red.hex};
@define-color destructive_bg_color ${config.palette.red.hex};
@ -104,9 +103,8 @@ let
};
cfg = config.${namespace}.themes.catppuccin.gtk;
in
{
options.${namespace}.themes.catppuccin.gtk = { enable = mkEnableOption "Enable the Catppuccin theme for GTK"; };
in {
options.${namespace}.themes.catppuccin.gtk = {enable = mkEnableOption "Enable the Catppuccin theme for GTK";};
config = mkIf cfg.enable {
home.packages = with pkgs; [
@ -148,8 +146,8 @@ in
gtk = {
icon = {
enable = true;
accent = "maroon";
flavor = "mocha";
accent = "blue";
flavor = "macchiato";
};
};
};

View file

@ -3,12 +3,11 @@
namespace,
config,
...
}:
let
}: let
inherit (lib) mkEnableOption mkIf;
cfg = config.${namespace}.archetypes.workstation;
in {
options.${namespace}.archetypes.workstation = { enable = mkEnableOption "Enable the workstation archetype for your current system"; };
options.${namespace}.archetypes.workstation = {enable = mkEnableOption "Enable the workstation archetype for your current system";};
config = mkIf cfg.enable {
environment.sessionVariables = {

View file

@ -4,8 +4,7 @@
config,
pkgs,
...
}:
let
}: let
inherit (lib) mkEnableOption mkIf;
cfg = config.${namespace}.common.shell;
in {
@ -14,8 +13,8 @@ in {
};
config = mkIf cfg.enable {
environment.shells = with pkgs; [ nushell fish ];
users.defaultUserShell = pkgs.nushell;
environment.shells = with pkgs; [fish];
users.defaultUserShell = pkgs.fish;
programs.fish.enable = true;
};
}

View file

@ -3,12 +3,11 @@
namespace,
config,
...
}:
let
}: let
inherit (lib) mkEnableOption mkIf;
cfg = config.${namespace}.desktop.plasma;
in {
options.${namespace}.desktop.plasma = { enable = mkEnableOption "Whether to enable the KDE Plasma desktop environment"; };
options.${namespace}.desktop.plasma = {enable = mkEnableOption "Whether to enable the KDE Plasma desktop environment";};
config = mkIf cfg.enable {
services.xserver.enable = true;