diff --git a/flake.lock b/flake.lock index 145b6fb..7e0959e 100644 --- a/flake.lock +++ b/flake.lock @@ -52,18 +52,36 @@ "type": "github" } }, + "home-manager": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1788146656, + "narHash": "sha256-XmJmvk9rytTb7dCotO/aqR+YysB8HOqnprlOdv+LAF4=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "82c265faf4e3161d6015db07c9b0f1ee36a9029b", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1788039129, - "narHash": "sha256-pa4Q0qErvCvzCaaUph7Sm37RhR4xvPrYI8Lgz6k85+A=", + "lastModified": 1787209939, + "narHash": "sha256-WvvHR4kSQLAbtouMC/ruZ5UpLwlUcY3K4FAllMN+yGk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d2f67949798825fe853f7c5d0492b8bf016d3f88", + "rev": "391b592eb44808b3bd0cb80bb71b63a5a118b8bb", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -84,6 +102,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1788039129, + "narHash": "sha256-pa4Q0qErvCvzCaaUph7Sm37RhR4xvPrYI8Lgz6k85+A=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d2f67949798825fe853f7c5d0492b8bf016d3f88", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1786719841, "narHash": "sha256-QcpQOT0NQEFkI77t+YXPZqDJc35iIodG7zinieOwFUg=", @@ -103,7 +137,8 @@ "inputs": { "base16": "base16", "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs", + "home-manager": "home-manager", + "nixpkgs": "nixpkgs_2", "tt-schemes": "tt-schemes", "wrappers": "wrappers" } @@ -126,7 +161,7 @@ }, "wrappers": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1787722691, diff --git a/flake.nix b/flake.nix index 0fc823a..90d02cd 100644 --- a/flake.nix +++ b/flake.nix @@ -38,9 +38,9 @@ { wrappers.emacs.enable = true; } home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; - home-manager.useUserPkgs = true; + home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { inherit inputs; }; - home-manager.users.lucy = ./modules/home.nix + home-manager.users.lucy = ./modules/home.nix; } ]; }; diff --git a/modules/home.nix b/modules/home.nix index 8f0d0b3..3b8d960 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -1,13 +1,37 @@ -{ inputs, pkgs, config, ...}: +{ + inputs, + pkgs, + config, + ... +}: let - schemeName = (pkgs.callPackage inputs.base16.lib {}).mkSchemeAttrs config.theme.name; + c = ((pkgs.callPackage inputs.base16.lib { }).mkSchemeAttrs config.theme.name).withHashtag; in { - home-manager.users.lucy = { - home-stateVersion = "26.05"; - gtk = { - enable = true; + home.stateVersion = "26.05"; + gtk = { + enable = true; + colorScheme = "dark"; + cursorTheme = { + name = "macOS"; + package = pkgs.apple-cursor; + size = 24; }; + gtk3.extraCss = '' + @define-color theme_bg_color ${c.base00}; + @define-color theme_fg_color ${c.base05}; + @define-color theme_base_color ${c.base00}; + @define-color theme_text_color ${c.base05}; + @define-color theme_selected_bg_color ${c.base0D}; + @define-color theme_selected_fg_color ${c.base00}; + @define-color insensitive_bg_color ${c.base01}; + @define-color insensitive_fg_color ${c.base03}; + @define-color borders ${c.base02}; + @define-color warning_color ${c.base0A}; + @define-color error_color ${c.base08}; + @define-color success_color ${c.base0B}; + ''; }; + }