From 8adc05399cd1587c3b7d0429775679ce87349b80 Mon Sep 17 00:00:00 2001 From: Kopatz <7265381+Kropatz@users.noreply.github.com> Date: Thu, 6 Jun 2024 23:22:44 +0200 Subject: [PATCH] fix warnings --- home-manager/zsh.nix | 3 +-- modules/graphical/i3.nix | 29 ++++++++++++++++------------- modules/graphical/shared.nix | 15 ++++++--------- 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/home-manager/zsh.nix b/home-manager/zsh.nix index aa082e7..585ebb0 100644 --- a/home-manager/zsh.nix +++ b/home-manager/zsh.nix @@ -3,8 +3,7 @@ programs.zsh = { enable = true; enableCompletion = true; - # new option autosuggestion.enable = true; - enableAutosuggestions = true; + autosuggestion.enable = true; shellAliases = { # TODO: gifsicle -O3 --lossy=30 noita-20240328-191617-1612416266-00316616.gif -o noita-20240328-191617-1612416266.gif backupNoita = "cp -r ~/.local/share/Steam/steamapps/compatdata/881100/pfx/drive_c/users/steamuser/AppData/LocalLow/Nolla_Games_Noita/save00 /synced/default/backups/noita_save"; diff --git a/modules/graphical/i3.nix b/modules/graphical/i3.nix index 6f74f1f..409fa65 100644 --- a/modules/graphical/i3.nix +++ b/modules/graphical/i3.nix @@ -19,29 +19,32 @@ in { portal = { enable = true; extraPortals = with pkgs; [ libsForQt5.xdg-desktop-portal-kde ]; + config.common.default = "*"; }; }; - services.xserver = { - enable = true; - - xkb.layout = config.mainUser.layout; - xkb.variant = config.mainUser.variant; - desktopManager = { xterm.enable = false; }; - + services = { displayManager = { defaultSession = "none+i3"; sddm.enable = true; sddm.theme = "${pkgs.sddm-astronaut}"; }; - windowManager.i3 = { + xserver = { enable = true; - extraPackages = with pkgs; [ - i3status # gives you the default i3 status bar - i3lock-color # i3 screen locker - i3blocks # if you are planning on using i3blocks over i3status - ]; + + xkb.layout = config.mainUser.layout; + xkb.variant = config.mainUser.variant; + desktopManager = { xterm.enable = false; }; + + windowManager.i3 = { + enable = true; + extraPackages = with pkgs; [ + i3status # gives you the default i3 status bar + i3lock-color # i3 screen locker + i3blocks # if you are planning on using i3blocks over i3status + ]; + }; }; }; diff --git a/modules/graphical/shared.nix b/modules/graphical/shared.nix index bed86de..73d924e 100644 --- a/modules/graphical/shared.nix +++ b/modules/graphical/shared.nix @@ -24,17 +24,14 @@ in { noto-fonts-cjk #font-awesome ]; - services.xserver = { - libinput = { - enable = true; + services.libinput = { + enable = true; - # disabling mouse acceleration - mouse = { - accelProfile = "flat"; - middleEmulation = false; - }; + # disabling mouse acceleration + mouse = { + accelProfile = "flat"; + middleEmulation = false; }; - }; networking.firewall = {