Fixes stylix on darwin

This commit is contained in:
willemml 2023-11-18 00:57:03 -08:00
parent 9f14c9b96f
commit 923b66d030
Signed by: willemml
GPG key ID: C3DE5DF6198DACBD
10 changed files with 20 additions and 12 deletions

View file

@ -4,6 +4,9 @@
globals, globals,
... ...
}: { }: {
stylix.image = pkgs.fetchurl globals.wallpapers.current;
stylix.polarity = "dark";
environment.pathsToLink = ["/share/zsh"]; environment.pathsToLink = ["/share/zsh"];
environment.shells = [pkgs.bashInteractive pkgs.zsh]; environment.shells = [pkgs.bashInteractive pkgs.zsh];
environment.systemPackages = [pkgs.coreutils pkgs.git]; environment.systemPackages = [pkgs.coreutils pkgs.git];

View file

@ -4,13 +4,17 @@ rec {
sha256 = "sha256-E4DsoDLc0kMfZGAmsmSY4nddsKwFm434maQrnilHeKs="; sha256 = "sha256-E4DsoDLc0kMfZGAmsmSY4nddsKwFm434maQrnilHeKs=";
}; };
fireportal = { fireportal = {
url = "https://w.wallhaven.cc/full/2y/wallhaven-2y6wwg.jpg"; url = "https://w.wallhaven.cc/full/jx/wallhaven-jxlwpm.jpg";
sha256 = "sha256-E4DsoDLc0kMfZGAmsmSY4nddsKwFm434maQrnilHeKs="; sha256 = "sha256-QhkMeInFBk7nEvyvpo0Lg20PmdPBKk8jQLY6vsLfzy4=";
}; };
mapleleaves = { mapleleaves = {
url = "https://w.wallhaven.cc/full/8x/wallhaven-8xxqey.jpg"; url = "https://w.wallhaven.cc/full/8x/wallhaven-8xxqey.jpg";
sha256 = "sha256-ohax2KzOmRt8JyUXO/7pDcy1EHXCdbfmzKzr9T3/hRk="; sha256 = "sha256-ohax2KzOmRt8JyUXO/7pDcy1EHXCdbfmzKzr9T3/hRk=";
}; };
kdb = {
url = "https://git.kdb424.xyz/kdb424/wallpapers/raw/branch/main/wallhaven-7p3we9.png";
sha256 = "05acf2czadfnxswnqpgx9rsx71mqspmz5kafi3i1d2z191az6inf";
};
current = hexflames; current = fireportal;
} }

View file

@ -13,8 +13,6 @@ in {
enable = true; enable = true;
config = { config = {
EnvironmentVariables = { EnvironmentVariables = {
TERM = "xterm-kitty";
TERMINFO = "${config.programs.kitty.package}/Applications/kitty.app/Contents/Resources/kitty/terminfo";
TERMINFO_DIRS = "${config.home.homeDirectory}/.nix-profile/share/terminfo:/run/current-system/sw/share/terminfo:/nix/var/nix/profiles/default/share/terminfo:/usr/share/terminfo"; TERMINFO_DIRS = "${config.home.homeDirectory}/.nix-profile/share/terminfo:/run/current-system/sw/share/terminfo:/nix/var/nix/profiles/default/share/terminfo:/usr/share/terminfo";
}; };
ProgramArguments = [ ProgramArguments = [

View file

@ -14,10 +14,9 @@ in rec {
./modules/nix/pkgs-config.nix ./modules/nix/pkgs-config.nix
./modules/nix/use-flake-pkgs.nix ./modules/nix/use-flake-pkgs.nix
inputs.nix-index-database.hmModules.nix-index inputs.nix-index-database.hmModules.nix-index
inputs.stylix.homeManagerModules.stylix
]; ];
stylix.image = pkgs.fetchurl globals.wallpapers.current; stylix.opacity.terminal = 0.80;
home = { home = {
username = globals.username; username = globals.username;

View file

@ -40,6 +40,7 @@ in {
programs.emacs.extraPackages = mkIf cfg.enableOrgTex cfg.texEmacsPackages; programs.emacs.extraPackages = mkIf cfg.enableOrgTex cfg.texEmacsPackages;
home.file.".emacs.d/nix-extraconfig.el".text = cfg.extraConfig;
home.file.".emacs.d/org-tex-cfg.el" = mkIf cfg.enableOrgTex (fileFromPathOrText cfg.orgTexConfigFile); home.file.".emacs.d/org-tex-cfg.el" = mkIf cfg.enableOrgTex (fileFromPathOrText cfg.orgTexConfigFile);
home.file.".emacs.d/early-init.el" = fileFromPathOrText cfg.earlyInitFile; home.file.".emacs.d/early-init.el" = fileFromPathOrText cfg.earlyInitFile;
home.file.".emacs.d/init.el" = fileFromPathOrText cfg.initFile; home.file.".emacs.d/init.el" = fileFromPathOrText cfg.initFile;

View file

@ -16,6 +16,9 @@
bash.enableCompletion = true; bash.enableCompletion = true;
alacritty.enable = true;
alacritty.settings.font.normal.style = lib.mkForce "Book";
direnv = { direnv = {
enable = true; enable = true;
enableBashIntegration = true; enableBashIntegration = true;

View file

@ -49,7 +49,6 @@
rustic rustic
s s
separedit separedit
solarized-theme
swiper swiper
yasnippet yasnippet
]) ])

View file

@ -87,6 +87,10 @@
(when (file-exists-p org-config) (when (file-exists-p org-config)
(load-file org-config)) (load-file org-config))
) )
(let ((nix-extraconfig (expand-file-name "~/.emacs.d/nix-extraconfig.el")))
(when (file-exists-p nix-extraconfig)
(load-file nix-extraconfig))
)
(setq org-directory (expand-file-name "~/Documents/org")) (setq org-directory (expand-file-name "~/Documents/org"))
@ -259,8 +263,6 @@
(global-set-key (kbd "C-c '") 'separedit) (global-set-key (kbd "C-c '") 'separedit)
(add-hook 'separedit-buffer-creation-hook 'normal-mode) (add-hook 'separedit-buffer-creation-hook 'normal-mode)
(load-theme 'solarized-gruvbox-dark t)
(global-set-key (kbd "C-s") 'swiper) (global-set-key (kbd "C-s") 'swiper)
(setq yas-snippet-dirs (list (expand-file-name "snippets" org-directory))) (setq yas-snippet-dirs (list (expand-file-name "snippets" org-directory)))

View file

@ -13,6 +13,7 @@
../users/willem/home/darwin.nix ../users/willem/home/darwin.nix
../modules/yabai/default.nix ../modules/yabai/default.nix
../modules/yabai/scripting-additions.nix ../modules/yabai/scripting-additions.nix
inputs.stylix.darwinModules.stylix
]; ];
nix = { nix = {

View file

@ -15,8 +15,6 @@
inputs.stylix.nixosModules.stylix inputs.stylix.nixosModules.stylix
]; ];
stylix.image = pkgs.fetchurl globals.wallpapers.current;
programs.command-not-found.enable = false; programs.command-not-found.enable = false;
console.keyMap = "colemak"; console.keyMap = "colemak";