From 294e40987c5c1d6179f32bea93cc08ab914434ae Mon Sep 17 00:00:00 2001 From: Julian Mutter Date: Wed, 19 Jun 2024 11:44:36 +0200 Subject: [PATCH] Re-migrate to i3 (x11) --- homes/x86_64-linux/julian@aspi/default.nix | 10 ++++-- homes/x86_64-linux/julian@aspi/packages.nix | 2 +- modules/home/i3/default.nix | 17 +++++++--- modules/home/i3/i3/config | 35 ++++++++++----------- modules/nixos/wayland/default.nix | 2 ++ systems/x86_64-linux/aspi/default.nix | 11 ++++--- 6 files changed, 45 insertions(+), 32 deletions(-) diff --git a/homes/x86_64-linux/julian@aspi/default.nix b/homes/x86_64-linux/julian@aspi/default.nix index 4a8d6f2..87ddf41 100644 --- a/homes/x86_64-linux/julian@aspi/default.nix +++ b/homes/x86_64-linux/julian@aspi/default.nix @@ -35,9 +35,9 @@ alacritty.enable = true; emacs.enable = true; - # i3.enable = true; - # rofi.enable = true; - hyprland.enable = true; + i3.enable = true; + + # hyprland.enable = true; nix-helper.enable = true; desktop.enable = true; @@ -99,6 +99,10 @@ ./packages.nix ]; + services.blueman-applet.enable = true; + services.nextcloud-client.enable = true; + services.nextcloud-client.startInBackground = true; + services.network-manager-applet.enable = true; services.syncthing.enable = true; # Let Home Manager install and manage itself. diff --git a/homes/x86_64-linux/julian@aspi/packages.nix b/homes/x86_64-linux/julian@aspi/packages.nix index d25f71c..97a6a1f 100644 --- a/homes/x86_64-linux/julian@aspi/packages.nix +++ b/homes/x86_64-linux/julian@aspi/packages.nix @@ -44,7 +44,7 @@ with pkgs; imagemagick firefox thunderbird - nextcloud-client + # nextcloud-client # use service instead qalculate-gtk libqalculate diff --git a/modules/home/i3/default.nix b/modules/home/i3/default.nix index 4522bc4..f1ad4e3 100644 --- a/modules/home/i3/default.nix +++ b/modules/home/i3/default.nix @@ -31,14 +31,22 @@ in }; config = mkIf cfg.enable { + modules.rofi.enable = true; + + services.dunst.enable = true; + programs = { i3status-rust = { enable = true; }; }; - home.packages = with pkgs; [ nitrogen ]; + home.packages = with pkgs; [ + nitrogen + xfce.xfce4-screenshooter + ]; xsession.windowManager.i3 = { enable = true; + package = pkgs.i3-gaps; }; # Overwrite default home-manager config file @@ -55,8 +63,9 @@ in ".config/i3status-rust/config.toml".source = ./i3status-rust/config.toml; }; - home.file = { - ".profile".source = ./.profile; - }; + home.sessionPath = [ "/home/julian/.config/i3/scripts" ]; + # home.file = { + # ".profile".source = ./.profile; + # }; }; } diff --git a/modules/home/i3/i3/config b/modules/home/i3/i3/config index 56a3d99..a621909 100644 --- a/modules/home/i3/i3/config +++ b/modules/home/i3/i3/config @@ -215,10 +215,8 @@ bindsym $mod+Print exec --no-startup-id "xfce4-screenshooter" bindsym $mod+c exec qalculate-gtk bindsym $mod+Shift+p exec xwacomcalibrate bindsym $mod+e exec thunar -bindsym $mod+Shift+c exec $scripts/jupyter-calculator bindsym $mod+b exec firefox -bindsym $mod+u exec pamac-manager -bindsym $mod+p exec $scripts/display-toggle-mirror +bindsym $mod+p exec display-toggle-mirror workspace_auto_back_and_forth yes @@ -261,43 +259,42 @@ for_window [class="Viewnior"] border normal ########## Autostart applications ########## exec firefox -exec --no-startup-id nm-applet -exec --no-startup-id blueman-applet -exec --no-startup-id xfce4-power-manager -exec --no-startup-id nextcloud --background +# exec --no-startup-id nm-applet +# exec --no-startup-id blueman-applet +# exec --no-startup-id nextcloud --background # exec --no-startup-id xfce4-screensaver # exec --no-startup-id /usr/bin/emacs --daemon # Authentication agent -exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 -exec --no-startup-id /usr/bin/env gnome-keyring-daemon --start +# exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 +# exec --no-startup-id /usr/bin/env gnome-keyring-daemon --start # Notify about software updates -exec --no-startup-id pamac-tray -exec --no-startup-id clipit +# exec --no-startup-id pamac-tray +# exec --no-startup-id clipit # exec --no-startup-id xfce4-clipman # Notify about kernel updates -exec --no-startup-id msm_notifier +# exec --no-startup-id msm_notifier # Audio -exec --no-startup-id start-pulseaudio-x11 -exec --no-startup-id pa-applet +# exec --no-startup-id start-pulseaudio-x11 +# exec --no-startup-id pa-applet # Background exec --no-startup-id nitrogen --restore # Adjust display temperature -exec --no-startup-id redshift +# exec --no-startup-id redshift # Notifications -exec --no-startup-id /usr/lib/xfce4/notifyd/xfce4-notifyd +# exec --no-startup-id /usr/lib/xfce4/notifyd/xfce4-notifyd # exec --no-startup-id xautolock -time 10 -locker blurlock -exec_always --no-startup-id ff-theme-util -exec_always --no-startup-id fix_xcursor +# exec_always --no-startup-id ff-theme-util +# exec_always --no-startup-id fix_xcursor -exec_always --no-startup-id "$scripts/display-layoutpicker" +exec_always --no-startup-id "display-layoutpicker" ############################# diff --git a/modules/nixos/wayland/default.nix b/modules/nixos/wayland/default.nix index b661617..5b82c01 100644 --- a/modules/nixos/wayland/default.nix +++ b/modules/nixos/wayland/default.nix @@ -31,6 +31,8 @@ in config = lib.mkIf cfg.enable { environment.sessionVariables.NIXOS_OZONE_WL = "1"; # Hint electron apps to use wayland + security.pam.services.gtklock = { }; + environment.systemPackages = with pkgs; [ kdePackages.qtwayland wl-clipboard diff --git a/systems/x86_64-linux/aspi/default.nix b/systems/x86_64-linux/aspi/default.nix index ebfed27..bf93d7d 100644 --- a/systems/x86_64-linux/aspi/default.nix +++ b/systems/x86_64-linux/aspi/default.nix @@ -69,8 +69,8 @@ modules = { locales.enable = true; thunar.enable = true; - wayland.enable = true; - hyprland.enable = true; + # wayland.enable = true; + # hyprland.enable = true; }; nix.settings.auto-optimise-store = true; @@ -103,7 +103,6 @@ # Enable the XFCE Desktop Environment. security.pam.services.gdm.enableGnomeKeyring = true; - security.pam.services.gtklock = { }; # services.displayManager.sddm.wayland.enable = true; # services.xserver.desktopManager = { @@ -115,8 +114,10 @@ # }; # }; # services.xserver.displayManager.gdm.enable = true; - # services.xserver.windowManager.i3.enable = true; - # services.xserver.windowManager.i3.package = pkgs.i3-gaps; + services.xserver.windowManager.i3.enable = true; + services.xserver.windowManager.i3.package = pkgs.i3-gaps; + + services.blueman.enable = true; programs.kdeconnect.enable = true;