[boxy] Force things to work, but on X11 for now

This commit is contained in:
2024-10-04 17:16:30 -07:00
parent 4ca9804db8
commit 8e27017aa4
4 changed files with 22 additions and 18 deletions

12
flake.lock generated
View File

@@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1725694918,
"narHash": "sha256-+HsjshXpqNiJHLaJaK0JnIicJ/a1NquKcfn4YZ3ILgg=",
"lastModified": 1728041527,
"narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "aaebdea769a5c10f1c6e50ebdf5924c1a13f0cda",
"rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e",
"type": "github"
},
"original": {
@@ -22,11 +22,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1725634671,
"narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
"lastModified": 1727802920,
"narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
"rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515",
"type": "github"
},
"original": {

View File

@@ -50,15 +50,15 @@
modules = [
./roles
./machines/boxy/configuration.nix
inputs.home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.johno = import ./home/home-default.nix;
home-manager.extraSpecialArgs = {
customPkgs = nixpkgs.legacyPackages."${system}".callPackage ./packages {};
};
}
# inputs.home-manager.nixosModules.home-manager
# {
# home-manager.useGlobalPkgs = true;
# home-manager.useUserPackages = true;
# home-manager.users.johno = import ./home/home-default.nix;
# home-manager.extraSpecialArgs = {
# customPkgs = nixpkgs.legacyPackages."${system}".callPackage ./packages {};
# };
# }
];
};
};

View File

@@ -2,7 +2,9 @@
# your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
{ ... }:
{ lib, ... }:
with lib;
{
imports =
@@ -15,9 +17,8 @@
kodi = {
enable = true;
autologin = true;
wayland = true;
wayland = false;
};
users.enable = true;
};
# Use the systemd-boot EFI boot loader.
@@ -28,6 +29,8 @@
hardware.graphics.enable = true;
#services.displayManager.enable = mkForce false;
# This option defines the first version of NixOS you have installed on this particular machine,
# and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
#

View File

@@ -50,6 +50,7 @@ in
enable = true;
greeter.enable = false;
};
displayManager.sddm.enable = mkForce false;
};
displayManager = mkIf (!cfg.wayland) {
autoLogin.enable = true;