summaryrefslogtreecommitdiffstats
path: root/lass
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2022-09-29 11:08:22 +0200
committermakefu <github@syntax-fehler.de>2022-09-29 11:08:22 +0200
commit0f24348d8bd65aeef573dfb20455c1f7cd586daa (patch)
tree138e618e2432376669f71280f4d6d3b3b4c160b3 /lass
parent809a10fccb3fb7a1fad93c3f8ab559f224fab626 (diff)
parent8f929b04b3de012a9c72306786f076b78aa9f98c (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'lass')
-rw-r--r--lass/2configs/network-manager.nix2
-rw-r--r--lass/5pkgs/q/default.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/lass/2configs/network-manager.nix b/lass/2configs/network-manager.nix
index 61bdefab5..ee69c6b1a 100644
--- a/lass/2configs/network-manager.nix
+++ b/lass/2configs/network-manager.nix
@@ -15,7 +15,7 @@
users.users.mainUser = {
extraGroups = [ "networkmanager" ];
packages = with pkgs; [
- gnome3.gnome-keyring
+ gnome.gnome-keyring
dconf
];
};
diff --git a/lass/5pkgs/q/default.nix b/lass/5pkgs/q/default.nix
index 2f41ac927..ae8a80266 100644
--- a/lass/5pkgs/q/default.nix
+++ b/lass/5pkgs/q/default.nix
@@ -204,7 +204,7 @@ let
${pkgs.iw}/bin/iw dev \
| ${pkgs.gnused}/bin/sed -n 's/^\s*Interface\s\+\([0-9a-z]\+\)$/\1/p'
); do
- inet=$(${pkgs.iproute}/bin/ip addr show $dev \
+ inet=$(${pkgs.iproute2}/bin/ip addr show $dev \
| ${pkgs.gnused}/bin/sed -n '
s/.*inet \([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/p
') \