Fix some more errors

This commit is contained in:
Cameron Reed 2024-01-22 00:36:11 -07:00
parent 564bf84f66
commit 71a787a638
8 changed files with 19 additions and 10 deletions

View File

@ -15,4 +15,6 @@
swaylock swaylock
swayidle swayidle
]); ]);
services.xserver.displayManager.sessionPackages = [ config.programs.hyprland.finalPackage ];
} }

View File

@ -18,4 +18,6 @@
}; };
xdg.portal.wlr.enable = true; xdg.portal.wlr.enable = true;
services.xserver.displayManager.sessionPackages = [ config.programs.sway.package ];
} }

View File

@ -11,7 +11,7 @@
enable = true; enable = true;
settings = { settings = {
default_session = { default_session = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd sway"; command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --remember-user-session";
user = "greeter"; user = "greeter";
}; };
}; };

View File

@ -22,11 +22,11 @@
"$menu" = "dmenu_path | wmenu -p 'Run:' -l 10 | xargs hyprctl dispatch exec"; "$menu" = "dmenu_path | wmenu -p 'Run:' -l 10 | xargs hyprctl dispatch exec";
exec-once = startup; exec-once = "${startup}";
monitor = [ monitor = [
",preferred,auto,1" ",preferred,auto,auto"
"eDP-1,preferred,0x0,1.5" "desc:BOE 0x095F,preferred,0x0,1.566667"
]; ];
env = [ env = [

View File

@ -23,7 +23,7 @@
}; };
eDP-1 = { eDP-1 = {
scale = 1.5; scale = "1.5";
}; };
}; };
@ -71,7 +71,11 @@
colors = { colors = {
statusline = "#ffffff"; statusline = "#ffffff";
background = "#323232"; background = "#323232";
inactiveWorkspace = "#32323200 #32323200 #5c5c5c"; inactiveWorkspace = {
background = "#32323200";
border = "#32323200";
text = "#5c5c5c";
};
}; };
} }
]; ];

View File

@ -1,4 +1,4 @@
{ pkgs, lib, osConfig, ... }: { pkgs, lib, config, osConfig, ... }:
{ {
imports = [ imports = [

View File

@ -27,6 +27,8 @@
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.cameron = import ./hosts/nixos/home-manager/cameron.nix; home-manager.users.cameron = import ./hosts/nixos/home-manager/cameron.nix;
home-manager.extraSpecialArgs = { inherit common_dir; };
} }
]; ];
}; };

View File

@ -1,7 +1,6 @@
{ lib, pkgs, osConfig, ... }: { lib, pkgs, config, osConfig, common_dir, ... }:
let common_dir = ../../../common; {
in {
imports = [ imports = [
(common_dir + /users/cameron/home.nix) (common_dir + /users/cameron/home.nix)
]; ];