refactor
This commit is contained in:
1 parent
81e576a877
commit
cde67e4d75
46 files changed
+619
-518
No files matched your search
@@ -1,58 +1,36 @@
|
||||
{
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{ config, ... }:
|
||||
let
|
||||
facts = config.facts;
|
||||
hmModules = config.flake.modules.homeManager;
|
||||
mkCursorTheme =
|
||||
pkgs:
|
||||
facts.theme.cursor
|
||||
// {
|
||||
package = pkgs.${facts.theme.cursor.packageName};
|
||||
};
|
||||
cursor = {
|
||||
name = "phinger-cursors-light";
|
||||
packageName = "phinger-cursors";
|
||||
size = 24;
|
||||
};
|
||||
mkCursor = pkgs: cursor // { package = pkgs.${cursor.packageName}; };
|
||||
in
|
||||
{
|
||||
flake.modules.nixos.theme =
|
||||
{
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
cursorTheme = mkCursorTheme pkgs;
|
||||
cursorTheme = mkCursor pkgs;
|
||||
in
|
||||
{
|
||||
home-manager.sharedModules = [ hmModules.theme ];
|
||||
|
||||
environment.systemPackages = [ cursorTheme.package ];
|
||||
|
||||
services.displayManager.sddm.settings = {
|
||||
Theme = {
|
||||
CursorTheme = cursorTheme.name;
|
||||
CursorSize = cursorTheme.size;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
flake.modules.homeManager.theme =
|
||||
{ config, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
theme = facts.theme;
|
||||
cursorTheme = mkCursorTheme pkgs;
|
||||
|
||||
kanagawaThemeSrc = pkgs.fetchFromGitHub {
|
||||
inherit (theme.kanagawa)
|
||||
hash
|
||||
owner
|
||||
repo
|
||||
rev
|
||||
;
|
||||
};
|
||||
|
||||
kanagawaOverride = {
|
||||
version = theme.kanagawa.version;
|
||||
src = kanagawaThemeSrc;
|
||||
cursorTheme = mkCursor pkgs;
|
||||
version = "unstable-2025-10-23";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "Fausto-Korpsvart";
|
||||
repo = "Kanagawa-GKT-Theme";
|
||||
rev = "55ca4ba249eba21f861b9866b71ab41bb8930318";
|
||||
hash = "sha256-UdMoMx2DoovcxSp/zBZ3PRv/Qpj+prd0uPm1gmdak2E=";
|
||||
};
|
||||
override = { inherit src version; };
|
||||
in
|
||||
{
|
||||
home.pointerCursor = {
|
||||
@@ -68,17 +46,14 @@ in
|
||||
|
||||
gtk = {
|
||||
enable = true;
|
||||
gtk3.bookmarks = [
|
||||
"sftp://orion Orion VPS"
|
||||
];
|
||||
theme = {
|
||||
name = theme.kanagawa.gtkThemeName;
|
||||
package = pkgs.kanagawa-gtk-theme.overrideAttrs (_: kanagawaOverride);
|
||||
name = "Kanagawa-BL-LB";
|
||||
package = pkgs.kanagawa-gtk-theme.overrideAttrs (_: override);
|
||||
};
|
||||
gtk4.theme = null;
|
||||
iconTheme = {
|
||||
name = theme.kanagawa.iconThemeName;
|
||||
package = pkgs.kanagawa-icon-theme.overrideAttrs (_: kanagawaOverride);
|
||||
name = "Kanagawa";
|
||||
package = pkgs.kanagawa-icon-theme.overrideAttrs (_: override);
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
Reference in new issue
Block a user