Compare commits
3 commits
b1a17f605d
...
2686ad6086
Author | SHA1 | Date | |
---|---|---|---|
2686ad6086 | |||
4caa879c4e | |||
7d5c1d1860 |
12 changed files with 105 additions and 103 deletions
22
flake.lock
generated
22
flake.lock
generated
|
@ -21,6 +21,21 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"catppuccin": {
|
||||
"locked": {
|
||||
"lastModified": 1726952185,
|
||||
"narHash": "sha256-l/HbsQjJMT6tlf8KCooFYi3J6wjIips3n6/aWAoLY4g=",
|
||||
"owner": "catppuccin",
|
||||
"repo": "nix",
|
||||
"rev": "630b559cc1cb4c0bdd525af506935323e4ccd5d1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "catppuccin",
|
||||
"repo": "nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"crane": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
@ -433,11 +448,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1725863684,
|
||||
"narHash": "sha256-HmdTBpuCsw35Ii35JUKO6AE6nae+kJliQb0XGd4hoLE=",
|
||||
"lastModified": 1726985855,
|
||||
"narHash": "sha256-NJPGK030Y3qETpWBhj9oobDQRbXdXOPxtu+YgGvZ84o=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "be47a2bdf278c57c2d05e747a13ed31cef54a037",
|
||||
"rev": "04213d1ce4221f5d9b40bcee30706ce9a91d148d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1089,6 +1104,7 @@
|
|||
"root": {
|
||||
"inputs": {
|
||||
"agenix": "agenix",
|
||||
"catppuccin": "catppuccin",
|
||||
"disko": "disko",
|
||||
"dream2nix": "dream2nix",
|
||||
"flakeParts": "flakeParts",
|
||||
|
|
|
@ -59,6 +59,7 @@
|
|||
url = "github:nix-community/lanzaboote";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
catppuccin.url = "github:catppuccin/nix";
|
||||
};
|
||||
|
||||
outputs =
|
||||
|
|
|
@ -1,21 +1,9 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
programs.btop = {
|
||||
enable = true;
|
||||
settings = {
|
||||
update_ms = 100;
|
||||
theme_background = false;
|
||||
# color_theme = "${config.programs.btop.package}/share/btop/themes/dracula.theme";
|
||||
color_theme =
|
||||
let
|
||||
catppuccin-theme = pkgs.fetchFromGitHub {
|
||||
owner = "catppuccin";
|
||||
repo = "btop";
|
||||
rev = "21b8d5956a8b07fa52519e3267fb3a2d2e693d17";
|
||||
hash = "sha256-UXeTypc15MhjgGUiCrDUZ40m32yH2o1N+rcrEgY6sME=";
|
||||
};
|
||||
in
|
||||
"${catppuccin-theme}/themes/catppuccin_mocha.theme";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
39
hmModules/catppuccin/default.nix
Normal file
39
hmModules/catppuccin/default.nix
Normal file
|
@ -0,0 +1,39 @@
|
|||
{ lib, ... }:
|
||||
{
|
||||
catppuccin = {
|
||||
enable = true;
|
||||
flavor = "mocha";
|
||||
accent = "sapphire";
|
||||
};
|
||||
|
||||
qt = {
|
||||
platformTheme.name = lib.mkForce "kvantum";
|
||||
style.name = lib.mkForce "kvantum";
|
||||
};
|
||||
|
||||
# TODO move away
|
||||
programs.alacritty = {
|
||||
enable = true;
|
||||
settings = {
|
||||
font = {
|
||||
normal = {
|
||||
family = "Fira Code";
|
||||
style = "Regular";
|
||||
};
|
||||
bold = {
|
||||
family = "Fira Code";
|
||||
style = "Bold";
|
||||
};
|
||||
italic = {
|
||||
family = "Cascadia Code";
|
||||
style = "Italic";
|
||||
};
|
||||
bold_italic = {
|
||||
family = "Fira Code";
|
||||
style = "Bold Italic";
|
||||
};
|
||||
size = 13;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -1,21 +1,11 @@
|
|||
{
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
lib.mkMerge [
|
||||
{
|
||||
programs.foot =
|
||||
let
|
||||
catppuccin = pkgs.fetchFromGitHub {
|
||||
owner = "catppuccin";
|
||||
repo = "foot";
|
||||
rev = "307611230661b7b1787feb7f9d122e851bae97e9";
|
||||
hash = "sha256-mkPYHDJtfdfDnqLr1YOjaBpn4lCceok36LrnkUkNIE4=";
|
||||
};
|
||||
in
|
||||
{
|
||||
programs.foot = {
|
||||
enable = true;
|
||||
server.enable = true;
|
||||
settings = {
|
||||
|
@ -24,16 +14,17 @@ lib.mkMerge [
|
|||
login-shell = "yes";
|
||||
dpi-aware = "no";
|
||||
horizontal-letter-offset = "1";
|
||||
include = "${catppuccin}/themes/catppuccin-mocha.ini";
|
||||
font =
|
||||
let
|
||||
size = "13";
|
||||
in
|
||||
lib.mkForce (
|
||||
lib.concatStringsSep ", " [
|
||||
"Iosevka Comfy:size=${size}"
|
||||
"Symbols Nerd Font:size=${size}"
|
||||
"JoyPixels:size=${size}"
|
||||
];
|
||||
]
|
||||
);
|
||||
};
|
||||
cursor = {
|
||||
blink = true;
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
enable = true;
|
||||
defaultEditor = true;
|
||||
settings = {
|
||||
theme = "catppuccin_mocha";
|
||||
editor = {
|
||||
indent-guides.render = true;
|
||||
cursor-shape = {
|
||||
|
|
|
@ -56,21 +56,20 @@ in
|
|||
|
||||
gtk = {
|
||||
enable = true;
|
||||
font.name = "Sans,Symbols Nerd Font";
|
||||
# font.name = lib.mkForce "Sans,Symbols Nerd Font";
|
||||
iconTheme = {
|
||||
name = "Adwaita";
|
||||
package = pkgs.adwaita-icon-theme;
|
||||
};
|
||||
cursorTheme = {
|
||||
name = "catppuccin-mocha-sapphire";
|
||||
package = pkgs.catppuccin-cursors;
|
||||
size = 48;
|
||||
};
|
||||
# cursorTheme = {
|
||||
# name = "catppuccin-mocha-sapphire";
|
||||
# package = pkgs.catppuccin-cursors;
|
||||
# size = 48;
|
||||
# };
|
||||
};
|
||||
|
||||
qt = {
|
||||
enable = true;
|
||||
platformTheme.name = "gtk3";
|
||||
};
|
||||
|
||||
# services.kanshi = {
|
||||
|
|
|
@ -116,43 +116,9 @@
|
|||
# '';
|
||||
# };
|
||||
|
||||
xdg.configFile = {
|
||||
"dracula-theme" = {
|
||||
target = "fish/themes/dracula.theme";
|
||||
source =
|
||||
let
|
||||
theme = pkgs.fetchFromGitHub {
|
||||
owner = "dracula";
|
||||
repo = "fish";
|
||||
rev = "269cd7d76d5104fdc2721db7b8848f6224bdf554";
|
||||
hash = "sha256-Hyq4EfSmWmxwCYhp3O8agr7VWFAflcUe8BUKh50fNfY=";
|
||||
};
|
||||
in
|
||||
"${theme}/themes/Dracula\ Official.theme";
|
||||
};
|
||||
"catppuccin-theme" = {
|
||||
target = "fish/themes/Catppuccin\ Mocha.theme";
|
||||
source =
|
||||
let
|
||||
theme = pkgs.fetchFromGitHub {
|
||||
owner = "catppuccin";
|
||||
repo = "fish";
|
||||
rev = "a3b9eb5eaf2171ba1359fe98f20d226c016568cf";
|
||||
hash = "sha256-shQxlyoauXJACoZWtRUbRMxmm10R8vOigXwjxBhG8ng=";
|
||||
};
|
||||
in
|
||||
"${theme}/themes/Catppuccin\ Mocha.theme";
|
||||
};
|
||||
};
|
||||
|
||||
programs.fish = {
|
||||
enable = true;
|
||||
shellInit =
|
||||
''
|
||||
fish_config theme choose "dracula"
|
||||
fish_config theme choose "Catppuccin Mocha"
|
||||
''
|
||||
+ lib.optionalString (builtins.hasAttr "cachix-personal-token" age.secrets) ''
|
||||
shellInit = lib.optionalString (builtins.hasAttr "cachix-personal-token" age.secrets) ''
|
||||
export CACHIX_AUTH_TOKEN=$(cat ${age.secrets.cachix-personal-token.path})
|
||||
'';
|
||||
shellAliases = {
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
gtk = {
|
||||
enable = true;
|
||||
font.name = "Sans,Symbols Nerd Font";
|
||||
font.name = lib.mkForce "Sans,Symbols Nerd Font";
|
||||
iconTheme = {
|
||||
name = "Adwaita";
|
||||
package = pkgs.adwaita-icon-theme;
|
||||
|
|
|
@ -68,11 +68,13 @@
|
|||
inputs.nixThePlanet.nixosModules.macos-ventura
|
||||
inputs.lix-module.nixosModules.default
|
||||
inputs.lanzaboote.nixosModules.lanzaboote
|
||||
inputs.catppuccin.nixosModules.catppuccin
|
||||
];
|
||||
extraHmModules = [
|
||||
# inputs.ccrEmacs.hmModules.default
|
||||
"${inputs.homeManagerGitWorkspace}/modules/services/git-workspace.nix"
|
||||
inputs.vscode-server.nixosModules.home
|
||||
inputs.catppuccin.homeManagerModules.catppuccin
|
||||
];
|
||||
secrets = {
|
||||
"picard-wireguard-private-key" = { };
|
||||
|
|
|
@ -84,6 +84,7 @@
|
|||
"reinstall-magisk-on-lineage"
|
||||
"vscode-server"
|
||||
"zk"
|
||||
"catppuccin"
|
||||
];
|
||||
extraGroups = [ ];
|
||||
backupPaths = [ ];
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||
"mlabs.cachix.org-1:gStKdEqNKcrlSQw5iMW6wFCj3+b+1ASpBVY2SYuNV2M="
|
||||
];
|
||||
# deprecated-features = [ "url-literals" ];
|
||||
deprecated-features = [ "url-literals" ];
|
||||
};
|
||||
|
||||
nixPath = [ "nixpkgs=${fleetFlake.inputs.nixpkgs}" ];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue