network updates

This commit is contained in:
Rouven Seifert 2023-04-06 11:00:53 +02:00
parent 9e8ac20c4e
commit 706220f980
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
3 changed files with 33 additions and 29 deletions

View file

@ -117,11 +117,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1680389554, "lastModified": 1680597706,
"narHash": "sha256-+8FUmS4GbDMynQErZGXKg+wU76rq6mI5fprxFXFWKSM=", "narHash": "sha256-ZqJ3T+BxzjPH9TnmeUwS4Uu9ZQPeBXAFC9sUWlharT4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ddd8866c0306c48f465e7f48432e6f1ecd1da7f8", "rev": "ec06f419af79207b33d797064dfb3fc9dbe1df4a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -140,11 +140,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1680537665, "lastModified": 1680704389,
"narHash": "sha256-o0VPjm64/CSTWf59Skw++1ExNDst+pnqX0u9KqhV8cw=", "narHash": "sha256-MWtk097S2e1NNvAkMhI/hViUGb/oRd1GhjMSeJzWHYo=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "0a099ca2ab8e4b5da01189202740bbc4bbe81f5b", "rev": "110f3fd6585c8b92d3bc2dbaabbd2c1a1f76de7a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -202,11 +202,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1680428635, "lastModified": 1680695861,
"narHash": "sha256-/Kz4Qy+jx1+bfSq6e2W3MbyODkhs6GqKiiybNtqzvbc=", "narHash": "sha256-LqvhYx1Gu+rlkF4pA1NYZzwRQwz3FeWBqXqmQq86m8o=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprpaper", "repo": "hyprpaper",
"rev": "db56f164dd4d6bba8f606fd49885cdbe9803fe9b", "rev": "9182de9ffc8c76fbf24d16dec0ea7a9430597a06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -271,11 +271,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1679172431, "lastModified": 1680487167,
"narHash": "sha256-XEh5gIt5otaUbEAPUY5DILUTyWe1goAyeqQtmwaFPyI=", "narHash": "sha256-9FNIqrxDZgSliGGN2XJJSvcDYmQbgOANaZA4UWnTdg4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1603d11595a232205f03d46e635d919d1e1ec5b9", "rev": "53dad94e874c9586e71decf82d972dfb640ef044",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -334,11 +334,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1680398059, "lastModified": 1680669251,
"narHash": "sha256-qtbKRe+pWuf5nNINdiCgn6EwOIQZxj0Ig/wybBpFNkQ=", "narHash": "sha256-AVNE+0u4HlI3v96KCXE9risH7NKqj0QDLLfSckYXIbA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7c656856e9eb863c4d21c83e2601dd77f95f6941", "rev": "9c8ff8b426a8b07b9e0a131ac3218740dc85ba1e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -376,11 +376,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1680513937, "lastModified": 1680694805,
"narHash": "sha256-s1tEQFSqvV1V3fhNeZ5L+ZXLwNhkerboLhhEovjAIv0=", "narHash": "sha256-gd5iBzK7nWHhnw8BZ23yJSPTIpJWdIs1TUcLqLQzeVE=",
"owner": "pta2002", "owner": "pta2002",
"repo": "nixvim", "repo": "nixvim",
"rev": "35c56b62a177270b4ae8aca3964f80c59fae232e", "rev": "d40db46d7fa842db812b1f037200c70447801108",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -496,11 +496,11 @@
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"lastModified": 1679340088, "lastModified": 1680629978,
"narHash": "sha256-/1KiYoBivDj8HC/eVK2Tr2WYkVdKJxq2Lb0tQs0qqJo=", "narHash": "sha256-2iVx5zqU2CpMgmtVadsHSkhkAsoxAWKQp6RQqt2OgQY=",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "1d64e12391a638201c679e71d4e22bb45e5faa8e", "rev": "835208db98a29431fa687c9506f4b43fe645ff65",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -516,11 +516,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1679254736, "lastModified": 1680729839,
"narHash": "sha256-/jXpuCjXuLsle7GR7NVqE6InaXuvGwnPs/mrUiygzlc=", "narHash": "sha256-+AagxTHrzKgngG+guIWAIV5hX1HkkvMbDxbUq2IVwAM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "e1f145d15db320fe5c5e99b90898ab87db7e8214", "rev": "803c00db1191604d50766358dbc5be2de4fcb4e7",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,7 +6,8 @@
[ [
./hardware-configuration.nix ./hardware-configuration.nix
./modules/networks ./modules/networks
./modules/greetd ./modules/snapper ./modules/greetd
./modules/snapper
../../shared/vim.nix ../../shared/vim.nix
../../shared/sops.nix ../../shared/sops.nix
../../shared/gpg.nix ../../shared/gpg.nix
@ -89,7 +90,8 @@
printing = { printing = {
enable = true; enable = true;
}; };
avahi = { # autodiscover printers avahi = {
# autodiscover printers
enable = true; enable = true;
nssmdns = true; nssmdns = true;
}; };
@ -122,6 +124,9 @@
}; };
}; };
systemd.sleep.extraConfig = ''
HibernateDelaySec=2h
'';
services.logind = { services.logind = {
lidSwitch = "suspend-then-hibernate"; lidSwitch = "suspend-then-hibernate";
lidSwitchDocked = "suspend-then-hibernate"; lidSwitchDocked = "suspend-then-hibernate";

View file

@ -11,8 +11,7 @@
owner = config.users.users.systemd-network.name; owner = config.users.users.systemd-network.name;
}; };
}; };
networking = { networking = { useNetworkd = true;
useNetworkd = true;
hostName = "thinkpad"; hostName = "thinkpad";
hostId = "79353b92"; # Define your hostname. hostId = "79353b92"; # Define your hostname.
firewall.allowedTCPPortRanges = [{ from = 1714; to = 1764; }]; # open ports for kde connect firewall.allowedTCPPortRanges = [{ from = 1714; to = 1764; }]; # open ports for kde connect
@ -52,7 +51,7 @@
networks."10-wireless-home" = { networks."10-wireless-home" = {
matchConfig = { matchConfig = {
Name = "wlp9s0"; Name = "wlp9s0";
BSSID = "3c:a6:2f:6f:63:eb 3c:a6:2f:6f:63:ea"; SSID = "Smoerrebroed";
}; };
networkConfig = { networkConfig = {
DHCP = "yes"; DHCP = "yes";