From 93d901104718b497e59ccd2a9ed882f8d074d50d Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Tue, 23 Jan 2024 22:04:29 -0500 Subject: [PATCH] Add matrix and irc clients plus openvpn --- modules/home-manager/common/all-cli.nix | 6 ++++-- modules/home-manager/common/linux-apps/hexchat.nix | 3 +++ modules/home-manager/common/linux-apps/pidgin.nix | 3 +++ modules/home-manager/hosts/rainbow-planet/gene.nix | 2 ++ modules/hosts/nixos/rainbow-planet/default.nix | 2 ++ 5 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 modules/home-manager/common/linux-apps/hexchat.nix create mode 100644 modules/home-manager/common/linux-apps/pidgin.nix diff --git a/modules/home-manager/common/all-cli.nix b/modules/home-manager/common/all-cli.nix index 547a2d0..0489dc2 100644 --- a/modules/home-manager/common/all-cli.nix +++ b/modules/home-manager/common/all-cli.nix @@ -7,7 +7,7 @@ else "libsqlite3.so"; in { home.packages = with pkgs; [ - bundix + bundix cargo cheat colordiff @@ -19,6 +19,7 @@ in { fd git-filter-repo glab + gomuks gotop htop httpie @@ -105,7 +106,7 @@ in { defaultBranch = "main"; }; merge = { - conflictStyle = "diff3"; + conflictStyle = "diff3"; tool = "meld"; }; pull = { @@ -113,6 +114,7 @@ in { }; }; }; # end git + irssi.enable = true; jq.enable = true; neovim = { enable = true; diff --git a/modules/home-manager/common/linux-apps/hexchat.nix b/modules/home-manager/common/linux-apps/hexchat.nix new file mode 100644 index 0000000..6addb18 --- /dev/null +++ b/modules/home-manager/common/linux-apps/hexchat.nix @@ -0,0 +1,3 @@ +{ ... }: { + programs.hexchat.enable = true; +} diff --git a/modules/home-manager/common/linux-apps/pidgin.nix b/modules/home-manager/common/linux-apps/pidgin.nix new file mode 100644 index 0000000..e6d6840 --- /dev/null +++ b/modules/home-manager/common/linux-apps/pidgin.nix @@ -0,0 +1,3 @@ +{ ... }: { + programs.pidgin.enable = true; +} diff --git a/modules/home-manager/hosts/rainbow-planet/gene.nix b/modules/home-manager/hosts/rainbow-planet/gene.nix index ab07b4c..d823602 100644 --- a/modules/home-manager/hosts/rainbow-planet/gene.nix +++ b/modules/home-manager/hosts/rainbow-planet/gene.nix @@ -4,6 +4,8 @@ ../../common/all-cli.nix ../../common/all-gui.nix ../../common/all-linux.nix + ../../common/linux-apps/hexchat.nix + ../../common/linux-apps/pidgin.nix ../../common/linux-apps/tilix.nix ../../common/linux-apps/waybar.nix ../../common/linux-apps/xfce4-terminal.nix diff --git a/modules/hosts/nixos/rainbow-planet/default.nix b/modules/hosts/nixos/rainbow-planet/default.nix index 9230345..1a18d31 100644 --- a/modules/hosts/nixos/rainbow-planet/default.nix +++ b/modules/hosts/nixos/rainbow-planet/default.nix @@ -21,7 +21,9 @@ gnome.gnome-tweaks gnome.nautilus gnomeExtensions.dash-to-panel + gnome.networkmanager-openvpn gnomeExtensions.tailscale-qs + networkmanager-openvpn pavucontrol polkit-kde-agent ulauncher