from xorg to wayland

This commit is contained in:
m3tam3re 2023-04-09 11:12:23 +02:00
parent 4908eeb0a5
commit b9c6b6c0e7
20 changed files with 378 additions and 135 deletions

View File

@ -64,7 +64,7 @@
]; ];
}; };
m3-nix = lib.nixosSystem { m3-nix = lib.nixosSystem {
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs outputs; };
modules = [ modules = [
allowUnfree allowUnfree
./hosts/m3-nix ./hosts/m3-nix
@ -82,6 +82,7 @@
extraSpecialArgs = { inherit inputs nix-colors; extraSpecialArgs = { inherit inputs nix-colors;
}; };
modules = [ modules = [
hyprland.homeManagerModules.default
./home/users/m3tam3re/m3-nix.nix ./home/users/m3tam3re/m3-nix.nix
allowUnfree allowUnfree
]; ];

View File

@ -1,55 +0,0 @@
{ config, lib, pkgs, ... }:
with lib;
let cfg = config.features.cli.fish;
in {
options.features.cli.fish.enable = mkEnableOption "enable fish shell";
config = mkIf cfg.enable {
programs.fish = {
enable = true;
plugins = [{
name = "foreign-env";
src = pkgs.fetchFromGitHub {
owner = "oh-my-fish";
repo = "plugin-foreign-env";
rev = "dddd9213272a0ab848d474d0cbde12ad034e65bc";
sha256 = "00xqlyl3lffc5l0viin1nyp819wf81fncqyz87jx8ljjdhilmgbs";
};
}];
loginShellInit = ''
set -x WEBKIT_DISABLE_COMPOSITING_MODE 1
set -x EDITOR emacsclient
set -x VISUAL emacsclient
set -x XDG_DATA_HOME $HOME/.local/share
'';
shellAbbrs = {
ls = "exa";
grep = "rg";
ps = "procs";
n = "nix";
nd = "nix develop -c $SHELL";
ns = "nix shell";
nsn = "nix shell nixpkgs#";
nb = "nix build";
nbn = "nix build nixpkgs#";
nf = "nix flake";
ncb nr = "nixos-rebuild --flake ."; nrs = "nixos-rebuild
--flake . switch"; snr = "sudo nixos-rebuild --flake ."; snrs
= "sudo nixos-rebuild --flake . switch"; hm = "home-manager
--flake ."; hms = "home-manager --flake . switch";
vi = "nvim";
vim = "nvim";
wgd = "sudo systemctl stop wg-quick-wg0.service";
wgu = "sudo systemctl start wg-quick-wg0.service";
};
};
};
}

View File

@ -25,6 +25,9 @@ in {
set -x EDITOR emacsclient set -x EDITOR emacsclient
set -x VISUAL emacsclient set -x VISUAL emacsclient
set -x XDG_DATA_HOME $HOME/.local/share set -x XDG_DATA_HOME $HOME/.local/share
if test (tty) = "/dev/tty1"
exec Hyprland &> /dev/null
end
''; '';
shellAbbrs = { shellAbbrs = {
ls = "exa"; ls = "exa";

View File

@ -42,6 +42,7 @@
epkgs.evil-nerd-commenter epkgs.evil-nerd-commenter
epkgs.exec-path-from-shell epkgs.exec-path-from-shell
epkgs.forge epkgs.forge
epkgs.fontawesome
epkgs.general epkgs.general
epkgs.go-mode epkgs.go-mode
epkgs.graphql-mode epkgs.graphql-mode

View File

@ -1,77 +1,69 @@
{ pkgs, lib, outputs, nix-colors, ... }: { pkgs, ... }: {
{
imports = [ imports = [
./crypto.nix ./crypto.nix
./design.nix ./design.nix
# ./espanso.nix
./hyprland
./i3-gaps.nix
./extrafonts.nix ./extrafonts.nix
#./hyprland
./media.nix ./media.nix
./office.nix ./office.nix
./polybar.nix
./qt.nix ./qt.nix
./rofi.nix ./rofi.nix
./syncthing.nix ./syncthing.nix
nix-colors.homeManagerModule ./waybar.nix
]; ];
xdg.mimeApps.enable = true; xdg.mimeApps = {
colorScheme = nix-colors.colorSchemes.dracula; enable = true;
defaultApplications = {
"application/pdf" = ["okular.desktop"];
};
};
home.sessionVariables = { home.sessionVariables = {
WEBKIT_DISABLE_COMPOSITING_MODE = "1"; WEBKIT_DISABLE_COMPOSITING_MODE = "1";
EDITOR = "emacs"; EDITOR = "emacs";
VISUAL = "emacs"; VISUAL = "emacs";
QT_QPA_PLATFORM = "wayland";
QT_QPA_PLATFORMTHEME = "qt5ct";
XDG_CONFIG_HOME = "\${HOME}/.config"; XDG_CONFIG_HOME = "\${HOME}/.config";
XDG_BIN_HOME = "\${HOME}/.local/bin"; XDG_BIN_HOME = "\${HOME}/.local/bin";
XDG_DATA_HOME = "\${HOME}/.local/share"; XDG_DATA_HOME = "\${HOME}/.local/share";
}; };
home.sessionPath = [ "\${XDG_BIN_HOME}" "\${HOME}/.cargo/bin" ]; home.sessionPath = [ "\${XDG_BIN_HOME}" "\${HOME}/.cargo/bin" ];
fonts.fontconfig.enable = true;
home.packages = with pkgs; [ home.packages = with pkgs; [
alacritty alacritty
appimage-run appimage-run
autotiling
blueberry blueberry
brave brave
brightnessctl brightnessctl
clipman clipman
dunst distrobox
feh
flameshot flameshot
fuzzel fuzzel
gnome.file-roller gnome.file-roller
gnome.seahorse gnome.seahorse
gnome.vinagre gnome.vinagre
glib
gsettings-desktop-schemas gsettings-desktop-schemas
hyprpaper hyprpaper
libnotify libnotify
lxappearance
nyxt nyxt
pamixer pamixer
pasystray
pavucontrol
picom picom
polkit_gnome libsForQt5.qtstyleplugins
qt5ct qt5ct
qt6.qtwayland
rustdesk rustdesk
slurp
unrar unrar
unzip unzip
usbutils usbutils
v4l-utils v4l-utils
wlogout
wl-clipboard
xclip
xdg-utils xdg-utils
xdotool xdotool
xfce.xfce4-clipman-plugin
xorg.xbacklight
xorg.xkill
xorg.xmodmap
xorg.xrandr
zip zip
]; ];
} }

View File

@ -16,6 +16,7 @@ in {
font-manager font-manager
font-awesome font-awesome
font-awesome_4 font-awesome_4
font-awesome_5
noto-fonts noto-fonts
]; ];
}; };

View File

@ -5,7 +5,7 @@ let
in '' in ''
monitor=eDP-1,preferred, 2560x0, auto monitor=eDP-1,preferred, 2560x0, auto
monitor=DP-2,preferred, 0x0, auto monitor=eDP-2,preferred, 0x0, auto
exec-once = hyprpaper exec-once = hyprpaper
exec-once = waybar exec-once = waybar
exec-once = wl-paste -p -t text --watch clipman store -P --histpath="~/.local/share/clipman-primary.json" exec-once = wl-paste -p -t text --watch clipman store -P --histpath="~/.local/share/clipman-primary.json"

View File

@ -7,14 +7,30 @@
end end
''; '';
}; };
wayland.windowManager.hyprland = { # wayland.windowManager.hyprland = {
enable = true; # enable = true;
nvidiaPatches = true; # nvidiaPatches = true;
extraConfig = # extraConfig = (import ./config.nix { inherit (config) home; });
(import ./config.nix { inherit (config) home; });
}; # };
programs.waybar.package = pkgs.waybar.overrideAttrs programs.waybar.package = pkgs.waybar.overrideAttrs
(oa: { mesonFlags = (oa.mesonFlags or [ ]) ++ [ "-Dexperimental=true" ]; }); (oa: { mesonFlags = (oa.mesonFlags or [ ]) ++ [ "-Dexperimental=true" ]; });
programs.waybar.enable = true; programs.waybar.enable = true;
home.packages = with pkgs; [
grim
imv
mimeo
xwayland
pulseaudio
slurp
swayidle
swaylock
waypipe
wireplumber
wf-recorder
wl-clipboard
wl-mirror
ydotool
];
} }

View File

@ -1,11 +1,22 @@
{ pkgs, ... }: { config, lib, pkgs, ... }:
{
home.packages = with pkgs; [ with lib;
nextcloud-client
libreoffice let cfg = config.features.desktop.office;
neomutt
tutanota-desktop in {
okular
zathura options.features.desktop.office.enable =
]; mkEnableOption "enable office features";
config = mkIf cfg.enable {
home.packages = with pkgs; [
nextcloud-client
libreoffice
neomutt
tutanota-desktop
okular
zathura
];
};
} }

View File

@ -1,6 +1,13 @@
{ pkgs, ...}:
{ {
qt = { qt = {
enable = true; enable = true;
platformTheme = "gtk"; };
gtk = {
enable = true;
theme = {
name = "Dracula";
package = pkgs.dracula-theme;
};
}; };
} }

View File

@ -1,6 +1,7 @@
{ pkgs, ... }: { { pkgs, ... }: {
programs.rofi = { programs.rofi = {
enable = true; enable = true;
package = pkgs.rofi-wayland;
plugins = [ pkgs.rofi-calc pkgs.rofi-emoji ]; plugins = [ pkgs.rofi-calc pkgs.rofi-emoji ];
theme = "themes/dracula"; theme = "themes/dracula";
extraConfig = { extraConfig = {

View File

@ -0,0 +1,35 @@
{ inputs, config, lib, pkgs, ... }: {
# programs = {
# fish.loginShellInit = ''
# if test (tty) = "/dev/tty1"
# exec Hyprland &> /dev/null
# end
# '';
# };
# wayland.windowManager.hyprland = {
# enable = true;
# nvidiaPatches = true;
# extraConfig = (import ./config.nix { inherit (config) home; });
# };
programs.waybar.package = pkgs.waybar.overrideAttrs
(oa: { mesonFlags = (oa.mesonFlags or [ ]) ++ [ "-Dexperimental=true" ]; });
programs.waybar.enable = true;
home.packages = with pkgs; [
grim
imv
mimeo
xwayland
pulseaudio
slurp
swayidle
swaylock
waypipe
wireplumber
wf-recorder
wl-clipboard
wl-mirror
ydotool
];
}

View File

@ -2,6 +2,20 @@
let let
in { in {
nixpkgs = {
config = {
allowUnfree = true;
allowUnfreePredicate = (_: true);
};
};
nix = {
package = lib.mkDefault pkgs.nix;
settings = {
experimental-features = [ "nix-command" "flakes" "repl-flake" ];
warn-dirty = false;
};
};
programs = { programs = {
home-manager.enable = true; home-manager.enable = true;
git.enable = true; git.enable = true;

View File

@ -0,0 +1,7 @@
{
imports = [
hyprland.nix
];
}

View File

@ -0,0 +1,202 @@
{
home.file.".config/hypr/hyprland.conf".text = ''
# See https://wiki.hyprland.org/Configuring/Monitors/
monitor=eDP-1,preferred, 2560x0, auto
monitor=DP-2,preferred, 0x0, auto
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
# Execute your favorite apps at launch
# exec-once = waybar & hyprpaper & firefox
exec-once = waybar
exec-once = hyprpaper
exec-once = wl-paste -p -t text --watch clipman store -P --histpath="~/.local/share/clipman-primary.json"
# Source a file (multi-file configs)
# source = ~/.config/hypr/myColors.conf
# Some default env vars.
env = XCURSOR_SIZE,24
env = WLR_NO_HARDWARE_CURSORS,1
# For all categories, see https://wiki.hyprland.org/Configuring/Variables/
input {
kb_layout = de
kb_variant =
kb_model =
kb_rules =
kb_options=ctrl:nocaps
follow_mouse = 1
touchpad {
natural_scroll = yes
}
sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
}
general {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
col.active_border = rgb(44475a) rgb(bd93f9) 90deg
col.inactive_border = rgba(44475aaa)
col.group_border = rgba(282a36dd)
col.group_border_active = rgb(bd93f9) rgb(44475a) 90deg
gaps_in = 5
gaps_out = 5
border_size = 1
col.active_border = rgba(9742b5ee) rgba(9742b5ee) 45deg
col.inactive_border = rgba(595959aa)
layout = dwindle
}
decoration {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
col.shadow = rgba(1E202966)
drop_shadow = yes
shadow_range = 60
shadow_offset = 1 2
shadow_render_power = 3
shadow_scale = 0.97
rounding = 8
blur = yes
blur_size = 3
blur_passes = 3
blur_new_optimizations = on
active_opacity = 0.9
inactive_opacity = 0.5
drop_shadow = yes
shadow_range = 4
shadow_render_power = 3
}
animations {
enabled = yes
# Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
bezier = myBezier, 0.05, 0.9, 0.1, 1.05
animation = windows, 1, 7, myBezier
animation = windowsOut, 1, 7, default, popin 80%
animation = border, 1, 10, default
animation = borderangle, 1, 8, default
animation = fade, 1, 7, default
animation = workspaces, 1, 6, default
}
dwindle {
# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
preserve_split = yes # you probably want this
}
master {
# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
new_is_master = true
}
gestures {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
workspace_swipe = off
}
# Example per-device config
# See https://wiki.hyprland.org/Configuring/Keywords/#executing for more
device:epic-mouse-v1 {
sensitivity = -0.5
}
# Example windowrule v1
# windowrule = float, ^(kitty)$
# Example windowrule v2
# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
windowrule = float, file_progress
windowrule = float, confirm
windowrule = float, dialog
windowrule = float, download
windowrule = float, notification
windowrule = float, error
windowrule = float, splash
windowrule = float, confirmreset
windowrule = float, title:Open File
windowrule = float, title:branchdialog
windowrule = float, Lxappearance
windowrule = float, Wofi
windowrule = animation none,Wofi
windowrule = float,viewnior
windowrule = float,feh
windowrule = float, pavucontrol-qt
windowrule = float, pavucontrol
windowrule = float, file-roller
windowrule = fullscreen, wlogout
windowrule = float, title:wlogout
windowrule = fullscreen, title:wlogout
windowrule = idleinhibit focus, mpv
windowrule = idleinhibit fullscreen, firefox
windowrule = float, title:^(Media viewer)$
windowrule = float, title:^(Volume Control)$
windowrule = float, title:^(Picture-in-Picture)$
windowrule = size 800 600, title:^(Volume Control)$
windowrule = move 75 44%, title:^(Volume Control)$
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
$mainMod = SUPER
# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
bind = $mainMod, return, exec, alacritty -e tmux
bind = $mainMod control, t, exec, alacritty -e tmux attach
bind = $mainMod SHIFT, e, exec, emacsclient -n -c -e '(package-initialize)'
bind = $mainMod, o, exec, emacsclient -n -c -e '(dired "~")'
bind = $mainMod, Escape, exec, wlogout -p layer-shell
bind = $mainMod, Space, togglefloating
bind = $mainMod, q, killactive,
bind = $mainMod, M, exit,
bind= $mainMod, F, fullscreen
bind = $mainMod, E, exec, thunar
bind = $mainMod, V, togglefloating,
bind = $mainMod, D, exec, rofi -modi drun emoji calc ssh -show drun -font 'Fira Code 13' -show-icons
bind = $mainMod, D, exec, rofi -modi drun emoji calc ssh -show drun -font 'Fira Code 13' -show-icons
bind = $mainMod SHIFT, P, pseudo, # dwindle
bind = $mainMod, J, togglesplit, # dwindle
# Move focus with mainMod + arrow keys
bind = $mainMod, left, movefocus, l
bind = $mainMod, right, movefocus, r
bind = $mainMod, up, movefocus, u
bind = $mainMod, down, movefocus, d
# Switch workspaces with mainMod + [0-9]
bind = $mainMod, 1, workspace, 1
bind = $mainMod, 2, workspace, 2
bind = $mainMod, 3, workspace, 3
bind = $mainMod, 4, workspace, 4
bind = $mainMod, 5, workspace, 5
bind = $mainMod, 6, workspace, 6
bind = $mainMod, 7, workspace, 7
bind = $mainMod, 8, workspace, 8
bind = $mainMod, 9, workspace, 9
bind = $mainMod, 0, workspace, 10
# Move active window to a workspace with mainMod + SHIFT + [0-9]
bind = $mainMod SHIFT, 1, movetoworkspace, 1
bind = $mainMod SHIFT, 2, movetoworkspace, 2
bind = $mainMod SHIFT, 3, movetoworkspace, 3
bind = $mainMod SHIFT, 4, movetoworkspace, 4
bind = $mainMod SHIFT, 5, movetoworkspace, 5
bind = $mainMod SHIFT, 6, movetoworkspace, 6
bind = $mainMod SHIFT, 7, movetoworkspace, 7
bind = $mainMod SHIFT, 8, movetoworkspace, 8
bind = $mainMod SHIFT, 9, movetoworkspace, 9
bind = $mainMod SHIFT, 0, movetoworkspace, 10
# Scroll through existing workspaces with mainMod + scroll
bind = $mainMod, mouse_down, workspace, e+1
bind = $mainMod, mouse_up, workspace, e-1
# Move/resize windows with mainMod + LMB/RMB and dragging
bindm = $mainMod, mouse:272, movewindow
bindm = $mainMod, mouse:273, resizewindow
'';
}

View File

@ -8,7 +8,7 @@
../../features/virtualization ../../features/virtualization
../../features/services ../../features/services
]; ];
nixpkgs.config.allowUnfree = true;
features = { features = {
cli = { cli = {
fish.enable = true; fish.enable = true;
@ -23,17 +23,13 @@ nixpkgs.config.allowUnfree = true;
design.enable = true; design.enable = true;
extrafonts.enable = true; extrafonts.enable = true;
media.enable = true; media.enable = true;
office.enable = true;
}; };
virtualization = { virtualization = {
podman.enable = true; podman.enable = true;
qemu.enable = true; qemu.enable = true;
}; };
services = { services = { netbird.enable = true; };
netbird.enable = true;
};
}; };
home.stateVersion = "22.11"; home.stateVersion = "22.11";
} }

View File

@ -1,14 +1,14 @@
{ config, lib, inputs, pkgs, system, ... }: { lib, pkgs, inputs, outputs, ... }:
{ {
imports = [ imports = [
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
]; ];
home-manager = {
useUserPackages = true;
extraSpecialArgs = { inherit inputs outputs; };
};
users.defaultUserShell = pkgs.fish; users.defaultUserShell = pkgs.fish;
# Allow unfree packages
nixpkgs.config.allowUnfree = true;
environment.systemPackages = [ environment.systemPackages = [
inputs.agenix.packages.x86_64-linux.default inputs.agenix.packages.x86_64-linux.default
pkgs.busybox pkgs.busybox

View File

@ -4,7 +4,7 @@
"$y$j9T$wOKc3kLsQVtmmyLIN7ljV.$NvdWzwn6p8JNByHoXQqf6/GF3C0JOPHW/D0HgFLQXy4"; "$y$j9T$wOKc3kLsQVtmmyLIN7ljV.$NvdWzwn6p8JNByHoXQqf6/GF3C0JOPHW/D0HgFLQXy4";
isNormalUser = true; isNormalUser = true;
description = "m3tam3re"; description = "m3tam3re";
extraGroups = [ "wheel" "networkmanager" "libvirtd" "flatpak" ]; extraGroups = [ "wheel" "networkmanager" "libvirtd" "flatpak" "audio" "video" ];
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC3YEmpYbM+cpmyD10tzNRHEn526Z3LJOzYpWEKdJg8DaYyPbDn9iyVX30Nja2SrW4Wadws0Y8DW+Urs25/wVB6mKl7jgPJVkMi5hfobu3XAz8gwSdjDzRSWJrhjynuaXiTtRYED2INbvjLuxx3X8coNwMw58OuUuw5kNJp5aS2qFmHEYQErQsGT4MNqESe3jvTP27Z5pSneBj45LmGK+RcaSnJe7hG+KRtjuhjI7RdzMeDCX73SfUsal+rHeuEw/mmjYmiIItXhFTDn8ZvVwpBKv7xsJG90DkaX2vaTk0wgJdMnpVIuIRBa4EkmMWOQ3bMLGkLQeK/4FUkNcvQ/4+zcZsg4cY9Q7Fj55DD41hAUdF6SYODtn5qMPsTCnJz44glHt/oseKXMSd556NIw2HOvihbJW7Rwl4OEjGaO/dF4nUw4c9tHWmMn9dLslAVpUuZOb7ykgP0jk79ldT3Dv+2Hj0CdAWT2cJAdFX58KQ9jUPT3tBnObSF1lGMI7t77VU= m3tam3re@m3-nix" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC3YEmpYbM+cpmyD10tzNRHEn526Z3LJOzYpWEKdJg8DaYyPbDn9iyVX30Nja2SrW4Wadws0Y8DW+Urs25/wVB6mKl7jgPJVkMi5hfobu3XAz8gwSdjDzRSWJrhjynuaXiTtRYED2INbvjLuxx3X8coNwMw58OuUuw5kNJp5aS2qFmHEYQErQsGT4MNqESe3jvTP27Z5pSneBj45LmGK+RcaSnJe7hG+KRtjuhjI7RdzMeDCX73SfUsal+rHeuEw/mmjYmiIItXhFTDn8ZvVwpBKv7xsJG90DkaX2vaTk0wgJdMnpVIuIRBa4EkmMWOQ3bMLGkLQeK/4FUkNcvQ/4+zcZsg4cY9Q7Fj55DD41hAUdF6SYODtn5qMPsTCnJz44glHt/oseKXMSd556NIw2HOvihbJW7Rwl4OEjGaO/dF4nUw4c9tHWmMn9dLslAVpUuZOb7ykgP0jk79ldT3Dv+2Hj0CdAWT2cJAdFX58KQ9jUPT3tBnObSF1lGMI7t77VU= m3tam3re@m3-nix"
]; ];

View File

@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }: { config, inputs, pkgs, lib, ... }:
with pkgs; with pkgs;
@ -19,6 +19,7 @@ in {
../common/users/m3tam3re ../common/users/m3tam3re
../common/base ../common/base
./services ./services
inputs.hyprland.nixosModules.default
]; ];
specialisation = { specialisation = {
@ -50,7 +51,7 @@ in {
hardware.tuxedo-keyboard.enable = true; hardware.tuxedo-keyboard.enable = true;
boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
boot.kernelModules = [ "v4l2loopback" ]; boot.kernelModules = [ "v4l2loopback" ];
boot.kernelParams = [ boot.kernelParams = [
"tuxedo_keyboard.mode=0" # https://github.com/tuxedocomputers/tuxedo-keyboard#kernelparam "tuxedo_keyboard.mode=0" # https://github.com/tuxedocomputers/tuxedo-keyboard#kernelparam
"tuxedo_keyboard.brightness=255" "tuxedo_keyboard.brightness=255"
@ -103,12 +104,21 @@ in {
}; };
}; };
# xdg.portal = {
# enable = true;
# wlr.enable = true;
# extraPortals = [ pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-wlr ];
# };
programs.hyprland = {
enable = true;
nvidiaPatches = true;
};
programs.steam = { programs.steam = {
enable = true; enable = true;
remotePlay.openFirewall = true; remotePlay.openFirewall = true;
dedicatedServer.openFirewall = true; dedicatedServer.openFirewall = true;
}; };
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
i18n.defaultLocale = "de_DE.utf8"; i18n.defaultLocale = "de_DE.utf8";
console.keyMap = "de"; console.keyMap = "de";

View File

@ -1,18 +1,19 @@
{ pkgs, ... }: { { pkgs, ... }: {
services.xserver = { services.xserver.videoDrivers = [ "nvidia" ];
enable = true; # services.xserver = {
videoDrivers = [ "nvidia" ]; # enable = true;
displayManager = { # videoDrivers = [ "nvidia" ];
defaultSession = "hyprland"; # displayManager = {
sddm = { enable = true; }; # defaultSession = "hyprland";
}; # sddm = { enable = true; };
libinput.enable = true; # touchpad support # };
layout = "de"; # libinput.enable = true; # touchpad support
xkbOptions = "ctrl:nocaps"; # layout = "de";
}; # xkbOptions = "ctrl:nocaps";
services.xserver.screenSection = '' # };
Option "metamodes" "nvidia-auto-select +0+0 {ForceFullCompositionPipeline=On}" # services.xserver.screenSection = ''
Option "AllowIndirectGLXProtocol" "off" # Option "metamodes" "nvidia-auto-select +0+0 {ForceFullCompositionPipeline=On}"
Option "TripleBuffer" "on" # Option "AllowIndirectGLXProtocol" "off"
''; # Option "TripleBuffer" "on"
# '';
} }