feat: multiple xD look bellow
- clean up login stuff - add uwsm - move "no-x" to system_profiles - clean up hyprland.nix
This commit is contained in:
parent
461a4b0146
commit
cf9395d91d
8 changed files with 78 additions and 60 deletions
|
@ -1,10 +1,12 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
./login
|
||||||
|
|
||||||
./apparmor.nix
|
./apparmor.nix
|
||||||
./firejail.nix
|
./firejail.nix
|
||||||
./login-manager.nix
|
|
||||||
./ssh-client.nix
|
./ssh-client.nix
|
||||||
#./ssh-server.nix
|
#./ssh-server.nix
|
||||||
./sudo-rs.nix
|
./sudo-rs.nix
|
||||||
|
./uwsm.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
6
modules/sec_auth/login/default.nix
Normal file
6
modules/sec_auth/login/default.nix
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
./login-manager.nix
|
||||||
|
./uwsm.nix
|
||||||
|
];
|
||||||
|
}
|
3
modules/sec_auth/login/uwsm.nix
Normal file
3
modules/sec_auth/login/uwsm.nix
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
{
|
||||||
|
programs.uwsm.enable = true;
|
||||||
|
}
|
3
modules/sec_auth/uwsm.nix
Normal file
3
modules/sec_auth/uwsm.nix
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
{
|
||||||
|
programs.uwsm.enable = true;
|
||||||
|
}
|
|
@ -2,12 +2,6 @@
|
||||||
#imports = [
|
#imports = [
|
||||||
# ./components/rofi.nix
|
# ./components/rofi.nix
|
||||||
#];
|
#];
|
||||||
# Enable the X11 windowing system.
|
|
||||||
# You can disable this if you're only using the Wayland session.
|
|
||||||
services.xserver.enable = false;
|
|
||||||
|
|
||||||
# force chromium and electron apps to use wayland
|
|
||||||
environment.sessionVariables.NIXOS_OZONE_WL = "1";
|
|
||||||
|
|
||||||
xdg = {
|
xdg = {
|
||||||
portal = {
|
portal = {
|
||||||
|
@ -20,38 +14,37 @@
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Enable the hyprland window manager with additions
|
# Enable the hyprland window manager with additions
|
||||||
programs = {
|
programs = {
|
||||||
hyprland = {
|
hyprland = {
|
||||||
enable = true;
|
enable = true;
|
||||||
xwayland.enable = true;
|
|
||||||
systemd.setPath.enable = true;
|
|
||||||
#package = pkgs.unstable.hyprland;
|
#package = pkgs.unstable.hyprland;
|
||||||
|
|
||||||
|
systemd.setPath.enable = true;
|
||||||
|
withUWSM = true;
|
||||||
|
xwayland.enable = true;
|
||||||
};
|
};
|
||||||
hyprlock = {
|
hyprlock = {
|
||||||
enable = true;
|
enable = true;
|
||||||
#package = pkgs.unstable.hyprlock;
|
#package = pkgs.unstable.hyprlock;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
services.hypridle = {
|
|
||||||
|
services = {
|
||||||
|
hypridle = {
|
||||||
enable = true;
|
enable = true;
|
||||||
#package = pkgs.unstable.hypridle;
|
#package = pkgs.unstable.hypridle;
|
||||||
};
|
};
|
||||||
|
|
||||||
# for mounting stuff, also needs a auth agent like lxqt.lxqt-policykit
|
# for mounting stuff, also needs a auth agent like lxqt.lxqt-policykit
|
||||||
services.gvfs.enable = true;
|
gvfs.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
#qt = {
|
environment = {
|
||||||
# enable = true;
|
pathsToLink = ["/share/foot"];
|
||||||
# platformTheme = "qt5ct";
|
|
||||||
# style = "kvantum";
|
|
||||||
#};
|
|
||||||
|
|
||||||
environment.pathsToLink = ["/share/foot"];
|
systemPackages = with pkgs; [
|
||||||
|
|
||||||
# List packages installed in system profile. To search, run:
|
|
||||||
# $ nix search wget
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
hyprsunset
|
hyprsunset
|
||||||
hyprpolkitagent
|
hyprpolkitagent
|
||||||
hyprutils
|
hyprutils
|
||||||
|
@ -92,4 +85,5 @@
|
||||||
# file manager
|
# file manager
|
||||||
nautilus
|
nautilus
|
||||||
];
|
];
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
9
system_profiles/components/no-x.nix
Normal file
9
system_profiles/components/no-x.nix
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
{
|
||||||
|
# Enable the X11 windowing system.
|
||||||
|
# You can disable this if you're only using the Wayland session.
|
||||||
|
services.xserver.enable = false;
|
||||||
|
|
||||||
|
# force chromium and electron apps to use wayland
|
||||||
|
environment.sessionVariables.NIXOS_OZONE_WL = "1";
|
||||||
|
}
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
imports = [
|
imports = [
|
||||||
./components/home-manager.nix
|
./components/home-manager.nix
|
||||||
./components/nix-defaults.nix
|
./components/nix-defaults.nix
|
||||||
|
./components/no-x.nix
|
||||||
#./components/nixpkgs-ng.nix
|
#./components/nixpkgs-ng.nix
|
||||||
|
|
||||||
./importers/desktop.nix
|
./importers/desktop.nix
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue