diff --git a/common/default.nix b/common/default.nix index 9bea625c..17c25ae1 100644 --- a/common/default.nix +++ b/common/default.nix @@ -1,4 +1,4 @@ -{ home-manager, lib, nixpkgs, nur, ... }: { +{ config, home-manager, lib, nixpkgs, nur, nix-melt, nurl, pkgs, ... }: { imports = [ home-manager.nixosModules.default ./overlays/list.nix @@ -36,6 +36,32 @@ ./modules/neovim ./modules/bash ]; + + home.packages = [ + nix-melt.packages.x86_64-linux.default + nurl.packages.x86_64-linux.default + ] ++ + + (with config.nur.repos.rycee; [ + mozilla-addons-to-nix + ]) ++ + + (with pkgs.nodePackages; [ + undollar + ]) ++ + + (with pkgs; [ + neofetch + progress + wget + tree + mosh + rsync + killall + imagemagick + usbutils + ]); + home.stateVersion = lib.mkDefault "23.05"; }; in { diff --git a/common/modules/bash/default.nix b/common/modules/bash/default.nix index ae3512f1..6c0a1c5a 100644 --- a/common/modules/bash/default.nix +++ b/common/modules/bash/default.nix @@ -7,8 +7,13 @@ enable = true; enableBashIntegration = true; }; + ripgrep = { + enable = true; + arguments = [ + "--no-config" + ]; + }; jq.enable = true; - ripgrep.enable = true; starship = let textColor = "#e3e5e5"; diff --git a/hosts/wim/config/ripgrep/README.md b/hosts/wim/config/ripgrep/README.md deleted file mode 100644 index 9500162a..00000000 --- a/hosts/wim/config/ripgrep/README.md +++ /dev/null @@ -1 +0,0 @@ -This empty config is to prevent the error message when running ripgrep without config diff --git a/hosts/wim/config/ripgrep/ripgreprc b/hosts/wim/config/ripgrep/ripgreprc deleted file mode 100644 index e69de29b..00000000 diff --git a/hosts/wim/home/dotfiles.nix b/hosts/wim/home/dotfiles.nix index 6442afa7..5583d406 100644 --- a/hosts/wim/home/dotfiles.nix +++ b/hosts/wim/home/dotfiles.nix @@ -17,8 +17,6 @@ in ''; "gtklock/style.css".source = symlink "${configDir}/gtklock/style.css"; - "ripgrep".source = symlink "${configDir}/ripgrep"; - "discord/settings.json".source = symlink "${configDir}/discord/settings.json"; "dolphinrc".source = symlink "${configDir}/dolphinrc"; diff --git a/hosts/wim/home/packages.nix b/hosts/wim/home/packages.nix index 19af9a93..113bb783 100644 --- a/hosts/wim/home/packages.nix +++ b/hosts/wim/home/packages.nix @@ -1,7 +1,6 @@ -{ pkgs, config, nixpkgs-wayland, nix-melt, nurl, ... }: let +{ pkgs, nixpkgs-wayland, ... }: let waypkgs = nixpkgs-wayland.packages.x86_64-linux; -in -{ +in { programs = { obs-studio = { @@ -14,20 +13,11 @@ in btop.enable = true; }; - home.packages = [ - nix-melt.packages.x86_64-linux.default - nurl.packages.x86_64-linux.default - ] ++ - - (with pkgs.python311Packages; [ + home.packages = (with pkgs.python311Packages; [ python pyclip ]) ++ - (with pkgs.nodePackages; [ - undollar - ]) ++ - (with pkgs.plasma5Packages; [ polkit-kde-agent ark @@ -51,10 +41,6 @@ in seahorse ]) ++ - (with config.nur.repos.rycee; [ - mozilla-addons-to-nix - ]) ++ - (with pkgs; [ # School virt-manager @@ -77,18 +63,9 @@ in xournalpp # Misc CLI - neofetch acpi - progress alsa-utils - wget - tree - mosh - rsync - killall fontfor - imagemagick - usbutils (writeShellScriptBin "Gparted" '' (