Compare commits

...

3 Commits

Author SHA1 Message Date
06bf555d1d
flake update 2025-02-13 18:33:28 +01:00
a4ce109c3d
desktop: switch to networkmanager 2025-02-13 18:31:48 +01:00
5e5ff474a6
sway: change monitor setup 2025-02-13 18:30:48 +01:00
4 changed files with 36 additions and 38 deletions

36
flake.lock generated
View File

@ -165,11 +165,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738878603, "lastModified": 1739458725,
"narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=", "narHash": "sha256-k9AeUzs3phaTgfljRslR4iNTX9svBNhxoIw4QLd/V70=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "433799271274c9f2ab520a49527ebfe2992dcfbd", "rev": "22b418c13fb0be43f4bc5c185f323a3237028594",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -222,11 +222,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738875499, "lastModified": 1739415015,
"narHash": "sha256-P3VbO2IkEW+0d0pJU7CuX8e+obSoiDw/YCVL1mnA26w=", "narHash": "sha256-WcHoyeu90uTBoCiMc3Gtb/6y/jt/qVl0hPIBmGMoG2g=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "4642ec1073a7417e6303484d8f2e7d29dc24a50f", "rev": "27f77b393bb2cf8740d2275cb59254f742469f64",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -247,11 +247,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1737639419, "lastModified": 1739186342,
"narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", "narHash": "sha256-2j+sln9RwQn+g7J4GmdFFgvqXnLkvWBNMaUzONlkzUE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lanzaboote", "repo": "lanzaboote",
"rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", "rev": "3bdeebbc484a09391c4f0ec8a37bb77809426660",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -270,11 +270,11 @@
"spectrum": "spectrum" "spectrum": "spectrum"
}, },
"locked": { "locked": {
"lastModified": 1738449543, "lastModified": 1739104176,
"narHash": "sha256-OX6MnQzR0t/3LDlLKTpSLE7/T3vVKrJOn00OKwXsj04=", "narHash": "sha256-bNvtud2PUcbYM0i5Uq1v01Dcgq7RuhVKfjaSKkW2KRI=",
"owner": "astro", "owner": "astro",
"repo": "microvm.nix", "repo": "microvm.nix",
"rev": "f71f275bfad1a4e46d8171de00b0a834efa3d118", "rev": "d3a9b7504d420a1ffd7c83c1bb8fe57deaf939d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -323,11 +323,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1738843498, "lastModified": 1739357830,
"narHash": "sha256-7x+Q4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i+jBHE=", "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f5a32fa27df91dfc4b762671a0e0a859a8a0058f", "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -355,11 +355,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1738680400, "lastModified": 1739214665,
"narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "799ba5bffed04ced7067a91798353d360788b30d", "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -56,9 +56,6 @@
environment = { environment = {
systemPackages = with pkgs; [ systemPackages = with pkgs; [
linux-firmware linux-firmware
## simple-scan
## intel-media-driver
## alacritty
]; ];
}; };

View File

@ -154,7 +154,7 @@
useDHCP = false; # Deprecated useDHCP = false; # Deprecated
hostName = "hades"; hostName = "hades";
networkmanager = { networkmanager = {
enable = false; enable = true;
}; };
firewall = { firewall = {
enable = true; enable = true;
@ -163,20 +163,20 @@
}; };
}; };
systemd.network = { # systemd.network = {
enable = true; # enable = true;
networks = { # networks = {
"10-lan" = { # "10-lan" = {
matchConfig.Name = "eno1"; # matchConfig.Name = "eno1";
ntp = [ "192.168.2.1" ]; # ntp = [ "192.168.2.1" ];
domains = [ "home.opel-online.de" ]; # domains = [ "home.opel-online.de" ];
networkConfig = { # networkConfig = {
DHCP = "yes"; # DHCP = "yes";
IPv6AcceptRA = true; # IPv6AcceptRA = true;
}; # };
}; # };
}; # };
}; # };
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
#powerManagement.powertop.enable = true; #powerManagement.powertop.enable = true;

View File

@ -57,11 +57,12 @@
#}; #};
"DP-2" = { "DP-2" = {
mode = "2560x1440"; mode = "2560x1440";
pos = "0,0"; pos = "0,250";
}; };
"DP-3" = { "DP-3" = {
mode = "1920x1200"; mode = "1920x1200";
pos = "2560,180"; pos = "2560,0";
transform = "90";
}; };
#"eDP-1" = { #"eDP-1" = {
# mode = "1920x1080"; # mode = "1920x1080";