Add catppuccin themeing

This commit is contained in:
Fabian Hauser 2024-04-10 10:47:56 +07:00
parent 3f4a4c838d
commit 4eea2232fb
12 changed files with 47 additions and 32 deletions

View file

@ -33,7 +33,11 @@ in {
boot.tmp.useTmpfs = true; boot.tmp.useTmpfs = true;
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
catppuccin.flavour = "mocha";
console.keyMap = "de_CH-latin1"; console.keyMap = "de_CH-latin1";
console.catppuccin.enable = true;
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
users.mutableUsers = false; users.mutableUsers = false;

24
flake.lock generated
View file

@ -42,11 +42,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712462372, "lastModified": 1712688495,
"narHash": "sha256-WA3bbBWhd3o1wAgyHZNypjb/LG4oq+IWxFq8ey8yNPU=", "narHash": "sha256-NrVLXkpT9ZigiI8md6NIzHS+3lE4QTj30IgXG57O9iM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a561ad6ab38578c812cc9af3b04f2cc60ebf48c9", "rev": "b00d0e4fe9cba0047f54e77418ddda5f17e6ef2c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -58,11 +58,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1712324865, "lastModified": 1712695607,
"narHash": "sha256-+BatEWd4HlMeK7Ora+gYIkarjxFVCg9oKrIeybHIIX4=", "narHash": "sha256-rXb3onsPMiv00FrGSpIJyYa8x53W0dlbJ5Ka3xvje/c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "f3b959627bca46a9f7052b8fbc464b8323e68c2c", "rev": "05aa46a1f3b5ac92bfe84807868ba9670d48b031",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -73,11 +73,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1712439257, "lastModified": 1712608508,
"narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -89,11 +89,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1712439257, "lastModified": 1712608508,
"narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -1,6 +0,0 @@
{ pkgs, ... }: {
programs.alacritty = {
enable = true;
settings.window.opacity = 0.95;
};
}

View file

@ -0,0 +1,3 @@
{ pkgs, lib, ... }: {
catppuccin.flavour = "mocha";
}

View file

@ -7,6 +7,7 @@
./firefox.nix ./firefox.nix
./gpg.nix ./gpg.nix
./ssh.nix ./ssh.nix
./catppuccin.nix
./scripts.nix ./scripts.nix
./webapps.nix ./webapps.nix
./vim.nix ./vim.nix
@ -14,7 +15,7 @@
./waybar.nix ./waybar.nix
./psql.nix ./psql.nix
./mako.nix ./mako.nix
./alacritty.nix ./kitty.nix
./shell.nix ./shell.nix
./swaylock.nix ./swaylock.nix
./kanshi.nix ./kanshi.nix

View file

@ -19,6 +19,7 @@
}; };
#delta = { #delta = {
# enable = true; # enable = true;
# catppuccin.enable = true;
# options = { # options = {
# side-by-side = "true"; # side-by-side = "true";

View file

@ -35,7 +35,7 @@
enableScDaemon = true; enableScDaemon = true;
enableSshSupport = true; enableSshSupport = true;
enableExtraSocket = true; enableExtraSocket = true;
pinentryFlavor = null; # TODO: pinentryPackage =
extraConfig = let extraConfig = let
pinentryBemenu = pkgs.writeShellApplication { pinentryBemenu = pkgs.writeShellApplication {
name = "pinentry-bemenu-with-env"; name = "pinentry-bemenu-with-env";

View file

@ -0,0 +1,6 @@
{ pkgs, ... }: {
programs.kitty = {
enable = true;
catppuccin.enable = true;
};
}

View file

@ -1,7 +1,8 @@
{ pkgs, ... }: { { pkgs, ... }: {
services.mako = { services.mako = {
enable = true; enable = true;
backgroundColor = "#CCCCCCCC"; # TODO: Make layout colors in a central place catppuccin.enable = true;
#backgroundColor = "#CCCCCCCC"; # TODO: Make layout colors in a central place
borderSize = 0; borderSize = 0;
#borderColor = "#4C7899FF"; #borderColor = "#4C7899FF";
defaultTimeout = 1500; defaultTimeout = 1500;

View file

@ -31,6 +31,7 @@ in rec {
systemd.enable = true; systemd.enable = true;
xwayland = true; xwayland = true;
wrapperFeatures = { gtk = true; }; wrapperFeatures = { gtk = true; };
catppuccin.enable = true;
extraSessionCommands = '' extraSessionCommands = ''
#export XDG_CURRENT_DESKTOP=Unity #export XDG_CURRENT_DESKTOP=Unity
export XDG_CURRENT_DESKTOP=sway export XDG_CURRENT_DESKTOP=sway
@ -50,7 +51,7 @@ in rec {
}; };
"*" = { xkb_numlock = "enable"; }; "*" = { xkb_numlock = "enable"; };
}; };
terminal = "${pkgs.alacritty}/bin/alacritty"; terminal = "${pkgs.kitty}/bin/kitty";
menu = "${bemenuLauncher}/bin/bemenuLauncher"; menu = "${bemenuLauncher}/bin/bemenuLauncher";
gaps.inner = 8; gaps.inner = 8;
modifier = "Mod4"; modifier = "Mod4";
@ -159,6 +160,7 @@ in rec {
name = "hicolor"; name = "hicolor";
}; };
gtk3.extraConfig.gtk-menu-images = true; gtk3.extraConfig.gtk-menu-images = true;
catppuccin.enable = true;
}; };
dconf.settings = { "org/gnome/desktop/interface".menus-have-icons = true; }; dconf.settings = { "org/gnome/desktop/interface".menus-have-icons = true; };

View file

@ -30,4 +30,6 @@
}; };
Install = { WantedBy = [ "sway-session.target" ]; }; Install = { WantedBy = [ "sway-session.target" ]; };
}; };
programs.swaylock.catppuccin.enable = true;
} }

View file

@ -1,13 +1,22 @@
{ pkgs, ... }: { { pkgs, ... }: {
programs.vim = { programs.neovim = {
enable = true; enable = true;
defaultEditor = true;
viAlias = true;
vimAlias = true;
vimdiffAlias = true;
catppuccin.enable = true;
extraConfig = '' extraConfig = ''
colorscheme elflord " colorscheme elflord
set autoindent set autoindent
set ruler set ruler
set pastetoggle=<F2> set pastetoggle=<F2>
set splitbelow set splitbelow
set splitright set splitright
set mouse=
set hidden
set expandtab
set ignorecase
set tabstop=2 set tabstop=2
set softtabstop=2 set softtabstop=2
@ -42,13 +51,5 @@
syntax on syntax on
''; '';
plugins = with pkgs.vimPlugins; [ vim-sensible vim-airline ]; plugins = with pkgs.vimPlugins; [ vim-sensible vim-airline ];
settings = {
background = "dark";
ignorecase = true;
mouse = "n";
hidden = true;
expandtab = true;
};
}; };
} }