diff --git a/flake.nix b/flake.nix index 5b74cde..1b8c175 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ }; }; - outputs = { self, nixpkgs, home-manager, ... }: { + outputs = { self, nixpkgs, home-manager }: { nixosConfigurations = { framework = nixpkgs.lib.nixosSystem { diff --git a/systems/common.nix b/systems/common.nix index 4b3b4e4..f247546 100644 --- a/systems/common.nix +++ b/systems/common.nix @@ -82,7 +82,7 @@ # Enable the GNOME Desktop Environment. services.xserver.displayManager.gdm.enable = true; services.xserver.desktopManager.gnome.enable = true; - services.displayManager.gdm.wayland = false; + services.xserver.displayManager.gdm.wayland = false; # Configure keymap in X11 services.xserver = { diff --git a/user-jsutter.nix b/user-jsutter.nix index 0a5824c..af01df3 100644 --- a/user-jsutter.nix +++ b/user-jsutter.nix @@ -1,11 +1,15 @@ { config, pkgs, home-manager, ... }: -#let -# home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz"; -#in +let + home-manager = builtins.fetchTarball { + url = "https://github.com/nix-community/home-manager/archive/master.tar.gz"; + sha256 = "0qgqx25a06qqnzsmsnav00w1z850mxqvmsx5pa5pdkzszgc1qsvv"; + }; + +in { -# imports = [ -# (import "${home-manager}/nixos") -# ]; + imports = [ + (import "${home-manager}/nixos") + ]; home-manager.users.jsutter = {