nullbite/nixfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update stylix

Browse Source
This commit is contained in:
NullBite 2024-08-16 11:42:52 +02:00
parent 94262c2c20
commit a455d2cd07
Signed by: nullbite
GPG Key ID: 6C4D545385D4925A
6 changed files with 19 additions and 18 deletions

17
flake.lock generated

@ -157,15 +157,15 @@
"base16-vim": { "base16-vim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1663659192, "lastModified": 1722597040,
"narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=", "narHash": "sha256-F4XRYPXhN47vwBQWPhWS5mBRNNwrgZ+n+n2WsRSh+vQ=",
"owner": "chriskempson", "owner": "tinted-theming",
"repo": "base16-vim", "repo": "base16-vim",
"rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d", "rev": "5a200412c9856085ce726beb4c14c47326c19700",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "chriskempson", "owner": "tinted-theming",
"repo": "base16-vim", "repo": "base16-vim",
"type": "github" "type": "github"
} }
@ -931,16 +931,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716384443, "lastModified": 1722946882,
"narHash": "sha256-utea2y5nEwzMM9rWJXDN0qmV4tJjRcMERQEcgk/ng00=", "narHash": "sha256-mxtnMye8gs82tdQbVC+g6v3aPOZlH150f9WyntHIkTg=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "e8e3304c2f8cf2ca60dcfc736a7422af2f24b8a8", "rev": "5853f1a8bd072f2ebabfc3de3973084353cf6f1e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "danth", "owner": "danth",
"ref": "e8e3304c2f8cf2ca60dcfc736a7422af2f24b8a8",
"repo": "stylix", "repo": "stylix",
"type": "github" "type": "github"
} }

2
flake.nix

@ -70,7 +70,7 @@
}; };
stylix = { stylix = {
url = "github:danth/stylix?ref=e8e3304c2f8cf2ca60dcfc736a7422af2f24b8a8"; url = "github:danth/stylix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager"; inputs.home-manager.follows = "home-manager";
}; };

7
home/common/theme.nix

@ -1,6 +1,7 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
cfg = config.nixfiles.theming; cfg = config.nixfiles.theming;
mkDefaultStylix = lib.mkOverride 999;
toCaps = s: with lib.strings; with builtins; toCaps = s: with lib.strings; with builtins;
(toUpper (substring 0 1 s)) + toLower (substring 1 ((stringLength s)-1) s); (toUpper (substring 0 1 s)) + toLower (substring 1 ((stringLength s)-1) s);
@ -80,9 +81,9 @@ in {
enable = true; enable = true;
autoEnable = true; autoEnable = true;
cursor = { cursor = {
package = lib.mkDefault ctp.packages.cursors; package = mkDefaultStylix ctp.packages.cursors;
name = lib.mkDefault ctp.names.cursors; name = mkDefaultStylix ctp.names.cursors;
size = lib.mkDefault 24; size = mkDefaultStylix 24;
# x11.enable = lib.mkDefault true; # x11.enable = lib.mkDefault true;
# gtk.enable = lib.mkDefault true; # gtk.enable = lib.mkDefault true;
}; };

3
home/standalone.nix

@ -1,9 +1,10 @@
# Home Manager default nixfiles entrypoint. This serves as an alternative to # Home Manager default nixfiles entrypoint. This serves as an alternative to
# default.nix, which sets up some more appropriate options for home-manager # default.nix, which sets up some more appropriate options for home-manager
{ pkgs, config, lib, ... }: { inputs, pkgs, config, lib, ... }:
{ {
imports = [ imports = [
./. ./.
inputs.stylix.homeManagerModules.stylix
]; ];
config = { config = {
# bash is more common on my standalone machines for some reason (low # bash is more common on my standalone machines for some reason (low

3
home/stylix.nix

@ -1,10 +1,11 @@
{ pkgs, lib, config, inputs, ... }@args: { pkgs, lib, config, inputs, ... }@args:
{ {
imports = [ inputs.stylix.homeManagerModules.stylix ]; imports = [ ];
config = { config = {
stylix = lib.mkMerge [ stylix = lib.mkMerge [
{ {
targets.vim.enable = lib.mkDefault false; targets.vim.enable = lib.mkDefault false;
targets.neovim.enable = lib.mkDefault false;
targets.gtk.enable = lib.mkDefault false; targets.gtk.enable = lib.mkDefault false;
targets.fzf.enable = lib.mkDefault false; targets.fzf.enable = lib.mkDefault false;
# the ring is styled light so it's light on light which looks worse than the default theme # the ring is styled light so it's light on light which looks worse than the default theme

5
system/stylix.nix

@ -10,7 +10,7 @@
# this naming is confusing as shit # this naming is confusing as shit
# this enables color theming of things by stylix # this enables color theming of things by stylix
autoEnable = lib.mkDefault config.stylix.enable; autoEnable = lib.mkDefault config.stylix.enable;
# this enables installation of fonts/images/etc # this enables the entire module. keep this off by default.
enable = lib.mkDefault false; enable = lib.mkDefault false;
# an image i like # an image i like
@ -22,8 +22,7 @@
# use system config in home-manager # use system config in home-manager
followSystem = lib.mkDefault true; followSystem = lib.mkDefault true;
# I will manually import within home-manager so it works standalone autoImport = lib.mkDefault true;
autoImport = lib.mkDefault false;
}; };
}; };
}; };