alyraffauf/nixcfg
1
0
Fork 0
mirror of https://github.com/alyraffauf/nixcfg.git synced 2024-11-25 05:31:55 -05:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

change theme from catppuccin -> adwaita (#8)

Browse source 
* switch default gtk theme and colors to adw-gtk3

* vscodium: move to adwaita

* home/theme: switch qt theme to Adwaita-dark

* wlogout: migrate to adwaita and improve look and feel

* nixpkgs: remove adwaita overrides

* plymouth: remove catppuccin theme

* home/chromium: remove catppuccin theme

* emacs: remove catppuccin

* home/neovim: catppuccin -> ayu

* nixos/base: remove catppuccin console colors

* home/theme: switch to Bibata cursors

* nixos/lightdm: conform to default home theme

* home: remove theme overrides

* qlogout: fix regression with button:focus keeping entries highlighted when unhovered

* format with alejandra

* home/waybar: match colors to adwaita

* home/fuzzel: match selection colors with theme.colors

* mauville: remove overrided vscode theme

* aly: use firefox gnome theme

* rustboro: decrease cursor size override

* nixos/options: remove catppuccin references

* home/theme: fixed regression in theme.gtk.hideTitleBar
This commit is contained in:
Aly Raffauf 2024-07-01 22:59:41 -04:00 committed by GitHub
parent 47aaefdae1
commit da2cbecbe7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
22 changed files with 142 additions and 338 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
homeManagerModules/apps/chromium/default.nix
View file

@ -14,7 +14,6 @@
{id = "mnjggcdmjocbbbhaepdhchncahnbgone";} # sponsorblock {id = "mnjggcdmjocbbbhaepdhchncahnbgone";} # sponsorblock
{id = "oboonakemofpalcgghocfoadofidjkkk";} # keepassxc {id = "oboonakemofpalcgghocfoadofidjkkk";} # keepassxc
{id = "ocabkmapohekeifbkoelpmppmfbcibna";} # zoom redirector {id = "ocabkmapohekeifbkoelpmppmfbcibna";} # zoom redirector
{id = "olhelnoplefjdmncknfphenjclimckaf";} # catppuccin frappe
]; ];
}; };
}; };

5
homeManagerModules/apps/emacs/default.nix
View file

@ -7,9 +7,10 @@
config = lib.mkIf config.ar.home.apps.emacs.enable { config = lib.mkIf config.ar.home.apps.emacs.enable {
programs.emacs = { programs.emacs = {
enable = true; enable = true;
extraConfig = builtins.readFile ./emacs.el;
extraPackages = epkgs: (with epkgs; [ extraPackages = epkgs: (with epkgs; [
better-defaults better-defaults
catppuccin-theme
markdown-mode markdown-mode
nix-mode nix-mode
org org
@ -26,8 +27,8 @@
yaml yaml
yaml-mode yaml-mode
]); ]);
package = pkgs.emacs-nox; package = pkgs.emacs-nox;
extraConfig = builtins.readFile ./emacs.el;
}; };
}; };
} }

5
homeManagerModules/apps/emacs/emacs.el
View file

@ -1,8 +1,3 @@
; Load catppuccin theme.
;(load-theme 'catppuccin :no-confirm)
;(setq catppuccin-flavor 'mocha) ;; or 'latte, 'macchiato, or 'mocha
;(catppuccin-reload)
;(defun on-after-init () ;(defun on-after-init ()
; (unless (display-graphic-p (selected-frame)) ; (unless (display-graphic-p (selected-frame))
; (set-face-background 'default "unspecified-bg" (selected-frame)))) ; (set-face-background 'default "unspecified-bg" (selected-frame))))

14
homeManagerModules/apps/fuzzel/default.nix
View file

@ -8,6 +8,11 @@
programs.fuzzel = { programs.fuzzel = {
enable = true; enable = true;
settings = { settings = {
border = {
radius = 10;
width = 2;
};
main = { main = {
font = "${config.ar.home.theme.terminalFont.name}:size=${toString config.ar.home.theme.terminalFont.size}"; font = "${config.ar.home.theme.terminalFont.name}:size=${toString config.ar.home.theme.terminalFont.size}";
icon-theme = "${config.ar.home.theme.iconTheme.name}"; icon-theme = "${config.ar.home.theme.iconTheme.name}";
@ -16,16 +21,13 @@
terminal = lib.getExe config.ar.home.defaultApps.terminal; terminal = lib.getExe config.ar.home.defaultApps.terminal;
width = 36; width = 36;
}; };
border = {
radius = 10;
width = 2;
};
colors = { colors = {
background = "${config.ar.home.theme.colors.background}CC"; background = "${config.ar.home.theme.colors.background}CC";
border = "${config.ar.home.theme.colors.primary}EE"; border = "${config.ar.home.theme.colors.primary}EE";
selection = "${config.ar.home.theme.colors.background}FF"; selection = "${config.ar.home.theme.colors.background}FF";
selection-match = "#e78284FF"; selection-match = "${config.ar.home.theme.colors.primary}FF";
selection-text = "#f4b8e4FF"; selection-text = "${config.ar.home.theme.colors.secondary}FF";
text = "${config.ar.home.theme.colors.text}FF"; text = "${config.ar.home.theme.colors.text}FF";
}; };
}; };

11
homeManagerModules/apps/neovim/default.nix
View file

@ -7,13 +7,7 @@
config = lib.mkIf config.ar.home.apps.neovim.enable { config = lib.mkIf config.ar.home.apps.neovim.enable {
programs.nixvim = { programs.nixvim = {
enable = true; enable = true;
viAlias = true; colorschemes.ayu.enable = true;
vimAlias = true;
colorschemes.catppuccin = {
enable = true;
settings.flavor = "frappe";
};
plugins = { plugins = {
lightline.enable = true; lightline.enable = true;
@ -22,6 +16,9 @@
neogit.enable = true; neogit.enable = true;
nix.enable = true; nix.enable = true;
}; };
viAlias = true;
vimAlias = true;
}; };
}; };
} }

16
homeManagerModules/apps/vsCodium/default.nix
View file

@ -31,19 +31,14 @@
"window.zoomPerWindow" = false; "window.zoomPerWindow" = false;
"workbench.colorTheme" = "workbench.colorTheme" =
if config.ar.home.theme.colors.preferDark if config.ar.home.theme.colors.preferDark
then "Catppuccin Frappé" then "Adwaita Dark"
else "Catppuccin Latte"; else "Adwaita";
"workbench.iconTheme" = "workbench.iconTheme" = "null";
if config.ar.home.theme.colors.preferDark "workbench.preferredDarkColorTheme" = "Adwaita Dark";
then "catppuccin-frappe" "workbench.preferredLightColorTheme" = "Adwaita";
else "catppuccin-latte";
"workbench.preferredDarkColorTheme" = "Catppuccin Frappé";
"workbench.preferredLightColorTheme" = "Catppuccin Latte";
}; };
extensions = with pkgs.vscode-extensions; [ extensions = with pkgs.vscode-extensions; [
catppuccin.catppuccin-vsc
catppuccin.catppuccin-vsc-icons
coolbear.systemd-unit-file coolbear.systemd-unit-file
github.vscode-github-actions github.vscode-github-actions
github.vscode-pull-request-github github.vscode-pull-request-github
@ -52,6 +47,7 @@
ms-python.python ms-python.python
ms-vscode.cpptools-extension-pack ms-vscode.cpptools-extension-pack
oderwat.indent-rainbow oderwat.indent-rainbow
piousdeer.adwaita-theme
rubymaniac.vscode-paste-and-indent rubymaniac.vscode-paste-and-indent
rust-lang.rust-analyzer rust-lang.rust-analyzer
tomoki1207.pdf tomoki1207.pdf

8
homeManagerModules/apps/waybar/default.nix
View file

@ -199,7 +199,7 @@
#mode { #mode {
padding: 0 15px; padding: 0 15px;
margin: 0 5px; margin: 0 5px;
color: #e78284; color: #FFFFFF;
} }
#tags button { #tags button {
@ -253,8 +253,8 @@
border-radius: 10; border-radius: 10;
background: rgba ${ background: rgba ${
if config.ar.home.theme.colors.preferDark if config.ar.home.theme.colors.preferDark
then "(35, 38, 52, 0.8);" then "(36, 36, 36, 0.8);"
else "(220, 224, 232, 0.8);" else "(250, 250, 250, 0.8);"
} }
margin: 5px 10px 0px 10px; margin: 5px 10px 0px 10px;
padding: 0px 10px 0px 10px; padding: 0px 10px 0px 10px;
@ -267,7 +267,7 @@
#submap, #submap,
#mode { #mode {
color: ${config.ar.home.theme.colors.text}; color: ${config.ar.home.theme.colors.text};
background: rgba(231, 130, 132, 0.8); background: rgba(255, 123, 99, 0.8);
} }
''; '';
}; };

32
homeManagerModules/apps/wlogout/default.nix
View file

@ -7,6 +7,7 @@
config = lib.mkIf config.ar.home.apps.wlogout.enable { config = lib.mkIf config.ar.home.apps.wlogout.enable {
programs.wlogout = { programs.wlogout = {
enable = true; enable = true;
layout = [ layout = [
{ {
label = "logout"; label = "logout";
@ -27,35 +28,36 @@
keybind = "r"; keybind = "r";
} }
]; ];
style = '' style = ''
* { * {
background-image: none;
box-shadow: none;
font-family: "${config.ar.home.theme.font.name}", sans-serif; font-family: "${config.ar.home.theme.font.name}", sans-serif;
background-image: none;
box-shadow: none;
transition: 20ms; transition: 20ms;
} }
window { window {
background-color: rgba(35, 38, 52, 0.8); background-color: rgba(35, 38, 52, 0.8);
} }
button { button {
text-decoration-color: #FAFAFA; background-color: ${config.ar.home.theme.colors.background};
color: #FAFAFA; background-position: center;
background-color: ${config.ar.home.theme.colors.background}; background-repeat: no-repeat;
background-color: rgba(12, 12, 12, 0.0); background-size: 25%;
background-repeat: no-repeat; border-color: ${config.ar.home.theme.colors.primary};
background-size: 10%;
border-radius: 10; border-radius: 10;
border-style: solid;
border-width: 2;
color: ${config.ar.home.theme.colors.text};
margin: 5px;
text-decoration-color: ${config.ar.home.theme.colors.text};
} }
button:active, button:hover { button:active, button:hover {
background-color: ${config.ar.home.theme.colors.primary}; background-color: ${config.ar.home.theme.colors.primary};
outline-style: none; outline-style: none;
}
#lock, #logout, #suspend, #hibernate, #shutdown, #reboot {
padding: 0;
} }
#lock { #lock {

31
homeManagerModules/options.nix
View file

@ -238,13 +238,13 @@
gtk = { gtk = {
name = lib.mkOption { name = lib.mkOption {
description = "GTK theme name."; description = "GTK theme name.";
default = "catppuccin-frappe-mauve-compact+normal"; default = "adw-gtk3-dark";
type = lib.types.str; type = lib.types.str;
}; };
package = lib.mkOption { package = lib.mkOption {
description = "GTK theme package."; description = "GTK theme package.";
default = pkgs.catppuccin-gtk; default = pkgs.adw-gtk3;
type = lib.types.package; type = lib.types.package;
}; };
@ -257,17 +257,18 @@
qt = { qt = {
name = lib.mkOption { name = lib.mkOption {
description = "Qt Kvantum theme name."; description = "Qt theme name.";
default = "Catppuccin-Frappe-Mauve"; default = "Adwaita-Dark";
type = lib.types.str; type = lib.types.str;
}; };
package = lib.mkOption { package = lib.mkOption {
description = "Qt Kvantum theme package."; description = "Qt theme package.";
default = pkgs.catppuccin-kvantum; default = pkgs.adwaita-qt;
type = lib.types.package; type = lib.types.package;
}; };
}; };
iconTheme = { iconTheme = {
name = lib.mkOption { name = lib.mkOption {
description = "Icon theme name."; description = "Icon theme name.";
@ -277,7 +278,7 @@
package = lib.mkOption { package = lib.mkOption {
description = "Icon theme package."; description = "Icon theme package.";
default = pkgs.catppuccin-papirus-folders; default = pkgs.papirus-icon-theme;
type = lib.types.package; type = lib.types.package;
}; };
}; };
@ -285,19 +286,19 @@
cursorTheme = { cursorTheme = {
name = lib.mkOption { name = lib.mkOption {
description = "Cursor theme name."; description = "Cursor theme name.";
default = "catppuccin-frappe-dark-cursors"; default = "Bibata-Modern-Classic";
type = lib.types.str; type = lib.types.str;
}; };
size = lib.mkOption { size = lib.mkOption {
description = "Cursor size."; description = "Cursor size.";
default = 24; default = 20;
type = lib.types.int; type = lib.types.int;
}; };
package = lib.mkOption { package = lib.mkOption {
description = "Cursor theme package."; description = "Cursor theme package.";
default = pkgs.catppuccin-cursors.frappeDark; default = pkgs.bibata-cursors;
type = lib.types.package; type = lib.types.package;
}; };
}; };
@ -351,31 +352,31 @@
text = lib.mkOption { text = lib.mkOption {
description = "Text color."; description = "Text color.";
default = "#FAFAFA"; default = "#FFFFFF";
type = lib.types.str; type = lib.types.str;
}; };
background = lib.mkOption { background = lib.mkOption {
description = "Background color."; description = "Background color.";
default = "#232634"; default = "#242424";
type = lib.types.str; type = lib.types.str;
}; };
primary = lib.mkOption { primary = lib.mkOption {
description = "Primary color."; description = "Primary color.";
default = "#CA9EE6"; default = "#78AEED"; #"#CA9EE6";
type = lib.types.str; type = lib.types.str;
}; };
secondary = lib.mkOption { secondary = lib.mkOption {
description = "Secondary color."; description = "Secondary color.";
default = "#99D1DB"; default = "#CA9EE6"; #"#99D1DB";
type = lib.types.str; type = lib.types.str;
}; };
inactive = lib.mkOption { inactive = lib.mkOption {
description = "Inactive color."; description = "Inactive color.";
default = "#626880"; default = "#242424";
type = lib.types.str; type = lib.types.str;
}; };

81
homeManagerModules/theme.nix
View file

@ -5,27 +5,28 @@
... ...
}: { }: {
config = lib.mkIf config.ar.home.theme.enable { config = lib.mkIf config.ar.home.theme.enable {
home.pointerCursor = { home = {
gtk.enable = true; packages = with pkgs; [gnome.adwaita-icon-theme];
x11 = {
enable = true; pointerCursor = {
defaultCursor = config.ar.home.theme.cursorTheme.name; gtk.enable = true;
name = config.ar.home.theme.cursorTheme.name;
package = config.ar.home.theme.cursorTheme.package;
size = config.ar.home.theme.cursorTheme.size;
x11 = {
enable = true;
defaultCursor = config.ar.home.theme.cursorTheme.name;
};
}; };
name = config.ar.home.theme.cursorTheme.name;
package = config.ar.home.theme.cursorTheme.package;
size = config.ar.home.theme.cursorTheme.size;
}; };
qt = { qt = {
enable = true; enable = true;
platformTheme.name = "qtct"; platformTheme.name = "qtct";
style.name = "kvantum"; style = {
}; package = config.ar.home.theme.qt.package;
name = config.ar.home.theme.qt.name;
xdg.configFile = {
"Kvantum/${config.ar.home.theme.qt.name}".source = "${config.ar.home.theme.qt.package}/share/Kvantum/${config.ar.home.theme.qt.name}";
"Kvantum/kvantum.kvconfig".source = (pkgs.formats.ini {}).generate "kvantum.kvconfig" {
General.theme = config.ar.home.theme.qt.name;
}; };
}; };
@ -61,30 +62,36 @@
gtk4.extraConfig = lib.attrsets.optionalAttrs (config.ar.home.theme.colors.preferDark) {gtk-application-prefer-dark-theme = 1;}; gtk4.extraConfig = lib.attrsets.optionalAttrs (config.ar.home.theme.colors.preferDark) {gtk-application-prefer-dark-theme = 1;};
gtk3.extraCss = gtk3.extraCss = ''
if config.ar.home.theme.gtk.hideTitleBar @define-color accent_bg_color ${config.ar.home.theme.colors.primary};
then '' @define-color accent_color @accent_bg_color;
/* No (default) title bar on wayland */
headerbar.default-decoration {
/* You may need to tweak these values depending on your GTK theme */
margin-bottom: 50px;
margin-top: -100px;
background: transparent; ${
padding: 0; if config.ar.home.theme.gtk.hideTitleBar
border: 0; then ''
min-height: 0; /* No (default) title bar on wayland */
font-size: 0; headerbar.default-decoration {
box-shadow: none; /* You may need to tweak these values depending on your GTK theme */
} margin-bottom: 50px;
margin-top: -100px;
/* rm -rf window shadows */ background: transparent;
window.csd, /* gtk4? */ padding: 0;
window.csd decoration { /* gtk3 */ border: 0;
box-shadow: none; min-height: 0;
} font-size: 0;
'' box-shadow: none;
else "/* */"; }
/* rm -rf window shadows */
window.csd, /* gtk4? */
window.csd decoration { /* gtk3 */
box-shadow: none;
}
''
else "/* */"
}
'';
gtk4.extraCss = config.gtk.gtk3.extraCss; gtk4.extraCss = config.gtk.gtk3.extraCss;
}; };

10
homes/aly/default.nix
View file

@ -51,10 +51,7 @@
apps = { apps = {
alacritty.enable = true; alacritty.enable = true;
bash.enable = true; bash.enable = true;
chromium = { chromium.enable = true;
enable = true;
package = pkgs.brave;
};
emacs.enable = true; emacs.enable = true;
fastfetch.enable = true; fastfetch.enable = true;
firefox.enable = true; firefox.enable = true;
@ -65,10 +62,7 @@
}; };
defaultApps.enable = true; defaultApps.enable = true;
desktop.startupApps = [(lib.getExe' pkgs.keepassxc "keepassxc")];
desktop = {
startupApps = [(lib.getExe' pkgs.keepassxc "keepassxc")];
};
theme = { theme = {
enable = true; enable = true;

22
homes/aly/firefox/default.nix
View file

@ -6,6 +6,18 @@
self, self,
... ...
}: { }: {
home.file = let
recursive = false;
source = builtins.fetchGit {
url = "https://github.com/rafaelmardojai/firefox-gnome-theme.git";
rev = "8fb5267c5b3434f76983e29749aba7cd636e03ca";
ref = "master";
};
in {
".mozilla/firefox/default/chrome" = {inherit recursive source;};
".mozilla/firefox/work/chrome" = {inherit recursive source;};
};
programs.firefox = { programs.firefox = {
enable = true; enable = true;
@ -72,6 +84,7 @@
alias = "!bing"; alias = "!bing";
}; };
}; };
"Google" = { "Google" = {
metaData = { metaData = {
hidden = true; hidden = true;
@ -92,6 +105,8 @@
"privacy.trackingprotection.global-checkbox.enabled" = true; "privacy.trackingprotection.global-checkbox.enabled" = true;
"privacy.trackingprotection.socialtracking.enabled" = true; "privacy.trackingprotection.socialtracking.enabled" = true;
"services.sync.prefs.sync.browser.uiCustomization.state" = true; "services.sync.prefs.sync.browser.uiCustomization.state" = true;
"svg.context-properties.content.enabled" = true;
"toolkit.legacyUserProfileCustomizations.stylesheets" = true;
}; };
}; };
@ -117,6 +132,8 @@
"privacy.trackingprotection.global-checkbox.enabled" = true; "privacy.trackingprotection.global-checkbox.enabled" = true;
"privacy.trackingprotection.socialtracking.enabled" = true; "privacy.trackingprotection.socialtracking.enabled" = true;
"signon.rememberSignons" = false; "signon.rememberSignons" = false;
"svg.context-properties.content.enabled" = true;
"toolkit.legacyUserProfileCustomizations.stylesheets" = true;
}; };
id = 1; id = 1;
@ -131,6 +148,7 @@
alias = "!bing"; alias = "!bing";
}; };
}; };
"DuckDuckGo" = { "DuckDuckGo" = {
metaData = { metaData = {
hidden = true; hidden = true;
@ -150,10 +168,8 @@
icon = "firefox"; icon = "firefox";
mimeType = ["text/html" "text/xml"]; mimeType = ["text/html" "text/xml"];
name = "Firefox (work)"; name = "Firefox (work)";
settings = {StartupWMClass = "firework";};
startupNotify = true; startupNotify = true;
terminal = false; terminal = false;
settings = {
StartupWMClass = "firework";
};
}; };
} }

65
homes/dustin/default.nix
View file

@ -14,7 +14,6 @@
fractal fractal
libreoffice-fresh libreoffice-fresh
plexamp plexamp
vlc
webcord webcord
xfce.xfce4-taskmanager xfce.xfce4-taskmanager
zoom-us zoom-us
@ -40,72 +39,10 @@
}; };
defaultApps.enable = true; defaultApps.enable = true;
desktop.hyprland.randomWallpaper = true;
desktop = {
hyprland = {
randomWallpaper = true;
};
};
theme = { theme = {
enable = true; enable = true;
gtk = {
name = "catppuccin-frappe-mauve-compact+normal";
package = pkgs.catppuccin-gtk.override {
accents = ["mauve"];
size = "compact";
variant = "frappe";
tweaks = ["normal"];
};
};
qt = {
name = "Catppuccin-Frappe-Mauve";
package = pkgs.catppuccin-kvantum.override {
accent = "Mauve";
variant = "Frappe";
};
};
iconTheme = {
name = "Papirus-Dark";
package = pkgs.catppuccin-papirus-folders.override {
flavor = "frappe";
accent = "mauve";
};
};
cursorTheme = {
name = "Catppuccin-Frappe-Dark-Cursors";
size = 24;
package = pkgs.catppuccin-cursors.frappeDark;
};
font = {
name = "NotoSans Nerd Font";
size = 11;
package = pkgs.nerdfonts.override {fonts = ["Noto"];};
};
terminalFont = {
name = "NotoSansM Nerd Font";
size = 11;
package = pkgs.nerdfonts.override {fonts = ["Noto"];};
};
colors = {
text = "#FAFAFA";
background = "#232634";
primary = "#CA9EE6";
secondary = "#99D1DB";
inactive = "#626880";
shadow = "#1A1A1A";
};
wallpaper = "${config.xdg.dataHome}/backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg"; wallpaper = "${config.xdg.dataHome}/backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg";
}; };
}; };

58
homes/morgan/default.nix
View file

@ -13,7 +13,6 @@
packages = with pkgs; [ packages = with pkgs; [
fractal fractal
libreoffice-fresh libreoffice-fresh
vlc
webcord webcord
xfce.xfce4-taskmanager xfce.xfce4-taskmanager
]; ];
@ -41,63 +40,6 @@
theme = { theme = {
enable = true; enable = true;
gtk = {
name = "catppuccin-frappe-mauve-compact+normal";
package = pkgs.catppuccin-gtk.override {
accents = ["mauve"];
size = "compact";
variant = "frappe";
tweaks = ["normal"];
};
};
qt = {
name = "Catppuccin-Frappe-Mauve";
package = pkgs.catppuccin-kvantum.override {
accent = "Mauve";
variant = "Frappe";
};
};
iconTheme = {
name = "Papirus-Dark";
package = pkgs.catppuccin-papirus-folders.override {
flavor = "frappe";
accent = "mauve";
};
};
cursorTheme = {
name = "Catppuccin-Frappe-Dark-Cursors";
size = 24;
package = pkgs.catppuccin-cursors.frappeDark;
};
font = {
name = "NotoSans Nerd Font";
size = 11;
package = pkgs.nerdfonts.override {fonts = ["Noto"];};
};
terminalFont = {
name = "NotoSansM Nerd Font";
size = 11;
package = pkgs.nerdfonts.override {fonts = ["Noto"];};
};
colors = {
text = "#FAFAFA";
background = "#232634";
primary = "#CA9EE6";
secondary = "#99D1DB";
inactive = "#626880";
shadow = "#1A1A1A";
};
wallpaper = "${config.xdg.dataHome}/backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg"; wallpaper = "${config.xdg.dataHome}/backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg";
}; };
}; };

52
hosts/mauville/home.nix
View file

@ -8,58 +8,8 @@
home-manager = { home-manager = {
sharedModules = [ sharedModules = [
{ {
programs.vscode.userSettings = {
"workbench.colorTheme" = lib.mkForce "Catppuccin Mocha";
"workbench.iconTheme" = lib.mkForce "catppuccin-mocha";
};
xdg.userDirs.music = "/mnt/Media/Music"; xdg.userDirs.music = "/mnt/Media/Music";
ar.home = { ar.home.desktop.hyprland.autoSuspend = false;
desktop = {
hyprland.autoSuspend = false;
sway.autoSuspend = false;
};
theme = lib.mkForce {
enable = true;
gtk = {
name = "catppuccin-mocha-mauve-compact+normal";
package = pkgs.catppuccin-gtk.override {
accents = ["mauve"];
size = "compact";
variant = "mocha";
tweaks = ["normal"];
};
};
qt = {
name = "Catppuccin-Mocha-Mauve";
package = pkgs.catppuccin-kvantum.override {
accent = "Mauve";
variant = "Mocha";
};
};
iconTheme = {
name = "Papirus-Light";
package = pkgs.catppuccin-papirus-folders.override {
flavor = "mocha";
accent = "mauve";
};
};
cursorTheme = {
name = "catppuccin-mocha-dark-cursors";
size = 32;
package = pkgs.catppuccin-cursors.mochaDark;
};
colors = {
preferDark = true;
text = "#FAFAFA";
background = "#232634";
primary = "#CA9EE6";
secondary = "#99D1DB";
inactive = "#626880";
shadow = "#1A1A1A";
};
};
};
} }
]; ];

5
hosts/petalburg/home.nix
View file

@ -8,12 +8,11 @@
home-manager = { home-manager = {
sharedModules = [ sharedModules = [
{ {
ar.home.desktop.hyprland = {
tabletMode.enable = true;
};
wayland.windowManager.hyprland.extraConfig = '' wayland.windowManager.hyprland.extraConfig = ''
exec-once = ${lib.getExe inputs.iio-hyprland.packages.${pkgs.system}.default} "desc:Samsung Display Corp. 0x4152" exec-once = ${lib.getExe inputs.iio-hyprland.packages.${pkgs.system}.default} "desc:Samsung Display Corp. 0x4152"
''; '';
ar.home.desktop.hyprland.tabletMode.enable = true;
} }
]; ];
}; };

2
hosts/rustboro/home.nix
View file

@ -17,7 +17,7 @@
preset = "LoudnessEqualizer"; preset = "LoudnessEqualizer";
}; };
theme = { theme = {
cursorTheme.size = lib.mkForce 32; cursorTheme.size = lib.mkForce 24;
font.size = lib.mkForce 14; font.size = lib.mkForce 14;
terminalFont.size = lib.mkForce 14; terminalFont.size = lib.mkForce 14;
}; };

23
nixosModules/base/default.nix
View file

@ -14,28 +14,7 @@
]; ];
config = lib.mkIf config.ar.base.enable { config = lib.mkIf config.ar.base.enable {
console = { console.useXkbConfig = true;
colors = [
"303446"
"e78284"
"a6d189"
"e5c890"
"8caaee"
"f4b8e4"
"81c8be"
"b5bfe2"
"626880"
"303446"
"e78284"
"a6d189"
"e5c890"
"8caaee"
"f4b8e4"
"81c8be"
"a5adce"
];
useXkbConfig = true;
};
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
inputs.agenix.packages.${pkgs.system}.default inputs.agenix.packages.${pkgs.system}.default

19
nixosModules/base/nixpkgs/default.nix
View file

@ -20,42 +20,31 @@
(final: prev: { (final: prev: {
audiobookshelf = unstable.audiobookshelf; audiobookshelf = unstable.audiobookshelf;
brave = prev.brave.override {commandLineArgs = "--gtk-version=4 --enable-wayland-ime";}; brave = prev.brave.override {commandLineArgs = "--gtk-version=4 --enable-wayland-ime";};
catppuccin-gtk = prev.catppuccin-gtk.override {
accents = ["mauve"];
size = "compact";
variant = "frappe";
tweaks = ["normal"];
};
catppuccin-kvantum = prev.catppuccin-kvantum.override {
accent = "Mauve";
variant = "Frappe";
};
catppuccin-papirus-folders = prev.catppuccin-papirus-folders.override {
flavor = "frappe";
accent = "mauve";
};
catppuccin-plymouth = prev.catppuccin-plymouth.override {variant = "frappe";};
google-chrome = prev.google-chrome.override {commandLineArgs = "--gtk-version=4 --enable-wayland-ime";}; google-chrome = prev.google-chrome.override {commandLineArgs = "--gtk-version=4 --enable-wayland-ime";};
hyprland = inputs.hyprland.packages.${pkgs.system}.hyprland; hyprland = inputs.hyprland.packages.${pkgs.system}.hyprland;
hyprnome = unstable.hyprnome; hyprnome = unstable.hyprnome;
hyprshot = unstable.hyprshot; hyprshot = unstable.hyprshot;
intel-vaapi-driver = prev.intel-vaapi-driver.override {enableHybridCodec = true;}; intel-vaapi-driver = prev.intel-vaapi-driver.override {enableHybridCodec = true;};
nerdfonts = prev.nerdfonts.override {fonts = ["DroidSansMono" "Noto"];}; nerdfonts = prev.nerdfonts.override {fonts = ["DroidSansMono" "Noto"];};
obsidian = prev.obsidian.overrideAttrs (old: { obsidian = prev.obsidian.overrideAttrs (old: {
installPhase = installPhase =
builtins.replaceStrings ["--ozone-platform=wayland"] builtins.replaceStrings ["--ozone-platform=wayland"]
["--ozone-platform=wayland --enable-wayland-ime"] ["--ozone-platform=wayland --enable-wayland-ime"]
old.installPhase; old.installPhase;
}); });
sway = unstable.sway; sway = unstable.sway;
swayfx = unstable.swayfx; swayfx = unstable.swayfx;
vscodium = prev.vscodium.override {commandLineArgs = "--enable-wayland-ime";}; vscodium = prev.vscodium.override {commandLineArgs = "--enable-wayland-ime";};
webcord = prev.webcord.overrideAttrs (old: { webcord = prev.webcord.overrideAttrs (old: {
installPhase = installPhase =
builtins.replaceStrings ["--ozone-platform-hint=auto"] builtins.replaceStrings ["--ozone-platform-hint=auto"]
["--ozone-platform-hint=auto --enable-wayland-ime"] ["--ozone-platform-hint=auto --enable-wayland-ime"]
old.installPhase; old.installPhase;
}); });
xdg-desktop-portal-hyprland = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland; xdg-desktop-portal-hyprland = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
}) })
]; ];

2
nixosModules/base/plymouth/default.nix
View file

@ -11,8 +11,6 @@
initrd.verbose = false; initrd.verbose = false;
plymouth = { plymouth = {
enable = true; enable = true;
themePackages = [pkgs.catppuccin-plymouth];
theme = "catppuccin-frappe";
font = "${pkgs.nerdfonts}/share/fonts/truetype/NerdFonts/NotoSansNerdFont-Regular.ttf"; font = "${pkgs.nerdfonts}/share/fonts/truetype/NerdFonts/NotoSansNerdFont-Regular.ttf";
}; };
}; };

14
nixosModules/desktop/lightdm/default.nix
View file

@ -16,13 +16,13 @@
greeters.slick = { greeters.slick = {
enable = true; enable = true;
theme = { theme = {
name = "catppuccin-frappe-mauve-compact+normal"; name = "adw-gtk3-dark";
package = pkgs.catppuccin-gtk; package = pkgs.adw-gtk3;
}; };
iconTheme = { iconTheme = {
name = "Papirus-Dark"; name = "Papirus-Dark";
package = pkgs.catppuccin-papirus-folders; package = pkgs.papirus-icon-theme;
}; };
font = { font = {
@ -31,13 +31,13 @@
}; };
cursorTheme = { cursorTheme = {
name = "catppuccin-frappe-dark-cursors"; name = "Bibata-Modern-Classic";
package = pkgs.catppuccin-cursors.frappeDark; package = pkgs.bibata-cursors;
size = 24; size = 20;
}; };
extraConfig = '' extraConfig = ''
background=#303446 background=#242424
enable-hidpi=on enable-hidpi=on
''; '';
}; };

4
nixosModules/options.nix
View file

@ -180,7 +180,7 @@
}; };
hyprland.enable = lib.mkEnableOption "Hyprland wayland session."; hyprland.enable = lib.mkEnableOption "Hyprland wayland session.";
lightdm.enable = lib.mkEnableOption "Lightdm with Catppuccin theme."; lightdm.enable = lib.mkEnableOption "Lightdm display manager.";
plasma.enable = lib.mkEnableOption "Plasma desktop session."; plasma.enable = lib.mkEnableOption "Plasma desktop session.";
steam.enable = lib.mkEnableOption "Steam + Gamescope session."; steam.enable = lib.mkEnableOption "Steam + Gamescope session.";
sway.enable = lib.mkEnableOption "Sway wayland session."; sway.enable = lib.mkEnableOption "Sway wayland session.";
@ -227,7 +227,7 @@
}; };
plymouth.enable = lib.mkOption { plymouth.enable = lib.mkOption {
description = "Plymouth boot screen with catppuccin theme."; description = "Plymouth boot screen.";
default = config.ar.base.enable; default = config.ar.base.enable;
type = lib.types.bool; type = lib.types.bool;
}; };