Compare commits
3 commits
5633bc6656
...
d6d5ecf478
| Author | SHA1 | Date | |
|---|---|---|---|
| d6d5ecf478 | |||
9e38d06d55
|
|||
|
116474d8a8
|
7 changed files with 65 additions and 39 deletions
50
flake.lock
generated
50
flake.lock
generated
|
|
@ -39,11 +39,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715468401,
|
||||
"narHash": "sha256-JYDr4Pg7orKXOTc/3BLAaCl5wtcIq9UU+Aku39D7xos=",
|
||||
"lastModified": 1715955015,
|
||||
"narHash": "sha256-IqhYsqdLyKIWmP6s+ZtuUjkzENStCygu9spdiqSzEZY=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "cd9fc69f3d2dbd1799953c6a22eb679113baec93",
|
||||
"revCount": 182,
|
||||
"rev": "08d4bdc74fad1934fcd68e606c7b864514f3a15c",
|
||||
"revCount": 183,
|
||||
"type": "git",
|
||||
"url": "https://git.aciceri.dev/aciceri/emacs.git"
|
||||
},
|
||||
|
|
@ -81,11 +81,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715872464,
|
||||
"narHash": "sha256-mkZ3hrPG7d+qL7B6pQcrNfPh2mnQEJR3FHK93qCp6Uk=",
|
||||
"lastModified": 1716168343,
|
||||
"narHash": "sha256-82oT27w9smpItZ+PyN2C0PjIwZYbIocwXSM4u1igXuc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "5f6dbcce99d60dd77f96dfc66d06bbea149a40e1",
|
||||
"rev": "6f01b9710bc4d3bf006eb8df928b4b15e0430901",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -101,11 +101,11 @@
|
|||
"pyproject-nix": "pyproject-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715900409,
|
||||
"narHash": "sha256-LfXL7pFlGfiEQlzVttw7/Vrx4dAb1koyADjWvC0GmaQ=",
|
||||
"lastModified": 1716143526,
|
||||
"narHash": "sha256-Pk77RzfAlrr1iR81zFJA/puxr2OeBifd0Yb0ETWMVKE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "dream2nix",
|
||||
"rev": "6a169a73bde7a914563641fa8cf7290d5349d20d",
|
||||
"rev": "f28d1cc6898532ac331a1625628090dc7c5b02e2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -895,11 +895,11 @@
|
|||
"nixpkgs": "nixpkgs_9"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715912543,
|
||||
"narHash": "sha256-OuelDLSiXmrKezDcwddsTT8p4cb84yWYKTR5tRfA4/M=",
|
||||
"lastModified": 1716179952,
|
||||
"narHash": "sha256-YYAkj/wBEMO75nnJbcB4cjSfGzlkmaRao1WeULDIdGc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixd",
|
||||
"rev": "51adffb162b3fce43b92808599b1ef6891483108",
|
||||
"rev": "ff3eb7117ea030d8d466d364513394cf47b58715",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -910,11 +910,11 @@
|
|||
},
|
||||
"nixosHardware": {
|
||||
"locked": {
|
||||
"lastModified": 1715881912,
|
||||
"narHash": "sha256-e4LJk5uV1wvrRkffGFZekPWvFUx29NnnOahBlLaq8Ek=",
|
||||
"lastModified": 1716173274,
|
||||
"narHash": "sha256-FC21Bn4m6ctajMjiUof30awPBH/7WjD0M5yqrWepZbY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "ff1be1e3cdf884df0935ab28745ab13c3c26d828",
|
||||
"rev": "d9e0b26202fd500cf3e79f73653cce7f7d541191",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1101,11 +1101,11 @@
|
|||
},
|
||||
"nixpkgsStable": {
|
||||
"locked": {
|
||||
"lastModified": 1715668745,
|
||||
"narHash": "sha256-xp62OkRkbUDNUc6VSqH02jB0FbOS+MsfMb7wL1RJOfA=",
|
||||
"lastModified": 1716061101,
|
||||
"narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9ddcaffecdf098822d944d4147dd8da30b4e6843",
|
||||
"rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1117,11 +1117,11 @@
|
|||
},
|
||||
"nixpkgsUnstable": {
|
||||
"locked": {
|
||||
"lastModified": 1715787315,
|
||||
"narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=",
|
||||
"lastModified": 1715961556,
|
||||
"narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5",
|
||||
"rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1197,11 +1197,11 @@
|
|||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1715774670,
|
||||
"narHash": "sha256-iJYnKMtLi5u6hZhJm94cRNSDG5Rz6ZzIkGbhPFtDRm0=",
|
||||
"lastModified": 1716097317,
|
||||
"narHash": "sha256-1UMrLtgzielG/Sop6gl6oTSM4pDt7rF9j9VuxhDWDlY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b3fcfcfabd01b947a1e4f36622bbffa3985bdac6",
|
||||
"rev": "8535fb92661f37ff9f0da3007fbc942f7d134b41",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,18 @@
|
|||
{config, ...}: {
|
||||
{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 = "${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";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
3
hmModules/calibre/default.nix
Normal file
3
hmModules/calibre/default.nix
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
{pkgs, ...}: {
|
||||
home.packages = [pkgs.calibre];
|
||||
}
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
programs.helix = {
|
||||
enable = true;
|
||||
settings = {
|
||||
theme = "dracula";
|
||||
theme = "catppuccin_mocha";
|
||||
editor = {
|
||||
indent-guides.render = true;
|
||||
cursor-shape = {
|
||||
|
|
|
|||
|
|
@ -96,22 +96,36 @@
|
|||
# '';
|
||||
# };
|
||||
|
||||
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";
|
||||
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"
|
||||
export CACHIX_AUTH_TOKEN=$(cat ${age.secrets.cachix-personal-token.path})
|
||||
'';
|
||||
shellAliases = {
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
};
|
||||
font_size = 13;
|
||||
allow_square_glyphs_to_overflow_width = "Always";
|
||||
color_scheme = "Dracula (Official)";
|
||||
color_scheme = "Catppuccin Mocha";
|
||||
window_background_opacity = 1;
|
||||
enable_tab_bar = false;
|
||||
hide_mouse_cursor_when_typing = false;
|
||||
|
|
|
|||
|
|
@ -78,6 +78,7 @@
|
|||
"zulip"
|
||||
"teams"
|
||||
"obs-studio"
|
||||
"calibre"
|
||||
];
|
||||
extraGroups = [];
|
||||
backupPaths = [];
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue