From 706220f98017780a68a5fbefe5ca4e68abd9987a Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Thu, 6 Apr 2023 11:00:53 +0200 Subject: [PATCH] network updates --- flake.lock | 48 ++++++++++----------- hosts/thinkpad/default.nix | 9 +++- hosts/thinkpad/modules/networks/default.nix | 5 +-- 3 files changed, 33 insertions(+), 29 deletions(-) diff --git a/flake.lock b/flake.lock index 235b3a7..a1968f1 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ ] }, "locked": { - "lastModified": 1680389554, - "narHash": "sha256-+8FUmS4GbDMynQErZGXKg+wU76rq6mI5fprxFXFWKSM=", + "lastModified": 1680597706, + "narHash": "sha256-ZqJ3T+BxzjPH9TnmeUwS4Uu9ZQPeBXAFC9sUWlharT4=", "owner": "nix-community", "repo": "home-manager", - "rev": "ddd8866c0306c48f465e7f48432e6f1ecd1da7f8", + "rev": "ec06f419af79207b33d797064dfb3fc9dbe1df4a", "type": "github" }, "original": { @@ -140,11 +140,11 @@ ] }, "locked": { - "lastModified": 1680537665, - "narHash": "sha256-o0VPjm64/CSTWf59Skw++1ExNDst+pnqX0u9KqhV8cw=", + "lastModified": 1680704389, + "narHash": "sha256-MWtk097S2e1NNvAkMhI/hViUGb/oRd1GhjMSeJzWHYo=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "0a099ca2ab8e4b5da01189202740bbc4bbe81f5b", + "rev": "110f3fd6585c8b92d3bc2dbaabbd2c1a1f76de7a", "type": "github" }, "original": { @@ -202,11 +202,11 @@ ] }, "locked": { - "lastModified": 1680428635, - "narHash": "sha256-/Kz4Qy+jx1+bfSq6e2W3MbyODkhs6GqKiiybNtqzvbc=", + "lastModified": 1680695861, + "narHash": "sha256-LqvhYx1Gu+rlkF4pA1NYZzwRQwz3FeWBqXqmQq86m8o=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "db56f164dd4d6bba8f606fd49885cdbe9803fe9b", + "rev": "9182de9ffc8c76fbf24d16dec0ea7a9430597a06", "type": "github" }, "original": { @@ -271,11 +271,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1679172431, - "narHash": "sha256-XEh5gIt5otaUbEAPUY5DILUTyWe1goAyeqQtmwaFPyI=", + "lastModified": 1680487167, + "narHash": "sha256-9FNIqrxDZgSliGGN2XJJSvcDYmQbgOANaZA4UWnTdg4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1603d11595a232205f03d46e635d919d1e1ec5b9", + "rev": "53dad94e874c9586e71decf82d972dfb640ef044", "type": "github" }, "original": { @@ -334,11 +334,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1680398059, - "narHash": "sha256-qtbKRe+pWuf5nNINdiCgn6EwOIQZxj0Ig/wybBpFNkQ=", + "lastModified": 1680669251, + "narHash": "sha256-AVNE+0u4HlI3v96KCXE9risH7NKqj0QDLLfSckYXIbA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7c656856e9eb863c4d21c83e2601dd77f95f6941", + "rev": "9c8ff8b426a8b07b9e0a131ac3218740dc85ba1e", "type": "github" }, "original": { @@ -376,11 +376,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1680513937, - "narHash": "sha256-s1tEQFSqvV1V3fhNeZ5L+ZXLwNhkerboLhhEovjAIv0=", + "lastModified": 1680694805, + "narHash": "sha256-gd5iBzK7nWHhnw8BZ23yJSPTIpJWdIs1TUcLqLQzeVE=", "owner": "pta2002", "repo": "nixvim", - "rev": "35c56b62a177270b4ae8aca3964f80c59fae232e", + "rev": "d40db46d7fa842db812b1f037200c70447801108", "type": "github" }, "original": { @@ -496,11 +496,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1679340088, - "narHash": "sha256-/1KiYoBivDj8HC/eVK2Tr2WYkVdKJxq2Lb0tQs0qqJo=", + "lastModified": 1680629978, + "narHash": "sha256-2iVx5zqU2CpMgmtVadsHSkhkAsoxAWKQp6RQqt2OgQY=", "owner": "wlroots", "repo": "wlroots", - "rev": "1d64e12391a638201c679e71d4e22bb45e5faa8e", + "rev": "835208db98a29431fa687c9506f4b43fe645ff65", "type": "gitlab" }, "original": { @@ -516,11 +516,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1679254736, - "narHash": "sha256-/jXpuCjXuLsle7GR7NVqE6InaXuvGwnPs/mrUiygzlc=", + "lastModified": 1680729839, + "narHash": "sha256-+AagxTHrzKgngG+guIWAIV5hX1HkkvMbDxbUq2IVwAM=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "e1f145d15db320fe5c5e99b90898ab87db7e8214", + "rev": "803c00db1191604d50766358dbc5be2de4fcb4e7", "type": "github" }, "original": { diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix index c9a6ee5..ae655c1 100755 --- a/hosts/thinkpad/default.nix +++ b/hosts/thinkpad/default.nix @@ -6,7 +6,8 @@ [ ./hardware-configuration.nix ./modules/networks - ./modules/greetd ./modules/snapper + ./modules/greetd + ./modules/snapper ../../shared/vim.nix ../../shared/sops.nix ../../shared/gpg.nix @@ -89,7 +90,8 @@ printing = { enable = true; }; - avahi = { # autodiscover printers + avahi = { + # autodiscover printers enable = true; nssmdns = true; }; @@ -122,6 +124,9 @@ }; }; + systemd.sleep.extraConfig = '' + HibernateDelaySec=2h + ''; services.logind = { lidSwitch = "suspend-then-hibernate"; lidSwitchDocked = "suspend-then-hibernate"; diff --git a/hosts/thinkpad/modules/networks/default.nix b/hosts/thinkpad/modules/networks/default.nix index 657612c..ca3ef3d 100644 --- a/hosts/thinkpad/modules/networks/default.nix +++ b/hosts/thinkpad/modules/networks/default.nix @@ -11,8 +11,7 @@ owner = config.users.users.systemd-network.name; }; }; - networking = { - useNetworkd = true; + networking = { useNetworkd = true; hostName = "thinkpad"; hostId = "79353b92"; # Define your hostname. firewall.allowedTCPPortRanges = [{ from = 1714; to = 1764; }]; # open ports for kde connect @@ -52,7 +51,7 @@ networks."10-wireless-home" = { matchConfig = { Name = "wlp9s0"; - BSSID = "3c:a6:2f:6f:63:eb 3c:a6:2f:6f:63:ea"; + SSID = "Smoerrebroed"; }; networkConfig = { DHCP = "yes";