Compare commits

...

3 commits

5 changed files with 34 additions and 26 deletions

View file

@ -12,11 +12,6 @@
config = { config = {
allowUnfree = true; allowUnfree = true;
}; };
# TODO: Move these to custom modules
overlays = [
(import ./overlays/wezterm.nix {inherit inputs;})
];
}; };
}; };
} }

View file

@ -3,6 +3,7 @@
config, config,
osConfig, osConfig,
lib, lib,
inputs,
pkgs, pkgs,
... ...
}: let }: let
@ -14,6 +15,8 @@ in {
options.marleyos.programs.wezterm.enable = mkEnableOption' "wezterm" osCfg; options.marleyos.programs.wezterm.enable = mkEnableOption' "wezterm" osCfg;
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
nixpkgs.overlays = [(import ../../../overlays/wezterm.nix {inherit inputs;})];
programs.wezterm = { programs.wezterm = {
enable = true; enable = true;
package = lib.mkIf pkgs.stdenv.isDarwin pkgs.emptyDirectory; package = lib.mkIf pkgs.stdenv.isDarwin pkgs.emptyDirectory;

View file

@ -45,7 +45,7 @@ in {
settings = let settings = let
cmd = command: {command = [command];}; cmd = command: {command = [command];};
in { in {
# prefer-no-csd = true; prefer-no-csd = true;
hotkey-overlay.skip-at-startup = true; hotkey-overlay.skip-at-startup = true;
environment = { environment = {

View file

@ -1,3 +1,3 @@
{inputs}: prev: { {inputs}: _: prev: {
wezterm = inputs.wezterm.packages."${prev.system}".default; wezterm = inputs.wezterm.packages."${prev.system}".default;
} }

View file

@ -21,35 +21,45 @@ publicly released, therefore things are likely to break.
## 🥚 Inputs ## 🥚 Inputs
- [Snowfall Lib](https://snowfall.org/guides/lib/quickstart/) - [easy-hosts](https://github.com/tgirlcloud/easy-hosts/tree/main)
- [Home Manager](https://nix-community.github.io/home-manager/) - [nix-darwin](https://github.com/nix-darwin/nix-darwin)
- [Home Manager](https://github.com/nix-community/home-manager)
- [Agenix](https://github.com/ryantm/agenix) - [Agenix](https://github.com/ryantm/agenix)
- [Stylix](https://codewith.babesonthe.net/punkfairie/rose-pine-nix) - [Stylix](https://github.com/nix-community/stylix)
- [MarleyVim](https://codewith.babesonthe.net/punkfairie/marleyvim)
## 🐣 Outputs ## 🐣 Outputs
- _systems:_ System config - _hosts:_ System config
- _systems/x86_64-linux/nyx:_ My main desktop, running NixOS. - _hosts/nyx:_ My main desktop, running NixOS.
- _systems/aarch64-darwin/mairley:_ My Macbook Air 2022ish. Main laptop. - _hosts/mairley:_ My Macbook Air 2022ish. Main laptop.
- _homes:_ Home manager config - _hosts/marleycentre:_ My LAN server.
- _homes/x86_64-linux/marley@nyx:_ Home configuration for nyx. - _hosts/marleynet:_ My public server.
- _homes/aarch64-darwin/marley@mairley:_ Home configuration for mairley.
- _modules:_ Most config is done here. The file structure is pretty - _modules:_ Most config is done here. The file structure is pretty
self-explanatory. self-explanatory.
- _modules/{home,nixos,darwin}/base:_ Anything in a base folder directly under - _modules/base:_ Config that applies to both NixOS & macOS.
a platform folder is always enabled and does not include a `<module>.enable` - _modules/{nixos,darwin,home}/shell:_ Config related to the graphical
option. environment. That includes theming, window managers/desktop environments,
- _modules/{home,nixos,darwin}/\<category>/base:_ These are not subject to the display managers, etc.
above, they simply denote options that apply to the whole category. - _overlays_
- _overlays/firefox-addons:_ A few addons that weren't in
[rycee's NUR repo](https://nur.nix-community.org/repos/rycee/).
- _overlays/ddclient:_ Pull in a specific version newer than what's in nixpkgs
because I need [Porkbun](https://porkbun.com/) support.
- _overlays/maple-mono-NF:_ Use
[my build](https://github.com/punkfairie/maple-font) of Maple Mono NF.
- _packages_ - _packages_
<!-- TODO: Make the package download the ROM? -->
- _packages/CEmu-TI-84-Plus-CE:_ CEmu wrapped to include my config. I believe - _packages/CEmu-TI-84-Plus-CE:_ CEmu wrapped to include my config. I believe
it still needs the ROM downloaded separately to function. it still needs the ROM downloaded separately to function. <!-- TODO: Make the package download the ROM? -->
- _packages/figlet-xero-fonts:_ Adding in [xero's custom fonts](https://github.com/xero/figlet-fonts/). - _packages/figlet-xero-fonts:_ Adding in
[xero's custom fonts](https://github.com/xero/figlet-fonts/).
- _packages/phpstorm-with-node:_ PHPStorm wrapped to give it access to NodeJS. - _packages/phpstorm-with-node:_ PHPStorm wrapped to give it access to NodeJS.
## 🫶 Credits ## 🫶 Credits
- [jakehamilton/config](https://github.com/jakehamilton/config) - the general - [isabelroses/dotfiles](https://github.com/isabelroses/dotfiles) - the general
structure of my config was heavily inspired by jakehamilton's. structure of my config was heavily inspired by Isabel's.
- [the nix logo used in this readme](https://lix.systems/) - [the nix logo used in this readme](https://lix.systems/)
<!-- TODO: update ddclient -->
<!-- TODO: update maple mono NF -->