| author |  Natalie Marks <nmarks413@gmail.com> 2025-04-21 13:59:29-07:00 |
| committer | Natalie Marks <nmarks413@gmail.com> 2025-04-21 13:59:29-07:00 |
| log | 06569493a560cdd1b7e2abea2e76c6682b0955bc |
| tree | e9f40066402d6231ec53eca75a407689fb44611a |
| parent | 23747c52ec5999362531ea8a96cf6e4e69fc23d0 |
| signature | Commit is signed but in an unrecognized format. |
cleaned up some extraneous things
3 files changed, 11 insertions(+), 22 deletions(-)
hosts
desktop
modules
hosts/desktop/configuration.nix-2
| ... | @@ -25,8 +25,6 @@ | ... | @@ -25,8 +25,6 @@ |
| 25 | 25 | ||
| 26 | noisetorch.enable = true; | 26 | noisetorch.enable = true; |
| 27 | 27 | ||
| 28 | hyprland.enable = true; | ||
| 29 | |||
| 30 | fish.enable = true; | 28 | fish.enable = true; |
| 31 | virt-manager.enable = true; | 29 | virt-manager.enable = true; |
| 32 | 30 |
modules/shared/extras.nix+3-8
| ... | @@ -29,23 +29,18 @@ | ... | @@ -29,23 +29,18 @@ |
| 29 | enable = true; | 29 | enable = true; |
| 30 | base16Scheme = "${pkgs.base16-schemes}/share/themes/${userSettings.theme}.yaml"; | 30 | base16Scheme = "${pkgs.base16-schemes}/share/themes/${userSettings.theme}.yaml"; |
| 31 | 31 | ||
| 32 | # pkgs.fetchurl { | ||
| 33 | # url = "https://raw.githubusercontent.com/tinted-theming/schemes/refs/heads/spec-0.11/base16/catppuccin-mocha.yaml"; | ||
| 34 | # hash = "sha256-+/adkhwuW/3jCJ3/EWxyz99u13yuTk9Fqqy0YZ4KPPY="; | ||
| 35 | # }; | ||
| 36 | |||
| 37 | fonts = { | 32 | fonts = { |
| 38 | serif = { | 33 | serif = { |
| 39 | package = pkgs.nerd-fonts.${userSettings.font}; | 34 | package = pkgs.nerd-fonts.${userSettings.font}; |
| 40 | name = "Iosevka Nerd Font"; | 35 | name = "${userSettings.font} Nerd Font"; |
| 41 | }; | 36 | }; |
| 42 | sansSerif = { | 37 | sansSerif = { |
| 43 | package = pkgs.nerd-fonts.${userSettings.font}; | 38 | package = pkgs.nerd-fonts.${userSettings.font}; |
| 44 | name = "Iosevka Nerd Font"; | 39 | name = "${userSettings.font} Nerd Font"; |
| 45 | }; | 40 | }; |
| 46 | monospace = { | 41 | monospace = { |
| 47 | package = pkgs.nerd-fonts.${userSettings.font}; | 42 | package = pkgs.nerd-fonts.${userSettings.font}; |
| 48 | name = "Iosevka Nerd Font"; | 43 | name = "${userSettings.font} Nerd Font"; |
| 49 | }; | 44 | }; |
| 50 | emoji = { | 45 | emoji = { |
| 51 | package = pkgs.twemoji-color-font; | 46 | package = pkgs.twemoji-color-font; |
modules/shared/homeManagerPrograms.nix+8-12
| ... | @@ -1,6 +1,8 @@ | ... | @@ -1,6 +1,8 @@ |
| 1 | { | 1 | { |
| 2 | pkgs, | 2 | pkgs, |
| 3 | lib, | ||
| 3 | userSettings, | 4 | userSettings, |
| 5 | systemSettings, | ||
| 4 | ... | 6 | ... |
| 5 | }: { | 7 | }: { |
| 6 | nix-index.enable = true; | 8 | nix-index.enable = true; |
| ... | @@ -17,15 +19,6 @@ | ... | @@ -17,15 +19,6 @@ |
| 17 | nix-direnv.enable = true; | 19 | nix-direnv.enable = true; |
| 18 | }; | 20 | }; |
| 19 | 21 | ||
| 20 | kitty = { | ||
| 21 | enable = true; | ||
| 22 | themeFile = "Catppuccin-Mocha"; | ||
| 23 | extraConfig = "font_family Iosevka NF | ||
| 24 | italic_font auto | ||
| 25 | bold_italic_font auto | ||
| 26 | bold_font auto"; | ||
| 27 | }; | ||
| 28 | |||
| 29 | bat = { | 22 | bat = { |
| 30 | enable = true; | 23 | enable = true; |
| 31 | extraPackages = with pkgs.bat-extras; [batdiff batman batgrep batwatch batpipe prettybat]; | 24 | extraPackages = with pkgs.bat-extras; [batdiff batman batgrep batwatch batpipe prettybat]; |
| ... | @@ -59,9 +52,12 @@ | ... | @@ -59,9 +52,12 @@ |
| 59 | inherit (pkgs.fishPlugins.bang-bang) src; | 52 | inherit (pkgs.fishPlugins.bang-bang) src; |
| 60 | } | 53 | } |
| 61 | ]; | 54 | ]; |
| 62 | shellAliases = { | 55 | shellAliases = |
| 63 | reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now"; | 56 | { |
| 64 | }; | 57 | } |
| 58 | // lib.optionalAttrs (!systemSettings.darwin) { | ||
| 59 | reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now"; | ||
| 60 | }; | ||
| 65 | shellInit = '' | 61 | shellInit = '' |
| 66 | 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 | 62 | 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 |
| 67 | batman --export-env | source | 63 | batman --export-env | source |