Merge pull request #358 from genebean/rainbow

Add matrix and irc clients plus openvpn
This commit is contained in:
Gene Liverman 2024-01-24 21:48:41 -05:00 committed by GitHub
commit 13e2294f28
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 14 additions and 2 deletions

View file

@ -7,7 +7,7 @@
else "libsqlite3.so"; else "libsqlite3.so";
in { in {
home.packages = with pkgs; [ home.packages = with pkgs; [
bundix bundix
cargo cargo
cheat cheat
colordiff colordiff
@ -19,6 +19,7 @@ in {
fd fd
git-filter-repo git-filter-repo
glab glab
gomuks
gotop gotop
htop htop
httpie httpie
@ -105,7 +106,7 @@ in {
defaultBranch = "main"; defaultBranch = "main";
}; };
merge = { merge = {
conflictStyle = "diff3"; conflictStyle = "diff3";
tool = "meld"; tool = "meld";
}; };
pull = { pull = {
@ -113,6 +114,7 @@ in {
}; };
}; };
}; # end git }; # end git
irssi.enable = true;
jq.enable = true; jq.enable = true;
neovim = { neovim = {
enable = true; enable = true;

View file

@ -0,0 +1,3 @@
{ ... }: {
programs.hexchat.enable = true;
}

View file

@ -0,0 +1,3 @@
{ ... }: {
programs.pidgin.enable = true;
}

View file

@ -4,6 +4,8 @@
../../common/all-cli.nix ../../common/all-cli.nix
../../common/all-gui.nix ../../common/all-gui.nix
../../common/all-linux.nix ../../common/all-linux.nix
../../common/linux-apps/hexchat.nix
../../common/linux-apps/pidgin.nix
../../common/linux-apps/tilix.nix ../../common/linux-apps/tilix.nix
../../common/linux-apps/waybar.nix ../../common/linux-apps/waybar.nix
../../common/linux-apps/xfce4-terminal.nix ../../common/linux-apps/xfce4-terminal.nix

View file

@ -21,7 +21,9 @@
gnome.gnome-tweaks gnome.gnome-tweaks
gnome.nautilus gnome.nautilus
gnomeExtensions.dash-to-panel gnomeExtensions.dash-to-panel
gnome.networkmanager-openvpn
gnomeExtensions.tailscale-qs gnomeExtensions.tailscale-qs
networkmanager-openvpn
pavucontrol pavucontrol
polkit-kde-agent polkit-kde-agent
ulauncher ulauncher