From 9b930ea0e088917656e1c9949e2d9517ab911118 Mon Sep 17 00:00:00 2001 From: muon Date: Mon, 22 Dec 2025 18:27:52 +0000 Subject: [PATCH] Fix errors --- hosts/muho/home.nix | 16 ++++++++++------ modules/home/terminal/development.nix | 5 ----- modules/home/terminal/nvim/default.nix | 2 +- modules/home/terminal/nvim/obsidian.nix | 3 +-- modules/home/terminal/zellij/default.nix | 2 -- 5 files changed, 12 insertions(+), 16 deletions(-) diff --git a/hosts/muho/home.nix b/hosts/muho/home.nix index 28de781..84075d4 100644 --- a/hosts/muho/home.nix +++ b/hosts/muho/home.nix @@ -1,5 +1,10 @@ -{ pkgs, lib, osConfig, sources, ... }: -let cfg = osConfig.mods; +{ + pkgs, + lib, + osConfig, + ... +}: let + cfg = osConfig.mods; in { # Modules mods.xdg.enable = true; @@ -12,6 +17,7 @@ in { mods.desktop.development.enable = false; mods.desktop.productivity.enable = false; mods.desktop.media.enable = false; + mods.obsidian.enable = false; # Hardware preferences @@ -37,10 +43,8 @@ in { }; profiles.default = { fingerprint = { - "${cfg.monitors.primary.name}" = - "00ffffffffffff004c2d850433324d431a120103803420782aee91a3544c99260f5054bfef80714f8100814081809500a940b30001011a3680a070381f403020350006202000001a000000fd00384b1e5111000a202020202020000000fc0053796e634d61737465720a2020000000ff004831414b3530303030300a202000e9"; - "${cfg.monitors.secondary.name}" = - "00ffffffffffff00410cca140101010134100103804728788a288e9e5548972416484badce0031594559615981800101010101010101a91a00a05000163030203700c48e21000018662150b051001b3040703600c48e21000018000000fc005068696c697073545620283529000000fd002f551f500e000a2020202020200156020323714f930414051f10121103020116150706230907078301000066030c00100080011d00bc52d01e20b8285540c48e2100001a011d007251d01e206e285500c48e2100001e011d80d0721c1620102c2580c48e2100009e011d8018711c1620582c2500c48e2100009ef33980d072382d40102c4580c48e2100001e0000f2"; + "${cfg.monitors.primary.name}" = "00ffffffffffff004c2d850433324d431a120103803420782aee91a3544c99260f5054bfef80714f8100814081809500a940b30001011a3680a070381f403020350006202000001a000000fd00384b1e5111000a202020202020000000fc0053796e634d61737465720a2020000000ff004831414b3530303030300a202000e9"; + "${cfg.monitors.secondary.name}" = "00ffffffffffff00410cca140101010134100103804728788a288e9e5548972416484badce0031594559615981800101010101010101a91a00a05000163030203700c48e21000018662150b051001b3040703600c48e21000018000000fc005068696c697073545620283529000000fd002f551f500e000a2020202020200156020323714f930414051f10121103020116150706230907078301000066030c00100080011d00bc52d01e20b8285540c48e2100001a011d007251d01e206e285500c48e2100001e011d80d0721c1620102c2580c48e2100009e011d8018711c1620582c2500c48e2100009ef33980d072382d40102c4580c48e2100001e0000f2"; }; config = { "${cfg.monitors.primary.name}" = cfg.monitors.primary.config; diff --git a/modules/home/terminal/development.nix b/modules/home/terminal/development.nix index 61d9fbe..89392a4 100644 --- a/modules/home/terminal/development.nix +++ b/modules/home/terminal/development.nix @@ -12,11 +12,6 @@ in { options.mods.terminal.development.enable = lib.mkEnableOption "enables cli editor"; - options.mods.obsidian.enable = - lib.mkEnableOption "enables obsidian"; - - imports = [inputs.nvf.homeManagerModules.default]; - config = lib.mkIf config.mods.terminal.development.enable { mods = { nvim.enable = true; diff --git a/modules/home/terminal/nvim/default.nix b/modules/home/terminal/nvim/default.nix index 08c3e38..7e16002 100644 --- a/modules/home/terminal/nvim/default.nix +++ b/modules/home/terminal/nvim/default.nix @@ -17,7 +17,7 @@ enable = true; settings = { vim = { - viAlias = false; + viAlias = true; vimAlias = true; lsp = { enable = true; diff --git a/modules/home/terminal/nvim/obsidian.nix b/modules/home/terminal/nvim/obsidian.nix index 9030f55..5ece63b 100644 --- a/modules/home/terminal/nvim/obsidian.nix +++ b/modules/home/terminal/nvim/obsidian.nix @@ -6,7 +6,7 @@ options.mods.obsidian.enable = lib.mkEnableOption "enables obsidian"; - config = lib.mkIf config.obsidian.enable { + config = lib.mkIf config.mods.obsidian.enable { programs.nvf.settings.vim.notes.obsidian = { enable = true; setupOpts = { @@ -118,6 +118,5 @@ }; }; }; - todo-comments.enable = true; }; } diff --git a/modules/home/terminal/zellij/default.nix b/modules/home/terminal/zellij/default.nix index e72ca74..58b9eef 100644 --- a/modules/home/terminal/zellij/default.nix +++ b/modules/home/terminal/zellij/default.nix @@ -12,8 +12,6 @@ in { options.mods.zellij.enable = lib.mkEnableOption "enables zellij"; - imports = [inputs.nvf.homeManagerModules.default]; - config = lib.mkIf config.mods.terminal.development.enable { programs.zellij = { settings = {