diff --git a/hosts/muop/configuration.nix b/hosts/muop/configuration.nix index 8a252aa..a02553d 100644 --- a/hosts/muop/configuration.nix +++ b/hosts/muop/configuration.nix @@ -62,10 +62,11 @@ in { }; }; - # environment.variables = { - # # GDK_SCALE = "2"; - # # XCURSOR_SIZE = "24"; - # }; + environment.variables = { + WINIT_HIDPI_FACTOR = "1"; + # GDK_SCALE = "2"; + # XCURSOR_SIZE = "24"; + }; hardware = { opengl = { diff --git a/modules/home/default.nix b/modules/home/default.nix index b3492e6..75a140b 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -1,5 +1,5 @@ -{ pkgs, lib, config, osConfig, ... }: let - cfg = osConfig.mods; +{ pkgs, lib, config, osConfig, ... }: +let cfg = osConfig.mods; in { imports = [ @@ -13,4 +13,6 @@ in { programs.home-manager.enable = true; home.username = cfg.user.name; home.homeDirectory = "/home/${cfg.user.name}"; + # home.profileDirectory = + # "${config.home.homeDirectory}/.local/state/nix/profile/"; } diff --git a/modules/home/terminal/development.nix b/modules/home/terminal/development.nix index 7110b05..160563b 100644 --- a/modules/home/terminal/development.nix +++ b/modules/home/terminal/development.nix @@ -71,6 +71,7 @@ in { programs.direnv = { enable = true; nix-direnv.enable = true; + enableZshIntegration = lib.mkIf config.mods.terminal.zsh.enable true; }; home.sessionVariables.EDITOR = "hx"; diff --git a/modules/home/terminal/tools.nix b/modules/home/terminal/tools.nix index 28902b4..4daf57c 100644 --- a/modules/home/terminal/tools.nix +++ b/modules/home/terminal/tools.nix @@ -1,36 +1,35 @@ { pkgs, lib, config, ... }: -let - cfg = config.mods.terminal; +let cfg = config.mods.terminal; in with lib; { options.mods.terminal.tools.enable = mkEnableOption "enables cli tools"; config = mkIf cfg.tools.enable { - programs.zellij = { - enable = true; - # enableZshIntegration = mkIf cfg.zsh.enable true; - }; - programs.fzf = { - enable = true; - enableZshIntegration = mkIf cfg.zsh.enable true; - }; + programs = builtins.listToAttrs (map (name: { + name = name; + value = { + enable = true; + } // optionalAttrs + (builtins.hasAttr "enableZshIntegration" config.programs.${name}) { + enableZshIntegration = mkIf cfg.zsh.enable true; + }; + }) [ + "zellij" + "fzf" + "eza" + "bat" + "zoxide" + "dircolors" + "yazi" + "nix-index" + "thefuck" - programs.zoxide = { - enable = true; - enableZshIntegration = mkIf cfg.zsh.enable true; - }; - - programs.dircolors = { - enable = true; - enableZshIntegration = mkIf cfg.zsh.enable true; - }; - - programs.yazi = { - enable = true; - enableZshIntegration = mkIf cfg.zsh.enable true; - }; - - programs.lazygit.enable = true; + "lazygit" + "fd" + "ripgrep" + "bottom" + "htop" + ]); home.packages = with pkgs; [ # libraries @@ -38,13 +37,11 @@ in with lib; { ueberzugpp # file managing - fd - ripgrep trash-cli # programs - bottom fend + unzip ]; }; } diff --git a/modules/home/xdg.nix b/modules/home/xdg.nix index fd84ae0..9296122 100644 --- a/modules/home/xdg.nix +++ b/modules/home/xdg.nix @@ -1,10 +1,11 @@ { pkgs, lib, config, ... }: { - options.mods.xdg.enable = - lib.mkEnableOption "enables xdg settings"; + options.mods.xdg.enable = lib.mkEnableOption "enables xdg settings"; config = lib.mkIf config.mods.xdg.enable { - xdg = let - browser = ["librewolf.desktop"]; + nix.settings.use-xdg-base-directories = true; + + xdg = let + browser = [ "librewolf.desktop" ]; associations = { "text/html" = browser; "x-scheme-handler/http" = browser; @@ -19,13 +20,13 @@ "application/x-extension-xhtml" = browser; "application/x-extension-xht" = browser; - "audio/*" = ["mpv.desktop"]; - "video/*" = ["mpv.dekstop"]; - "image/*" = ["imv.desktop"]; + "audio/*" = [ "mpv.desktop" ]; + "video/*" = [ "mpv.dekstop" ]; + "image/*" = [ "imv.desktop" ]; "application/json" = browser; # "application/pdf" = ["org.pwmt.zathura.desktop.desktop"]; - "x-scheme-handler/tg" = ["kotatogram-desktop.desktop"]; - "x-scheme-handler/discord" = ["vesktop.desktop"]; + "x-scheme-handler/tg" = [ "kotatogram-desktop.desktop" ]; + "x-scheme-handler/discord" = [ "vesktop.desktop" ]; }; in { enable = true;