From 4a4e9cc30fbc5fda066b7a4bc40d37cb89418268 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 17 Feb 2025 14:15:43 +0100 Subject: [PATCH 01/15] talos: home: setup swaybg --- hosts/talos/home.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/talos/home.nix b/hosts/talos/home.nix index 1d8c207..0cfe1a7 100644 --- a/hosts/talos/home.nix +++ b/hosts/talos/home.nix @@ -33,6 +33,7 @@ in { chromium # some websites only work there :( nwg-displays shikane # output autoconfig + swaybg zotero ; @@ -101,6 +102,7 @@ in { startup = [ {command = "shikane";} {command = "waybar";} + {command = "swaybg --image ~/.wallpaper --mode fill"; always = true; } {command = "swayidle -w idlehint 1 before-sleep \"${lock}\"";} ]; }; From 76b89f8ea8d76eb721a317c0b7dbbf0cbd89bad6 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 17 Feb 2025 14:15:53 +0100 Subject: [PATCH 02/15] talos: home: handle lid switch in sway --- hosts/talos/home.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hosts/talos/home.nix b/hosts/talos/home.nix index 0cfe1a7..d593838 100644 --- a/hosts/talos/home.nix +++ b/hosts/talos/home.nix @@ -106,6 +106,11 @@ in { {command = "swayidle -w idlehint 1 before-sleep \"${lock}\"";} ]; }; + + extraConfig = '' + bindswitch --reload --locked lid:off output eDP-1 enable; + bindswitch --reload --locked lid:on output eDP-1 disable; + ''; }; programs = { fuzzel.enable = true; From e18ca72c20b63b5a07ab36d8726042c68ab692f5 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 17 Feb 2025 14:16:43 +0100 Subject: [PATCH 03/15] talos: home: provide shortcut to reload displays --- hosts/talos/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/talos/home.nix b/hosts/talos/home.nix index d593838..5892dfd 100644 --- a/hosts/talos/home.nix +++ b/hosts/talos/home.nix @@ -76,6 +76,7 @@ in { bars = []; keybindings = mkOptionDefault { + "Mod4+Shift+a" = "exec shikanectl reload"; "Mod4+Shift+e" = ''mode "${logoutMode}"''; "Mod4+i" = "exec emacsclient --create-frame"; "Mod4+Control+l" = "exec ${lock}"; From 0057dcb19f12ade0d896c0af6f5ceadd5cde5af4 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 17 Feb 2025 15:00:09 +0100 Subject: [PATCH 04/15] talos: home: swaylock works better --- hosts/talos/home.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/talos/home.nix b/hosts/talos/home.nix index 5892dfd..8fa7e7c 100644 --- a/hosts/talos/home.nix +++ b/hosts/talos/home.nix @@ -45,7 +45,7 @@ in { wayland.windowManager.sway = let logoutMode = "[L]ogout, [S]uspend, [P]oweroff, [R]eboot"; - lock = "hyprlock --immediate"; + lock = "swaylock --daemonize --image ~/.wallpaper --scaling fill"; in { enable = true; swaynag.enable = true; @@ -115,7 +115,7 @@ in { }; programs = { fuzzel.enable = true; - hyprlock.enable = true; + swaylock.enable = true; waybar = { enable = true; }; From fa0e0fe86b253611b0bac3b33ccef921dd4a1e40 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 17 Feb 2025 15:00:22 +0100 Subject: [PATCH 05/15] talos: home: bring back suspend shortcut --- hosts/talos/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/talos/home.nix b/hosts/talos/home.nix index 8fa7e7c..8440bc9 100644 --- a/hosts/talos/home.nix +++ b/hosts/talos/home.nix @@ -90,7 +90,7 @@ in { modes = mkOptionDefault { "${logoutMode}" = { "l" = "exec --no-startup-id swaymsg exit, mode default"; - #"s" = "exec --no-startup-id betterlockscreen --suspend, mode default"; + "s" = "exec --no-startup-id systemctl suspend, mode default"; "p" = "exec --no-startup-id systemctl poweroff, mode default"; "r" = "exec --no-startup-id systemctl reboot, mode default"; "Escape" = "mode default"; From 659aed60d79fd4721568f7430699bdad8df725c4 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 17 Feb 2025 14:15:43 +0100 Subject: [PATCH 06/15] talos: home: setup swaybg --- hosts/talos/home.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hosts/talos/home.nix b/hosts/talos/home.nix index 1d8c207..148c46e 100644 --- a/hosts/talos/home.nix +++ b/hosts/talos/home.nix @@ -33,6 +33,7 @@ in { chromium # some websites only work there :( nwg-displays shikane # output autoconfig + swaybg zotero ; @@ -101,6 +102,10 @@ in { startup = [ {command = "shikane";} {command = "waybar";} + { + command = "swaybg --image ~/.wallpaper --mode fill"; + always = true; + } {command = "swayidle -w idlehint 1 before-sleep \"${lock}\"";} ]; }; From a812afaf4adb6d9088e19b15d38bb6c468118bf4 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 17 Feb 2025 14:15:53 +0100 Subject: [PATCH 07/15] talos: home: handle lid switch in sway --- hosts/talos/home.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hosts/talos/home.nix b/hosts/talos/home.nix index 148c46e..af80bbc 100644 --- a/hosts/talos/home.nix +++ b/hosts/talos/home.nix @@ -109,6 +109,11 @@ in { {command = "swayidle -w idlehint 1 before-sleep \"${lock}\"";} ]; }; + + extraConfig = '' + bindswitch --reload --locked lid:off output eDP-1 enable; + bindswitch --reload --locked lid:on output eDP-1 disable; + ''; }; programs = { fuzzel.enable = true; From 6c04235b488e68bd69ef6acbc9b57f6dcc482ea4 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 17 Feb 2025 14:16:43 +0100 Subject: [PATCH 08/15] talos: home: provide shortcut to reload displays --- hosts/talos/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/talos/home.nix b/hosts/talos/home.nix index af80bbc..8ea4938 100644 --- a/hosts/talos/home.nix +++ b/hosts/talos/home.nix @@ -76,6 +76,7 @@ in { bars = []; keybindings = mkOptionDefault { + "Mod4+Shift+a" = "exec shikanectl reload"; "Mod4+Shift+e" = ''mode "${logoutMode}"''; "Mod4+i" = "exec emacsclient --create-frame"; "Mod4+Control+l" = "exec ${lock}"; From a22e79693def0741635cdf36732ccfe84cd5eb5e Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 17 Feb 2025 15:00:09 +0100 Subject: [PATCH 09/15] talos: home: swaylock works better --- hosts/talos/home.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/talos/home.nix b/hosts/talos/home.nix index 8ea4938..32c1509 100644 --- a/hosts/talos/home.nix +++ b/hosts/talos/home.nix @@ -45,7 +45,7 @@ in { wayland.windowManager.sway = let logoutMode = "[L]ogout, [S]uspend, [P]oweroff, [R]eboot"; - lock = "hyprlock --immediate"; + lock = "swaylock --daemonize --image ~/.wallpaper --scaling fill"; in { enable = true; swaynag.enable = true; @@ -118,7 +118,7 @@ in { }; programs = { fuzzel.enable = true; - hyprlock.enable = true; + swaylock.enable = true; waybar = { enable = true; }; From 62558b3dc08c5bc490f90a754546403a448619f9 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 17 Feb 2025 15:00:22 +0100 Subject: [PATCH 10/15] talos: home: bring back suspend shortcut --- hosts/talos/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/talos/home.nix b/hosts/talos/home.nix index 32c1509..39aeb5b 100644 --- a/hosts/talos/home.nix +++ b/hosts/talos/home.nix @@ -90,7 +90,7 @@ in { modes = mkOptionDefault { "${logoutMode}" = { "l" = "exec --no-startup-id swaymsg exit, mode default"; - #"s" = "exec --no-startup-id betterlockscreen --suspend, mode default"; + "s" = "exec --no-startup-id systemctl suspend, mode default"; "p" = "exec --no-startup-id systemctl poweroff, mode default"; "r" = "exec --no-startup-id systemctl reboot, mode default"; "Escape" = "mode default"; From 61b72a89e773c77cdf30542fc1ec7dac581812a1 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 17 Feb 2025 21:21:07 +0100 Subject: [PATCH 11/15] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs-unstable-small': 'github:NixOS/nixpkgs/970c26517231e07b71f3eaaa9aa2ebe539c354d3' (2025-01-27) → 'github:NixOS/nixpkgs/1ead14e49dfa47e91e68df64ef3dbf036809c742' (2025-02-17) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index f288495..f567b65 100644 --- a/flake.lock +++ b/flake.lock @@ -264,11 +264,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1737959576, - "narHash": "sha256-eEOiMxfxYSLa/8jcDZEK46TjqLO+8cJ5C9ufHXz1oIw=", + "lastModified": 1739776882, + "narHash": "sha256-PAiogZP1rLOwSkoL8eNgnbcobe5AqIq+Zc8A9NNFv+A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "970c26517231e07b71f3eaaa9aa2ebe539c354d3", + "rev": "1ead14e49dfa47e91e68df64ef3dbf036809c742", "type": "github" }, "original": { From 3e01412e7fbb925919aef82c03a5bee8433552b1 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 17 Feb 2025 22:59:22 +0100 Subject: [PATCH 12/15] talos: home: unblur electron apps This is an obscure NixOS environment variable only mentioned in a changelog, but it does the right thing --- hosts/talos/home.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hosts/talos/home.nix b/hosts/talos/home.nix index 39aeb5b..2be85f8 100644 --- a/hosts/talos/home.nix +++ b/hosts/talos/home.nix @@ -116,6 +116,7 @@ in { bindswitch --reload --locked lid:on output eDP-1 disable; ''; }; + programs = { fuzzel.enable = true; swaylock.enable = true; @@ -123,6 +124,10 @@ in { enable = true; }; }; + + home.sessionVariables = { + NIXOS_OZONE_WL = "1"; + }; }; # FIXME: belongs elsewhere From c8648b18b4a6b82aaad5df23628d519bacd38ffe Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 17 Feb 2025 23:00:11 +0100 Subject: [PATCH 13/15] talos: home: use catppuccin theme for sway --- hosts/talos/home.nix | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/hosts/talos/home.nix b/hosts/talos/home.nix index 2be85f8..68a8336 100644 --- a/hosts/talos/home.nix +++ b/hosts/talos/home.nix @@ -114,6 +114,41 @@ in { extraConfig = '' bindswitch --reload --locked lid:off output eDP-1 enable; bindswitch --reload --locked lid:on output eDP-1 disable; + + set $rosewater #dc8a78 + set $flamingo #dd7878 + set $pink #ea76cb + set $mauve #8839ef + set $red #d20f39 + set $maroon #e64553 + set $peach #fe640b + set $yellow #df8e1d + set $green #40a02b + set $teal #179299 + set $sky #04a5e5 + set $sapphire #209fb5 + set $blue #1e66f5 + set $lavender #7287fd + set $text #4c4f69 + set $subtext1 #5c5f77 + set $subtext0 #6c6f85 + set $overlay2 #7c7f93 + set $overlay1 #8c8fa1 + set $overlay0 #9ca0b0 + set $surface2 #acb0be + set $surface1 #bcc0cc + set $surface0 #ccd0da + set $base #eff1f5 + set $mantle #e6e9ef + set $crust #dce0e8 + + # target title bg text indicator border + client.focused $lavender $base $text $rosewater $lavender + client.focused_inactive $overlay0 $base $text $rosewater $overlay0 + client.unfocused $overlay0 $base $text $rosewater $overlay0 + client.urgent $peach $base $peach $overlay0 $peach + client.placeholder $overlay0 $base $text $overlay0 $overlay0 + client.background $base ''; }; From 2c710520304b395070ea6e1a248550b126f16431 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 18 Feb 2025 22:33:46 +0100 Subject: [PATCH 14/15] home: x: cursors: switch to bibata Let's try some changes --- home/x/cursor.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/home/x/cursor.nix b/home/x/cursor.nix index 04378b0..aa3ebbb 100644 --- a/home/x/cursor.nix +++ b/home/x/cursor.nix @@ -16,12 +16,16 @@ in { config = mkIf cfg.enable { home.pointerCursor = { - package = pkgs.capitaine-cursors; - name = "capitaine-cursors"; - # available sizes for capitaine-cursors are: - # 24, 30, 36, 48, 60, 72 - size = 30; + #package = pkgs.capitaine-cursors; + #name = "capitaine-cursors"; + #package = pkgs.catppuccin-cursors.frappeDark; + #name = "catppuccin-frappe-dark-cursors"; + package = pkgs.bibata-cursors; + name = "Bibata-Modern-Classic"; + # https://unix.stackexchange.com/a/743543 + size = 24; x11.enable = true; + gtk.enable = true; }; }; } From 2e53d24159a968e576813512c83b1e13fba3ae65 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 18 Feb 2025 22:34:13 +0100 Subject: [PATCH 15/15] home: emacs: switch to nerdfont patched font --- home/emacs.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/home/emacs.nix b/home/emacs.nix index 5935972..8139f5e 100644 --- a/home/emacs.nix +++ b/home/emacs.nix @@ -27,7 +27,11 @@ in { # fonts used by my config emacs-all-the-icons-fonts - iosevka-bin + ; + + inherit + (pkgs.unstable.nerd-fonts) + iosevka ; }; # make sure above fonts are discoverable