pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Theme update for consistency

Browse source 
Switch back to Macchiato + Lavender based theme for everything
This commit is contained in:
Evie Litherland-Smith 2023-09-11 17:22:14 +01:00
parent 03a185f64a
commit 477f65d5d0
7 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
flake.nix
View file

@ -46,14 +46,14 @@
let let
flakeURL = "git+https://git.xenia.me.uk/xenia/nixos.git?ref=main"; flakeURL = "git+https://git.xenia.me.uk/xenia/nixos.git?ref=main";
catppuccin-themes = with inputs; { catppuccin-themes = with inputs; {
alacritty = "${catppuccin-alacritty}/catppuccin-mocha.yml"; alacritty = "${catppuccin-alacritty}/catppuccin-macchiato.yml";
bat = "${catppuccin-bat}/Catppuccin-mocha.tmTheme"; bat = "${catppuccin-bat}/Catppuccin-macchiato.tmTheme";
fish = "${catppuccin-fish}/themes/Catppuccin Mocha.theme"; fish = "${catppuccin-fish}/themes/Catppuccin Macchiato.theme";
gitui = "${catppuccin-gitui}/theme/mocha.ron"; gitui = "${catppuccin-gitui}/theme/macchiato.ron";
hyprland = "${catppuccin-hyprland}/themes/mocha.conf"; hyprland = "${catppuccin-hyprland}/themes/macchiato.conf";
zathura = "${catppuccin-zathura}/src/catppuccin-mocha"; zathura = "${catppuccin-zathura}/src/catppuccin-macchiato";
zsh = zsh =
"${catppuccin-zsh}/themes/catppuccin_mocha-zsh-syntax-highlighting.zsh"; "${catppuccin-zsh}/themes/catppuccin_macchiato-zsh-syntax-highlighting.zsh";
}; };
default = { default = {
hostName = "Atlas"; hostName = "Atlas";

4
home/hyprland/config.nix
View file

@ -31,8 +31,8 @@
gaps_in = 5 gaps_in = 5
gaps_out = 10 gaps_out = 10
border_size = 3 border_size = 3
col.active_border = $mauve col.active_border = $lavender
col.group_border_active = $mauve col.group_border_active = $lavender
col.inactive_border = $surface2 col.inactive_border = $surface2
col.group_border = $surface2 col.group_border = $surface2
cursor_inactive_timeout = 5 cursor_inactive_timeout = 5

16
home/hyprland/gtk.nix
View file

@ -1,10 +1,10 @@
{ pkgs, ... }: { pkgs, ... }:
let let
catppuccin-gtk-lavender = pkgs.catppuccin-gtk.override { catppuccin-gtk = pkgs.catppuccin-gtk.override {
accents = [ "lavender" ]; accents = [ "lavender" ];
size = "standard"; size = "compact";
tweaks = [ ]; tweaks = [ "rimless" ];
variant = "mocha"; variant = "macchiato";
}; };
in { in {
home.packages = with pkgs; [ home.packages = with pkgs; [
@ -15,16 +15,16 @@ in {
gtk = { gtk = {
enable = true; enable = true;
cursorTheme = { cursorTheme = {
package = pkgs.catppuccin-cursors.mochaDark; package = pkgs.catppuccin-cursors.macchiatoLavender;
name = "Catppuccin-Mocha-Dark-Cursors"; name = "Catppuccin-Macchiato-Lavender-Cursors";
}; };
iconTheme = { iconTheme = {
package = pkgs.callPackage ./pkgs/delta-icon-theme { }; package = pkgs.callPackage ./pkgs/delta-icon-theme { };
name = "Delta"; name = "Delta";
}; };
theme = { theme = {
package = catppuccin-gtk-lavender; package = catppuccin-gtk;
name = "Catppuccin-Mocha-Standard-Lavender-dark"; name = "Catppuccin-Macchiato-Compact-Lavender-dark";
}; };
}; };
} }

4
home/hyprland/rofi/theme.rasi
View file

@ -2,7 +2,7 @@
bg-col: #24273a; bg-col: #24273a;
bg-col-light: #24273a; bg-col-light: #24273a;
border-col: #24273a; border-col: #24273a;
mauve: #c6a0f6; lavender: #b7bdf8;
selected-col: #24273a; selected-col: #24273a;
blue: #8aadf4; blue: #8aadf4;
fg-col: #cad3f5; fg-col: #cad3f5;
@ -22,7 +22,7 @@ window {
height: 75%; height: 75%;
border: 3px; border: 3px;
border-radius: 10px; border-radius: 10px;
border-color: @mauve; border-color: @lavender;
background-color: @bg-col; background-color: @bg-col;
} }

10
home/hyprland/swaylock.nix
View file

@ -1,4 +1,4 @@
{pkgs, ...}: { { pkgs, ... }: {
programs.swaylock = { programs.swaylock = {
enable = true; enable = true;
package = pkgs.swaylock-effects; package = pkgs.swaylock-effects;
@ -10,10 +10,10 @@
indicator-thickness = 7; indicator-thickness = 7;
effect-blur = "7x5"; effect-blur = "7x5";
effect-vignette = "0.5:0.5"; effect-vignette = "0.5:0.5";
ring-color = "1e1e2e"; # Catppuccin base ring-color = "24273a"; # Catppuccin base
key-hl-color = "b4befe"; # Catppuccin lavender key-hl-color = "b7bdf8"; # Catppuccin lavender
line-color = "1e1e2e"; # Catppuccin base line-color = "24273a"; # Catppuccin base
separator-color = "585b70"; # Catppuccin surface2 separator-color = "8bd5ca"; # Catppuccin teal
grace = 2; grace = 2;
fade-in = 0.2; fade-in = 0.2;
}; };

4
home/hyprland/waybar/style.css
View file

@ -54,7 +54,7 @@ window > box {
tooltip { tooltip {
background: @base; background: @base;
border: 3px solid @mauve; border: 3px solid @lavender;
border-radius: 10px; border-radius: 10px;
} }
@ -80,6 +80,6 @@ tooltip {
border-radius: 0px; border-radius: 0px;
} }
#workspaces button.active { border-top: 3px solid @mauve; } #workspaces button.active { border-top: 3px solid @lavender; }
#workspaces button.urgent { border-top: 3px solid @red; } #workspaces button.urgent { border-top: 3px solid @red; }

2
home/neovim/default.nix
View file

@ -7,7 +7,7 @@
vimAlias = true; vimAlias = true;
plugins = with pkgs.vimPlugins; [{ plugins = with pkgs.vimPlugins; [{
plugin = catppuccin-nvim; plugin = catppuccin-nvim;
config = "colorscheme catppuccin-mocha"; config = "colorscheme catppuccin-macchiato";
}]; }];
}; };
} }