summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2022-05-31 20:12:06 +0200
committertv <tv@krebsco.de>2022-07-14 15:46:49 +0200
commitd389189efd7efe36df6a285efdc6a9caea29b1fe (patch)
tree0bb7edc62c8691028c243438493299c9f10e0fd7
parentdd7ef4034f228ebab4a05d7b622a0c231af13ada (diff)
tv: firefoxWrapper -> firefox
-rw-r--r--tv/1systems/alnus/config.nix6
-rw-r--r--tv/1systems/mu/config.nix34
-rw-r--r--tv/1systems/querel/config.nix20
-rw-r--r--tv/5pkgs/simple/ff.nix2
4 files changed, 31 insertions, 31 deletions
diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix
index 54f845ec2..c09e7f9b1 100644
--- a/tv/1systems/alnus/config.nix
+++ b/tv/1systems/alnus/config.nix
@@ -15,9 +15,9 @@ with import <stockholm/lib>;
};
};
- environment.systemPackages = with pkgs; [
- firefoxWrapper
- networkmanagerapplet
+ environment.systemPackages = [
+ pkgs.firefox
+ pkgs.networkmanagerapplet
(pkgs.pidgin-with-plugins.override {
plugins = [ pkgs.pidginotr ];
})
diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index 00b177963..21be25766 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -56,26 +56,26 @@ with import <stockholm/lib>;
${pkgs.kmod}/bin/modprobe -v iwlwifi
'';
- environment.systemPackages = with pkgs; [
- chromium
- firefoxWrapper
- gimp
- iptables
- libreoffice
- plasma-pa
+ environment.systemPackages = [
+ pkgs.chromium
+ pkgs.firefox
+ pkgs.gimp
+ pkgs.iptables
+ pkgs.libreoffice
+ pkgs.plasma-pa
(pkgs.pidgin-with-plugins.override {
plugins = [ pkgs.pidginotr ];
})
- skype
- slock
- tinc_pre
- vim
- xsane
-
- #foomatic_filters
- #gutenprint
- #cups_pdf_filter
- #ghostscript
+ pkgs.skypeforlinux
+ pkgs.slock
+ pkgs.tinc_pre
+ pkgs.vim
+ pkgs.xsane
+
+ #pkgs.foomatic_filters
+ #pkgs.gutenprint
+ #pkgs.cups_pdf_filter
+ #pkgs.ghostscript
];
diff --git a/tv/1systems/querel/config.nix b/tv/1systems/querel/config.nix
index 41253cfb3..ad82915f4 100644
--- a/tv/1systems/querel/config.nix
+++ b/tv/1systems/querel/config.nix
@@ -21,19 +21,19 @@ with import <stockholm/lib>;
systemd-boot.enable = true;
};
- environment.systemPackages = with pkgs; [
- firefoxWrapper
- gimp
- kate
- libreoffice
+ environment.systemPackages = [
+ pkgs.firefox
+ pkgs.gimp
+ pkgs.kate
+ pkgs.libreoffice
(pkgs.pidgin-with-plugins.override {
plugins = [ pkgs.pidginotr ];
})
- sxiv
- texlive.combined.scheme-full
- vim
- xsane
- zathura
+ pkgs.sxiv
+ pkgs.texlive.combined.scheme-full
+ pkgs.vim
+ pkgs.xsane
+ pkgs.zathura
];
fileSystems = {
diff --git a/tv/5pkgs/simple/ff.nix b/tv/5pkgs/simple/ff.nix
index ec20c4a2f..4ce9c3c75 100644
--- a/tv/5pkgs/simple/ff.nix
+++ b/tv/5pkgs/simple/ff.nix
@@ -1,5 +1,5 @@
{ pkgs }:
pkgs.writeDashBin "ff" ''
- exec ${pkgs.firefoxWrapper}/bin/firefox "$@"
+ exec ${pkgs.firefox}/bin/firefox "$@"
''