fixed merge conflicts

This commit is contained in:
vali 2024-04-13 15:35:13 +02:00
commit 1070fe3a7e
49 changed files with 814 additions and 92 deletions

View file

@ -1,9 +1,9 @@
{ config, lib, ... }:
with lib; let
cfg = config.myOptions.programs.btop;
username = config.myOptions.other.system.username;
cfg = config.modules.programs.btop;
username = config.modules.other.system.username;
in {
options.myOptions.programs.btop.enable = mkEnableOption "btop";
options.modules.programs.btop.enable = mkEnableOption "btop";
config = mkIf cfg.enable {
home-manager.users.${username} = {

View file

@ -5,10 +5,10 @@
pkgs,
...
}: with lib; let
cfg = config.myOptions.programs.neovim;
username = config.myOptions.other.system.username;
cfg = config.modules.programs.neovim;
username = config.modules.other.system.username;
in {
options.myOptions.programs.neovim.enable = mkEnableOption "neovim";
options.modules.programs.neovim.enable = mkEnableOption "neovim";
config = mkIf cfg.enable {
nixpkgs.overlays = [ inputs.neovim-nightly-overlay.overlay ];