From ac3b73217a8733cac78d585edff0baa97341b0f8 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Wed, 3 May 2023 00:43:33 +0200 Subject: [PATCH] update hm config --- home.nix | 18 +++++++++++++----- programs/bat.nix | 4 +--- programs/command-not-found.nix | 4 +--- programs/fzf.nix | 1 - programs/zsh.nix | 12 ++++++------ 5 files changed, 21 insertions(+), 18 deletions(-) diff --git a/home.nix b/home.nix index bc2fdaa..72c1b3b 100644 --- a/home.nix +++ b/home.nix @@ -1,7 +1,14 @@ { config, pkgs, lib, ... }: let - chromeArgs = - "--force-dark-mode --enable-features=WebUIDarkMode --enable-smooth-scrolling --ozone-platform-hint=auto --ignore-gpu-blocklist --enable-gpu-rasterization --enable-zero-copy"; + chromeArgs = lib.strings.concatStringsSep " " [ + "--force-dark-mode" + "--enable-features=WebUIDarkMode" + "--enable-smooth-scrolling" + "--ozone-platform-hint=auto" + "--ignore-gpu-blocklist" + "--enable-gpu-rasterization" + "--enable-zero-copy" + ]; nixgl = import { }; nixGLWrap = pkg: pkgs.runCommand "${pkg.name}-nixgl-wrapper" { } '' @@ -20,7 +27,8 @@ in { targets.genericLinux.enable = true; news.display = "silent"; - imports = map (n: "${./programs}/${n}") (builtins.attrNames (builtins.readDir ./programs)); + imports = map (n: "${./programs}/${n}") + (builtins.attrNames (builtins.readDir ./programs)); home = { username = "thilo"; @@ -39,8 +47,8 @@ in { pkgs.devbox pkgs.tldr pkgs.flutter - pkgs.direnv - (import (fetchTarball https://github.com/cachix/devenv/archive/v0.6.2.tar.gz)).default + (import (fetchTarball + "https://github.com/cachix/devenv/archive/v0.6.2.tar.gz")).default (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" "FiraCode" "FiraMono" ]; }) diff --git a/programs/bat.nix b/programs/bat.nix index ece9136..3ab65fb 100644 --- a/programs/bat.nix +++ b/programs/bat.nix @@ -1,7 +1,5 @@ { config, pkgs, lib, ... }: { - programs.bat = { - enable = true; - }; + programs.bat = { enable = true; }; } diff --git a/programs/command-not-found.nix b/programs/command-not-found.nix index cd3d7f0..e7a01be 100644 --- a/programs/command-not-found.nix +++ b/programs/command-not-found.nix @@ -1,7 +1,5 @@ { config, pkgs, lib, ... }: { - programs.command-not-found = { - enable = true; - }; + programs.command-not-found = { enable = true; }; } diff --git a/programs/fzf.nix b/programs/fzf.nix index cf4a7e6..6a1e4bb 100644 --- a/programs/fzf.nix +++ b/programs/fzf.nix @@ -4,6 +4,5 @@ programs.fzf = { enable = true; enableZshIntegration = true; - }; } diff --git a/programs/zsh.nix b/programs/zsh.nix index eee6151..d91f076 100644 --- a/programs/zsh.nix +++ b/programs/zsh.nix @@ -11,7 +11,6 @@ let "gradle" "node" "npm" - "nvm" "rbenv" "sudo" "direnv" @@ -39,16 +38,17 @@ in { undo-git-reset-head = "git reset 'HEAD@{1}'"; update-local = "bash $HOME/.dotfiles/install"; }; + plugins = [{ + name = "bun"; + file = "completions/bun.zsh"; + src = pkgs.bun; + }]; zplug = { enable = true; plugins = map (x: { name = "plugins/${x}"; tags = [ "from:oh-my-zsh" ]; - }) omz-plugins ++ [ - { - name = "chisui/zsh-nix-shell"; - } - ]; + }) omz-plugins; }; }; }