diff --git a/roles/desktop.nix b/roles/desktop.nix index 175b01f..bd0ae20 100644 --- a/roles/desktop.nix +++ b/roles/desktop.nix @@ -116,13 +116,18 @@ in { pavucontrol pcmanfm pulseeffects-pw + unstable.alacritty + unstable.keepassxc + unstable.noisetorch + + solaar + gdk-pixbuf + wl-clipboard xdg_utils xfce.thunar xfce.thunar-volman ydotool - unstable.alacritty - unstable.keepassxc ( pkgs.writeTextFile { name = "startsway"; diff --git a/roles/dev.nix b/roles/dev.nix index 4bc6583..d046695 100644 --- a/roles/dev.nix +++ b/roles/dev.nix @@ -12,14 +12,10 @@ in { unstable.golangci-lint unstable.gopls unstable.rust-analyzer - unstable.esphome + #unstable.esphome - (python38.withPackages(python-packages: with python-packages; [ - dnspython - pyls-black - pyls-isort - pyls-mypy - python-language-server + nodePackages.pyright + (python39.withPackages(python-packages: with python-packages; [ pyyaml requests ])) diff --git a/roles/network.nix b/roles/network.nix index 20dd4a5..c56b4bf 100644 --- a/roles/network.nix +++ b/roles/network.nix @@ -2,7 +2,6 @@ let unstable = import { config.allowUnfree = true; }; - cloudstation = pkgs.libsForQt5.callPackage (import ../packages/cloudstation.nix) {}; in { networking.networkmanager.enable = true; diff --git a/roles/work.nix b/roles/work.nix index c82fc31..6535389 100644 --- a/roles/work.nix +++ b/roles/work.nix @@ -3,6 +3,7 @@ let unstable = import { config.allowUnfree = true; }; cloudstation = pkgs.callPackage (import ../packages/cloudstation.nix) {}; + nagstamon = pkgs.libsForQt5.callPackage (import ../packages/nagstamon.nix) {}; in { security.pki.certificateFiles = [ @@ -13,22 +14,32 @@ in { networking.extraHosts = '' 35.234.109.94 fsi.thomann.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; [ (import ../packages/oc311.nix) (import ../packages/oc46.nix) (import ../packages/openshift-install-4.5.nix) + # (import ../packages/vaultsink.nix) needs opensource verson cloudstation + nagstamon + astroid - (pkgs.libsForQt5.callPackage (import ../packages/nagstamon.nix) {}) drone-cli - govc go-jira + govc + ttyd + unstable.discord unstable.google-cloud-sdk unstable.slack unstable.velero - unstable.discord unstable.obs-studio unstable.obs-studio-plugins.wlrobs