From 24b079937cb5d98a9883ae644d0a8a3eb99564f6 Mon Sep 17 00:00:00 2001 From: Julian Mutter Date: Thu, 6 Jun 2024 11:17:43 +0200 Subject: [PATCH] kardorf: fix i3 config file path option --- homes/x86_64-linux/julian@kardorf/default.nix | 5 +---- modules/home/i3/default.nix | 12 ++++++------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/homes/x86_64-linux/julian@kardorf/default.nix b/homes/x86_64-linux/julian@kardorf/default.nix index 8242c92..1023369 100644 --- a/homes/x86_64-linux/julian@kardorf/default.nix +++ b/homes/x86_64-linux/julian@kardorf/default.nix @@ -33,10 +33,7 @@ config, ... }: { neovim.enable = true; alacritty.enable = true; emacs.enable = true; - i3 = { - enable = true; - config-file = ../../../modules/home/i3/i3/config-kardorf; - }; + i3 = { enable = true; }; rofi.enable = true; }; diff --git a/modules/home/i3/default.nix b/modules/home/i3/default.nix index d1e66cd..9864657 100644 --- a/modules/home/i3/default.nix +++ b/modules/home/i3/default.nix @@ -16,16 +16,13 @@ virtual systems, # An attribute map of your defined hosts. # All other arguments come from the module system. -config, ... }: +config, host, ... }: with lib; let cfg = config.modules.i3; in { - options.modules.i3 = { - enable = mkOption { default = false; }; - config-file = mkOption { default = ./i3/config; }; - }; + options.modules.i3 = { enable = mkOption { default = false; }; }; config = mkIf cfg.enable { programs = { i3status-rust = { enable = true; }; }; @@ -33,7 +30,10 @@ in { xsession.windowManager.i3 = { enable = true; }; # Overwrite default home-manager config file - xdg.configFile."i3/config".source = lib.mkForce cfg.config-file; + xdg.configFile."i3/config".source = lib.mkForce (if host == "kardorf" then + ./i3/config-kardorf + else + lib.mkForce ./i3/config); home.file = { ".config/i3/scripts" = {