chore: resolve merge conflict

users/phundrak/config/hypr/hyprland.conf

@@ -1,249 +0,0 @@
-env = XCURSOR_SIZE,24
-env = SDL_VIDEODRIVER,wayland
-
-input {
-    kb_layout = fr
-    kb_variant = bepo_afnor
-    kb_model =
-    kb_options = caps:ctrl_modifier
-    kb_rules =
-    numlock_by_default = true
-
-    follow_mouse = 1
-
-    touchpad {
-        natural_scroll = false
-    }
-
-    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
-}
-
-monitor = HDMI-A-1, 2560x1080, 0x0, 1
-monitor = eDP-1, 1920x1080@120, 2560x0, 1
-
-general {
-    gaps_in = 5
-    gaps_out = 20
-    border_size = 2
-    col.active_border = rgb(81a1c1) rgb(a3be8c) 45deg
-    col.inactive_border = rgb(4c566a)
-    layout = dwindle
-}
-
-decoration {
-    rounding = 5
-    blur {
-        enabled = true
-        size = 9
-        passes = 1
-    }
-    shadow {
-        enabled = true
-        color = rgba(2e3440aa)
-        range = 4
-        render_power = 3
-    }
-}
-
-animations {
-    enabled = true
-    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 {
-    pseudotile = true
-    preserve_split = true
-}
-
-exec-once = wpaperd
-exec-once = waybar
-
-exec-once = pactl load-module module-switch-on-connect
-exec-once = mpc stop
-
-exec-once = xfce-polkit
-
-exec-once = swaync
-
-exec-once = wlsunset -l 48.5 -L 2.2 -d 1500
-
-exec-once = nm-applet
-exec-once = blueman-applet
-
-$left = c
-$right = r
-$up = s
-$down = t
-$menu = rofi -combi-modi drun -show combi
-
-bind = SUPER, Return, exec, kitty
-bind = SUPER, Space, submap, leader
-bind = , Print, submap, screenshot
-
-submap = leader
-bind = , l, exec, plock
-bind = , l, submap, reset
-bind = , a, submap, apps
-bind = , b, submap, buffers
-bind = , w, submap, windows
-bind = , escape, submap, reset
-bind = CTRL, g, submap, reset
-
-submap = apps
-bind = , b, exec, zen-browser
-bind = , b, submap, reset
-bind = SHIFT, b, exec, qutebrowser
-bind = SHIFT, b, submap, reset
-bind = , d, exec, vesktop
-bind = , d, submap, reset
-bind = , e, exec, emacsclient -c -n
-bind = , e, submap, reset
-bind = , g, exec, gimp
-bind = , g, submap, reset
-bind = , n, exec, nemo
-bind = , n, submap, reset
-bind = , r, submap, rofi
-bind = , u, exec, $menu
-bind = , u, submap, reset
-bind = , escape, submap, reset
-bind = CTRL, g, submap, reset
-submap = buffers
-bind = , d, killactive,
-bind = , d, submap, reset
-bind = , escape, submap, reset
-bind = CTRL, g, submap, reset
-submap = resize
-binde = , $left, resizeactive, -10 0
-binde = , $right, resizeactive, 10 0
-binde = , $up, resizeactive, 0 -10
-binde = , $down, resizeactive, 0 10
-bind = , q, submap, reset
-bind = , escape, submap, reset
-bind = CTRL, g, submap, reset
-submap = rofi
-bind = , a, exec, awiki
-bind = , a, submap, reset
-bind = , b, exec, bluetooth-connect
-bind = , b, submap, reset
-bind = , e, exec, rofi-emoji
-bind = , e, submap, reset
-bind = , r, exec, $menu
-bind = , r, submap, reset
-bind = , s, exec, rofi -show ssh
-bind = , s, submap, reset
-bind = , y, exec, ytplay
-bind = , y, submap, reset
-bind = SHIFT, y, exec, rofi-ytdl
-bind = SHIFT, y, submap, reset
-bind = , escape, submap, reset
-bind = CTRL, g, submap, reset
-submap = screenshot
-bind = , Print, exec, screenshot
-bind = , Print, submap, reset
-bind = , d, exec, screenshot -d 3
-bind = , d, submap, reset
-bind = Shift, d, exec, screenshot -sced 3
-bind = Shift, d, submap, reset
-bind = , e, exec, screenshot -sec
-bind = , e, submap, reset
-bind = , s, exec, screenshot -s
-bind = , s, submap, reset
-bind = Shift, s, exec, screenshot -sc
-bind = Shift, s, submap, reset
-bind = , escape, submap, reset
-bind = CTRL, g, submap, reset
-submap = windows
-bind = , period, submap, resize
-bind = , $left, movefocus, l
-bind = , $left, submap, reset
-bind = , $right, movefocus, r
-bind = , $right, submap, reset
-bind = , $up, movefocus, u
-bind = , $up, submap, reset
-bind = , $down, movefocus, d
-bind = , $down, submap, reset
-bind = SHIFT, $left, movewindow, l
-bind = SHIFT, $left, submap, reset
-bind = SHIFT, $right, movewindow, r
-bind = SHIFT, $right, submap, reset
-bind = SHIFT, $up, movewindow, u
-bind = SHIFT, $up, submap, reset
-bind = SHIFT, $down, movewindow, d
-bind = SHIFT, $down, submap, reset
-bind = CTRL_SHIFT, $left, moveworkspacetomonitor, e+0 +1
-bind = CTRL_SHIFT, $left, submap, reset
-bind = CTRL_SHIFT, $right, moveworkspacetomonitor, e+0 -1
-bind = CTRL_SHIFT, $right, submap, reset
-bind = , d, killactive,
-bind = , d, submap, reset
-bind = , f, fullscreen,
-bind = , f, submap, reset
-bind = SHIFT, f, togglefloating,
-bind = SHIFT, f, submap, reset
-bind = , escape, submap, reset
-bind = CTRL, g, submap, reset
-
-submap = reset
-bindl = , XF86AudioPlay, exec, playerctl play-pause
-bindl = , XF86AudioPause, exec, playerctl pause
-bindl = , XF86AudioStop, exec, playerctl stop
-bindl = , XF86AudioPrev, exec, playerctl previous
-bindl = , XF86AudioNext, exec, playerctl next
-bindl = , XF86AudioForward, exec, playerctl position +1
-bindl = , XF86AudioRewind, exec, playerctl position -1
-bindl = , XF86AudioRaiseVolume, exec, pamixer -i 2
-bindl = , XF86AudioLowerVolume, exec, pamixer -d 2
-bindl = , XF86MonBrightnessUp, exec, xbacklight -perceived -inc 2
-bindl = , XF86MonBrightnessDown, exec, xbacklight -perceived -dec 2
-bindl = , XF86KbdBrightnessUp, exec, xbacklight -perceived -inc 2
-bindl = , XF86KbdBrightnessDown, exec, xbacklight -perceived -dec 2
-bind = SUPER, $left, movefocus, l
-bind = SUPER, $right, movefocus, r
-bind = SUPER, $up, movefocus, u
-bind = SUPER, $down, movefocus, d
-bind = SUPER_SHIFT, $left, movewindow, l
-bind = SUPER_SHIFT, $left, submap, reset
-bind = SUPER_SHIFT, $right, movewindow, r
-bind = SUPER_SHIFT, $right, submap, reset
-bind = SUPER_SHIFT, $up, movewindow, u
-bind = SUPER_SHIFT, $up, submap, reset
-bind = SUPER_SHIFT, $down, movewindow, d
-bind = SUPER_SHIFT, $down, submap, reset
-bind = SUPER_CTRL_SHIFT, $left, moveworkspacetomonitor, e+0 +1
-bind = SUPER_CTRL_SHIFT, $left, submap, reset
-bind = SUPER_CTRL_SHIFT, $right, moveworkspacetomonitor, e+0 -1
-bind = SUPER_CTRL_SHIFT, $right, submap, reset
-bind = SUPER, Tab, cyclenext,
-bind = SUPER_SHIFT, Tab, cyclenext, prev
-bindm = SUPER, mouse:272, movewindow
-bindm = SUPER, mouse:273, resizewindow
-bind = SUPER, quotedbl, workspace, 1
-bind = SUPER, guillemotleft, workspace, 2
-bind = SUPER, guillemotright, workspace, 3
-bind = SUPER, parenleft, workspace, 4
-bind = SUPER, parenright, workspace, 5
-bind = SUPER, at, workspace, 6
-bind = SUPER, plus, workspace, 7
-bind = SUPER, minus, workspace, 8
-bind = SUPER, slash, workspace, 9
-bind = SUPER, asterisk, workspace, 10
-bind = SUPER, mouse_down, workspace, e+1
-bind = SUPER, mouse_up, workspace, e-1
-bind = SUPER_SHIFT, quotedbl, movetoworkspace, 1
-bind = SUPER_SHIFT, guillemotleft, movetoworkspace, 2
-bind = SUPER_SHIFT, guillemotright, movetoworkspace, 3
-bind = SUPER_SHIFT, parenleft, movetoworkspace, 4
-bind = SUPER_SHIFT, parenright, movetoworkspace, 5
-bind = SUPER_SHIFT, at, movetoworkspace, 6
-bind = SUPER_SHIFT, plus, movetoworkspace, 7
-bind = SUPER_SHIFT, minus, movetoworkspace, 8
-bind = SUPER_SHIFT, slash, movetoworkspace, 9
-bind = SUPER_SHIFT, asterisk, movetoworkspace, 10
-
-windowrulev2 = float,class:^(xfce-polkit)$

users/phundrak/email.nix

@@ -0,0 +1,37 @@
+{config, ...}: {
+  accounts.email = {
+    maildirBasePath = "Mail";
+    accounts."lucien@phundrak.com" = {
+      realName = "Lucien Cartier-Tilet";
+      address = "lucien@phundrak.com";
+      aliases = [
+        "lucien@cartier-tilet.com"
+        "admin@phundrak.com"
+        "webmaster@phundrak.com"
+        "youdontknow@phundrak.com"
+      ];
+      passwordCommand = "cat ${config.sops.secrets.emailPassword.path}";
+      signature = {
+        text = ''
+          Lucien “Phundrak” Cartier-Tilet
+          https://phundrak.com (Français)
+          https://phundrak.com/en (English)
+          Sent from GNU/Emacs
+        '';
+        showSignature = "append";
+      };
+      userName = "lucien@phundrak.com";
+      imap.host = "mail.phundrak.com";
+      smtp.host = "mail.phundrak.com";
+      mu.enable = true;
+      primary = true;
+
+      mbsync = {
+        create = "maildir";
+        enable = true;
+        expunge = "both";
+        remove = "both";
+      };
+    };
+  };
+}

users/phundrak/home.nix

@@ -7,9 +7,11 @@
   imports = [
     ./light-home.nix
     ./packages.nix
+    ./email.nix
     ../modules/emacs.nix
     ../modules/kdeconnect.nix
     ../modules/kitty.nix
+    ../modules/hyprland.nix
     ../modules/mbsync.nix
     ../modules/mpd.nix
     ../modules/mpv.nix
@@ -47,6 +49,11 @@
     };
 
     modules = {
+      shell.starship.jjIntegration = true;
+      bat.extras = true;
+      packages.emacsPackage = emacsPkg;
+      mopidy.enable = true;
+
       emacs = {
         enable = true;
         service = true;
@@ -54,11 +61,16 @@
         mu4eMime = true;
         org-protocol = true;
       };
-      shell.starship.jjIntegration = true;
-      bat.extras = true;
-      packages.emacsPackage = emacsPkg;
-      mopidy.enable = true;
-
+      hyprland = {
+        inherit emacsPkg;
+        enable = true;
+        swaync = true;
+        waybar = {
+          enable = true;
+          battery = false;
+          style = ./config/waybar/style.css;
+        };
+      };
       mbsync = {
         enable = true;
         passwordFile = config.sops.secrets.emailPassword.path;
@@ -96,6 +108,12 @@
         ];
       };
     };
+
+    services = {
+      mpris-proxy.enable = true;
+      playerctld.enable = true;
+    };
+
     manual.html.enable = true;
   };
 }

users/phundrak/packages.nix

@@ -13,7 +13,7 @@ in {
     default = pkgs.emacs;
   };
   config.home.packages = with pkgs; let
-    scripts = import ../scripts/scripts.nix {
+    scripts = import ../scripts {
       inherit pkgs;
       config.emacsPkg = cfg.emacsPackage;
     };
@@ -46,7 +46,6 @@ in {
       plex-media-player
       spicetify-cli
       spotify
-      spotify-tray
 
       # Social
       vesktop # Discord alternative that works well with wayland