cleanup packages and work updates

This commit is contained in:
foosinn 2021-08-03 17:22:30 +02:00
parent 6e6b8224b0
commit 3e3a3a291a
4 changed files with 24 additions and 13 deletions

View file

@ -116,13 +116,18 @@ in {
pavucontrol pavucontrol
pcmanfm pcmanfm
pulseeffects-pw pulseeffects-pw
unstable.alacritty
unstable.keepassxc
unstable.noisetorch
solaar
gdk-pixbuf
wl-clipboard wl-clipboard
xdg_utils xdg_utils
xfce.thunar xfce.thunar
xfce.thunar-volman xfce.thunar-volman
ydotool ydotool
unstable.alacritty
unstable.keepassxc
( (
pkgs.writeTextFile { pkgs.writeTextFile {
name = "startsway"; name = "startsway";

View file

@ -12,14 +12,10 @@ in {
unstable.golangci-lint unstable.golangci-lint
unstable.gopls unstable.gopls
unstable.rust-analyzer unstable.rust-analyzer
unstable.esphome #unstable.esphome
(python38.withPackages(python-packages: with python-packages; [ nodePackages.pyright
dnspython (python39.withPackages(python-packages: with python-packages; [
pyls-black
pyls-isort
pyls-mypy
python-language-server
pyyaml pyyaml
requests requests
])) ]))

View file

@ -2,7 +2,6 @@
let let
unstable = import <nixos-unstable> { config.allowUnfree = true; }; unstable = import <nixos-unstable> { config.allowUnfree = true; };
cloudstation = pkgs.libsForQt5.callPackage (import ../packages/cloudstation.nix) {};
in { in {
networking.networkmanager.enable = true; networking.networkmanager.enable = true;

View file

@ -3,6 +3,7 @@
let let
unstable = import <nixos-unstable> { config.allowUnfree = true; }; unstable = import <nixos-unstable> { config.allowUnfree = true; };
cloudstation = pkgs.callPackage (import ../packages/cloudstation.nix) {}; cloudstation = pkgs.callPackage (import ../packages/cloudstation.nix) {};
nagstamon = pkgs.libsForQt5.callPackage (import ../packages/nagstamon.nix) {};
in { in {
security.pki.certificateFiles = [ security.pki.certificateFiles = [
@ -13,22 +14,32 @@ in {
networking.extraHosts = '' networking.extraHosts = ''
35.234.109.94 fsi.thomann.de 35.234.109.94 fsi.thomann.de
10.100.7.11 mon.netzmarkt.de 10.100.7.11 mon.netzmarkt.de
172.23.0.2 api.kube.local
172.23.0.2 hubble.kube.local
172.23.0.2 bonedo.kube.local
172.23.0.2 linkerd.kube.local
172.23.0.2 argo.kube.local
''; '';
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
(import ../packages/oc311.nix) (import ../packages/oc311.nix)
(import ../packages/oc46.nix) (import ../packages/oc46.nix)
(import ../packages/openshift-install-4.5.nix) (import ../packages/openshift-install-4.5.nix)
# (import ../packages/vaultsink.nix) needs opensource verson
cloudstation cloudstation
nagstamon
astroid astroid
(pkgs.libsForQt5.callPackage (import ../packages/nagstamon.nix) {})
drone-cli drone-cli
govc
go-jira go-jira
govc
ttyd
unstable.discord
unstable.google-cloud-sdk unstable.google-cloud-sdk
unstable.slack unstable.slack
unstable.velero unstable.velero
unstable.discord
unstable.obs-studio unstable.obs-studio
unstable.obs-studio-plugins.wlrobs unstable.obs-studio-plugins.wlrobs