Compare commits

..

No commits in common. "36372fa0ba9416d6b1bd4243b929fb3f77bca731" and "4c4e43845f3cbe35573514ddde1fcac5ae0dcbfa" have entirely different histories.

5 changed files with 18 additions and 23 deletions

View file

@ -113,7 +113,7 @@
package = pkgs.nixVersions.latest; package = pkgs.nixVersions.latest;
settings.trusted-users = [ username ]; settings.trusted-users = [ username ];
}; };
services.displayManager.autoLogin.user = username; services.greetd.settings.initial_session.user = username;
programs.${loginShell} = lib.mkIf (loginShell != "bash") { enable = true; }; programs.${loginShell} = lib.mkIf (loginShell != "bash") { enable = true; };
users.users.${username} = { users.users.${username} = {
shell = pkgs.${loginShell}; shell = pkgs.${loginShell};

View file

@ -32,14 +32,10 @@
"freia" = { "freia" = {
user = "elitherl"; user = "elitherl";
hostname = "freia027.hpc.l"; hostname = "freia027.hpc.l";
compression = true;
forwardX11Trusted = true;
}; };
"heimdall" = { "heimdall" = {
user = "elitherl"; user = "elitherl";
hostname = "10.40.4.115"; # heimdall115.jetdata.eu hostname = "10.40.4.115";
compression = true;
forwardX11Trusted = true;
}; };
}; };
}; };

View file

@ -1,10 +1,18 @@
{ pkgs, ... }: {
config,
lib,
pkgs,
...
}:
{ {
nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland"; nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland";
system.autoUpgrade.operation = "boot"; system.autoUpgrade.operation = "boot";
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
environment = { environment = {
sessionVariables.NIXOS_OZONE_WL = "1"; sessionVariables = {
NIXOS_OZONE_WL = "1";
QT_QPA_PLATFORM = lib.mkIf config.programs.sway.enable "wayland";
};
systemPackages = with pkgs; [ systemPackages = with pkgs; [
libsecret libsecret
libnotify libnotify
@ -47,7 +55,7 @@
}; };
}; };
xserver = { xserver = {
enable = true; enable = false;
xkb = { xkb = {
layout = "gb"; layout = "gb";
variant = ""; variant = "";

View file

@ -1,17 +1,11 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
imports = [ ./default.nix ]; imports = [ ./default.nix ];
environment = { environment.plasma6.excludePackages = with pkgs.kdePackages; [ plasma-browser-integration ];
plasma6.excludePackages = with pkgs.kdePackages; [ plasma-browser-integration ];
sessionVariables.QT_QPA_PLATFORM = "wayland";
};
services = { services = {
displayManager = { displayManager.sddm = {
autoLogin.enable = true; enable = true;
sddm = { wayland.enable = true;
enable = true;
wayland.enable = true;
};
}; };
desktopManager.plasma6 = { desktopManager.plasma6 = {
enable = true; enable = true;

View file

@ -2,10 +2,7 @@
{ {
imports = [ ./default.nix ]; imports = [ ./default.nix ];
environment = { environment = {
sessionVariables = { sessionVariables.GRIM_DEFAULT_DIR = "$HOME/Pictures/Grim";
QT_QPA_PLATFORM = "wayland";
GRIM_DEFAULT_DIR = "$HOME/Pictures/Grim";
};
systemPackages = with pkgs; [ systemPackages = with pkgs; [
wtype wtype
wl-clipboard wl-clipboard