diff --git a/flake.lock b/flake.lock index 5071a77..ad2cc58 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1721135958, - "narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=", + "lastModified": 1722630065, + "narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=", "owner": "nix-community", "repo": "home-manager", - "rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d", + "rev": "afc892db74d65042031a093adb6010c4c3378422", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1720737798, - "narHash": "sha256-G/OtEAts7ZUvW5lrGMXSb8HqRp2Jr9I7reBuvCOL54w=", + "lastModified": 1722332872, + "narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c5013aa7ce2c7ec90acee5d965d950c8348db751", + "rev": "14c333162ba53c02853add87a0000cbd7aa230c2", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720957393, - "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "type": "github" }, "original": { diff --git a/nixos-configurations/shared-desktop.nix b/nixos-configurations/shared-desktop.nix index aec9990..f0aa099 100644 --- a/nixos-configurations/shared-desktop.nix +++ b/nixos-configurations/shared-desktop.nix @@ -7,12 +7,12 @@ displayManager.gdm.enable = true; desktopManager.gnome = { enable = true; - extraGSettingsOverridePackages = [ pkgs.gnome.mutter ]; + # extraGSettingsOverridePackages = [ pkgs.gnome.mutter ]; # fractional scaling support - extraGSettingsOverrides = '' - [org.gnome.mutter] - experimental-features=['scale-monitor-framebuffer'] - ''; + # extraGSettingsOverrides = '' + # [org.gnome.mutter] + # experimental-features=['scale-monitor-framebuffer'] + # ''; }; excludePackages = [ pkgs.xterm ]; }; @@ -41,6 +41,19 @@ }; }; + users = { + mutableUsers = false; + users = { + root.hashedPassword = "$y$j9T$BfX6ErL64B97Ug1ZrH1GN.$cK/3FlWSDJ99wpbbwu3hBAPX0jGew/zfJhQKf7/OQ12"; + thiloho = { + isNormalUser = true; + extraGroups = [ "wheel" "networkmanager" "docker" ]; + hashedPassword = "$y$j9T$PmPi.Ji1jDw5rBaKCRepp/$LJLuvnFXiG/8jomOPVwv31R/tKgUmp.W2mKdo08FUK3"; + }; + }; + }; + + networking.firewall = { allowedTCPPorts = [ 53317 ]; allowedUDPPorts = [ 53317 ]; diff --git a/nixos-configurations/shared.nix b/nixos-configurations/shared.nix index 6afcde6..b7b3d0e 100644 --- a/nixos-configurations/shared.nix +++ b/nixos-configurations/shared.nix @@ -19,11 +19,6 @@ virtualisation.docker.enable = true; - users.users.thiloho = { - isNormalUser = true; - extraGroups = [ "wheel" "networkmanager" "docker" ]; - }; - home-manager.users.thiloho = { ... }: { programs = { bash = {