refactor: move stuff to common, remove need for ripgrep config
This commit is contained in:
parent
11ca45ede7
commit
6a83bbf94a
6 changed files with 36 additions and 31 deletions
|
@ -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 {
|
||||
|
|
|
@ -7,8 +7,13 @@
|
|||
enable = true;
|
||||
enableBashIntegration = true;
|
||||
};
|
||||
ripgrep = {
|
||||
enable = true;
|
||||
arguments = [
|
||||
"--no-config"
|
||||
];
|
||||
};
|
||||
jq.enable = true;
|
||||
ripgrep.enable = true;
|
||||
|
||||
starship = let
|
||||
textColor = "#e3e5e5";
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
This empty config is to prevent the error message when running ripgrep without config
|
|
@ -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";
|
||||
|
|
|
@ -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" ''
|
||||
(
|
||||
|
|
Loading…
Reference in a new issue