Re-migrate to i3 (x11)

This commit is contained in:
Julian Mutter 2024-06-19 11:44:36 +02:00
parent 98ac550582
commit 294e40987c
6 changed files with 45 additions and 32 deletions

View File

@ -35,9 +35,9 @@
alacritty.enable = true; alacritty.enable = true;
emacs.enable = true; emacs.enable = true;
# i3.enable = true; i3.enable = true;
# rofi.enable = true;
hyprland.enable = true; # hyprland.enable = true;
nix-helper.enable = true; nix-helper.enable = true;
desktop.enable = true; desktop.enable = true;
@ -99,6 +99,10 @@
./packages.nix ./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; services.syncthing.enable = true;
# Let Home Manager install and manage itself. # Let Home Manager install and manage itself.

View File

@ -44,7 +44,7 @@ with pkgs;
imagemagick imagemagick
firefox firefox
thunderbird thunderbird
nextcloud-client # nextcloud-client # use service instead
qalculate-gtk qalculate-gtk
libqalculate libqalculate

View File

@ -31,14 +31,22 @@ in
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
modules.rofi.enable = true;
services.dunst.enable = true;
programs = { programs = {
i3status-rust = { i3status-rust = {
enable = true; enable = true;
}; };
}; };
home.packages = with pkgs; [ nitrogen ]; home.packages = with pkgs; [
nitrogen
xfce.xfce4-screenshooter
];
xsession.windowManager.i3 = { xsession.windowManager.i3 = {
enable = true; enable = true;
package = pkgs.i3-gaps;
}; };
# Overwrite default home-manager config file # Overwrite default home-manager config file
@ -55,8 +63,9 @@ in
".config/i3status-rust/config.toml".source = ./i3status-rust/config.toml; ".config/i3status-rust/config.toml".source = ./i3status-rust/config.toml;
}; };
home.file = { home.sessionPath = [ "/home/julian/.config/i3/scripts" ];
".profile".source = ./.profile; # home.file = {
}; # ".profile".source = ./.profile;
# };
}; };
} }

View File

@ -215,10 +215,8 @@ bindsym $mod+Print exec --no-startup-id "xfce4-screenshooter"
bindsym $mod+c exec qalculate-gtk bindsym $mod+c exec qalculate-gtk
bindsym $mod+Shift+p exec xwacomcalibrate bindsym $mod+Shift+p exec xwacomcalibrate
bindsym $mod+e exec thunar bindsym $mod+e exec thunar
bindsym $mod+Shift+c exec $scripts/jupyter-calculator
bindsym $mod+b exec firefox bindsym $mod+b exec firefox
bindsym $mod+u exec pamac-manager bindsym $mod+p exec display-toggle-mirror
bindsym $mod+p exec $scripts/display-toggle-mirror
workspace_auto_back_and_forth yes workspace_auto_back_and_forth yes
@ -261,43 +259,42 @@ for_window [class="Viewnior"] border normal
########## Autostart applications ########## ########## Autostart applications ##########
exec firefox exec firefox
exec --no-startup-id nm-applet # exec --no-startup-id nm-applet
exec --no-startup-id blueman-applet # exec --no-startup-id blueman-applet
exec --no-startup-id xfce4-power-manager # exec --no-startup-id nextcloud --background
exec --no-startup-id nextcloud --background
# exec --no-startup-id xfce4-screensaver # exec --no-startup-id xfce4-screensaver
# exec --no-startup-id /usr/bin/emacs --daemon # exec --no-startup-id /usr/bin/emacs --daemon
# Authentication agent # Authentication agent
exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 # 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/bin/env gnome-keyring-daemon --start
# Notify about software updates # Notify about software updates
exec --no-startup-id pamac-tray # exec --no-startup-id pamac-tray
exec --no-startup-id clipit # exec --no-startup-id clipit
# exec --no-startup-id xfce4-clipman # exec --no-startup-id xfce4-clipman
# Notify about kernel updates # Notify about kernel updates
exec --no-startup-id msm_notifier # exec --no-startup-id msm_notifier
# Audio # Audio
exec --no-startup-id start-pulseaudio-x11 # exec --no-startup-id start-pulseaudio-x11
exec --no-startup-id pa-applet # exec --no-startup-id pa-applet
# Background # Background
exec --no-startup-id nitrogen --restore exec --no-startup-id nitrogen --restore
# Adjust display temperature # Adjust display temperature
exec --no-startup-id redshift # exec --no-startup-id redshift
# Notifications # 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 --no-startup-id xautolock -time 10 -locker blurlock
exec_always --no-startup-id ff-theme-util # exec_always --no-startup-id ff-theme-util
exec_always --no-startup-id fix_xcursor # exec_always --no-startup-id fix_xcursor
exec_always --no-startup-id "$scripts/display-layoutpicker" exec_always --no-startup-id "display-layoutpicker"
############################# #############################

View File

@ -31,6 +31,8 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.sessionVariables.NIXOS_OZONE_WL = "1"; # Hint electron apps to use wayland environment.sessionVariables.NIXOS_OZONE_WL = "1"; # Hint electron apps to use wayland
security.pam.services.gtklock = { };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
kdePackages.qtwayland kdePackages.qtwayland
wl-clipboard wl-clipboard

View File

@ -69,8 +69,8 @@
modules = { modules = {
locales.enable = true; locales.enable = true;
thunar.enable = true; thunar.enable = true;
wayland.enable = true; # wayland.enable = true;
hyprland.enable = true; # hyprland.enable = true;
}; };
nix.settings.auto-optimise-store = true; nix.settings.auto-optimise-store = true;
@ -103,7 +103,6 @@
# Enable the XFCE Desktop Environment. # Enable the XFCE Desktop Environment.
security.pam.services.gdm.enableGnomeKeyring = true; security.pam.services.gdm.enableGnomeKeyring = true;
security.pam.services.gtklock = { };
# services.displayManager.sddm.wayland.enable = true; # services.displayManager.sddm.wayland.enable = true;
# services.xserver.desktopManager = { # services.xserver.desktopManager = {
@ -115,8 +114,10 @@
# }; # };
# }; # };
# services.xserver.displayManager.gdm.enable = true; # services.xserver.displayManager.gdm.enable = true;
# services.xserver.windowManager.i3.enable = true; services.xserver.windowManager.i3.enable = true;
# services.xserver.windowManager.i3.package = pkgs.i3-gaps; services.xserver.windowManager.i3.package = pkgs.i3-gaps;
services.blueman.enable = true;
programs.kdeconnect.enable = true; programs.kdeconnect.enable = true;