diff --git a/flake.lock b/flake.lock index 6013775..9cefecb 100644 --- a/flake.lock +++ b/flake.lock @@ -151,11 +151,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1748821116, + "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", "type": "github" }, "original": { @@ -311,11 +311,11 @@ ] }, "locked": { - "lastModified": 1747763032, - "narHash": "sha256-9j3oCbemeH7bTVXJ3pDWxOptbxDx2SdK1jY2AHpjQiw=", + "lastModified": 1748955489, + "narHash": "sha256-OmZXyW2g5qIuo5Te74McwR0TwauCO2sF3/SjGDVuxyg=", "owner": "nix-community", "repo": "home-manager", - "rev": "29dda415f5b2178278283856c6f9f7b48a2a4353", + "rev": "bb846c031be68a96466b683be32704ef6e07b159", "type": "github" }, "original": { @@ -424,11 +424,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1747723695, - "narHash": "sha256-lSXzv33yv1O9r9Ai1MtYFDX3OKhWsZMn/5FFb4Rni/k=", + "lastModified": 1748942041, + "narHash": "sha256-HEu2gTct7nY0tAPRgBtqYepallryBKR1U8B4v2zEEqA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6ac6ec6fcb410e15a60ef5ec94b8a2b35b5dd282", + "rev": "fc7c4714125cfaa19b048e8aaf86b9c53e04d853", "type": "github" }, "original": { @@ -455,11 +455,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1743296961, - "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", + "lastModified": 1748740939, + "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", + "rev": "656a64127e9d791a334452c6b6606d17539476e2", "type": "github" }, "original": { @@ -500,11 +500,11 @@ }, "nixpkgs-u": { "locked": { - "lastModified": 1747542820, - "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { @@ -547,11 +547,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1747739564, - "narHash": "sha256-OLs+6N73j9+/S6dWjJJqtECe2j6v3GgxM0H8jRtGVd4=", + "lastModified": 1748954775, + "narHash": "sha256-9yZojiHsS+Bi9OivZglSIXryy6iCJZfM8UMn59tiKc8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "595c22cce5205fa070f797b477978e91b123def0", + "rev": "667858166b89c072208ac151fa9502513d7d8389", "type": "github" }, "original": { diff --git a/instances/odin/configuration.nix b/instances/odin/configuration.nix index 8fe9670..c717db1 100644 --- a/instances/odin/configuration.nix +++ b/instances/odin/configuration.nix @@ -149,10 +149,6 @@ in }; blueman.enable = true; xserver = { - # displayManager = { - # gdm = { enable = true; autoSuspend = false; }; - # }; - # desktopManager.gnome.enable = true; desktopManager.plasma5 = { enable = true; useQtScaling = true; }; enable = true; }; diff --git a/instances/sif/configuration.nix b/instances/sif/configuration.nix index 71f5553..984dbb3 100644 --- a/instances/sif/configuration.nix +++ b/instances/sif/configuration.nix @@ -112,29 +112,21 @@ }; services = { + desktopManager.gnome.enable = true; # X11 windowing system. xserver = { enable = true; - # Enable the GNOME 3 Desktop Environment. - desktopManager.gnome.enable = true; # videoDrivers = [ "intel" ]; # desktopManager.plasma5 = { # enable = true; # runUsingSystemd = true; # }; - # windowManager.bspwm.enable = true; xkb = { layout = "us,it"; options = "eurosign:e,terminate:ctrl_alt_bksp,compose:rctrl,grp:menu_toggle"; }; - - # displayManager.gdm = { - # enable = true; - # autoSuspend = false; - # }; - }; displayManager = { enable = true; diff --git a/instances/thinkstation/configuration.nix b/instances/thinkstation/configuration.nix index abc865d..9e91d7d 100644 --- a/instances/thinkstation/configuration.nix +++ b/instances/thinkstation/configuration.nix @@ -1,8 +1,4 @@ -{ pkgs, ... }: -let - hosts = import ../../hosts.nix; -in -{ +{ pkgs, ... }: { boot = { kernelPackages = pkgs.linuxPackages_latest; # kernelParams = [ ]; @@ -98,8 +94,6 @@ in }; blueman.enable = true; xserver = { - # displayManager.gdm = { enable = true; autoSuspend = false; }; - # desktopManager.gnome.enable = true; desktopManager.plasma5 = { enable = true; useQtScaling = true; }; enable = true; }; diff --git a/instances/thor/configuration.nix b/instances/thor/configuration.nix index a9f204e..50fa13b 100644 --- a/instances/thor/configuration.nix +++ b/instances/thor/configuration.nix @@ -254,10 +254,9 @@ # theme = "${pkgs.sddm-theme-clairvoyance}/usr/share/sddm/themes/clairvoyance"; # }; + displayManager.gdm = { enable = true; autoSuspend = false; }; xserver = { enable = true; - # desktopManager.gnome.enable = true; - displayManager.gdm = { enable = true; autoSuspend = false; }; # windowManager.bspwm = { enable = true; }; videoDrivers = [ "nvidia" ]; xkb = {