nix/config
2
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

cleaned up some extraneous things

Browse source
This commit is contained in:
Natalie 2025-04-21 13:59:29 -07:00
parent 23747c52ec
commit 06569493a5
No known key found for this signature in database
GPG key ID: 61F4EAEB0C9C3D5F
3 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hosts/desktop/configuration.nix
View file

@ -25,8 +25,6 @@
noisetorch.enable = true; noisetorch.enable = true;
hyprland.enable = true;
fish.enable = true; fish.enable = true;
virt-manager.enable = true; virt-manager.enable = true;

11
modules/shared/extras.nix
View file

@ -29,23 +29,18 @@
enable = true; enable = true;
base16Scheme = "${pkgs.base16-schemes}/share/themes/${userSettings.theme}.yaml"; base16Scheme = "${pkgs.base16-schemes}/share/themes/${userSettings.theme}.yaml";
# pkgs.fetchurl {
# url = "https://raw.githubusercontent.com/tinted-theming/schemes/refs/heads/spec-0.11/base16/catppuccin-mocha.yaml";
# hash = "sha256-+/adkhwuW/3jCJ3/EWxyz99u13yuTk9Fqqy0YZ4KPPY=";
# };
fonts = { fonts = {
serif = { serif = {
package = pkgs.nerd-fonts.${userSettings.font}; package = pkgs.nerd-fonts.${userSettings.font};
name = "Iosevka Nerd Font"; name = "${userSettings.font} Nerd Font";
}; };
sansSerif = { sansSerif = {
package = pkgs.nerd-fonts.${userSettings.font}; package = pkgs.nerd-fonts.${userSettings.font};
name = "Iosevka Nerd Font"; name = "${userSettings.font} Nerd Font";
}; };
monospace = { monospace = {
package = pkgs.nerd-fonts.${userSettings.font}; package = pkgs.nerd-fonts.${userSettings.font};
name = "Iosevka Nerd Font"; name = "${userSettings.font} Nerd Font";
}; };
emoji = { emoji = {
package = pkgs.twemoji-color-font; package = pkgs.twemoji-color-font;

20
modules/shared/homeManagerPrograms.nix
View file

@ -1,6 +1,8 @@
{ {
pkgs, pkgs,
lib,
userSettings, userSettings,
systemSettings,
... ...
}: { }: {
nix-index.enable = true; nix-index.enable = true;
@ -17,15 +19,6 @@
nix-direnv.enable = true; nix-direnv.enable = true;
}; };
kitty = {
enable = true;
themeFile = "Catppuccin-Mocha";
extraConfig = "font_family Iosevka NF
italic_font auto
bold_italic_font auto
bold_font auto";
};
bat = { bat = {
enable = true; enable = true;
extraPackages = with pkgs.bat-extras; [batdiff batman batgrep batwatch batpipe prettybat]; extraPackages = with pkgs.bat-extras; [batdiff batman batgrep batwatch batpipe prettybat];
@ -59,9 +52,12 @@
inherit (pkgs.fishPlugins.bang-bang) src; inherit (pkgs.fishPlugins.bang-bang) src;
} }
]; ];
shellAliases = { shellAliases =
reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now"; {
}; }
// lib.optionalAttrs (!systemSettings.darwin) {
reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now";
};
shellInit = '' shellInit = ''
test -r '/Users/${userSettings.username}/.opam/opam-init/init.fish' && source '/Users/${userSettings.username}/.opam/opam-init/init.fish' > /dev/null 2> /dev/null; or true test -r '/Users/${userSettings.username}/.opam/opam-init/init.fish' && source '/Users/${userSettings.username}/.opam/opam-init/init.fish' > /dev/null 2> /dev/null; or true
batman --export-env | source batman --export-env | source