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": { 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 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; }; }; } diff --git a/hosts/talos/home.nix b/hosts/talos/home.nix index 1d8c207..68a8336 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 ; @@ -44,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; @@ -75,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}"; @@ -88,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"; @@ -101,17 +103,66 @@ in { startup = [ {command = "shikane";} {command = "waybar";} + { + command = "swaybg --image ~/.wallpaper --mode fill"; + always = true; + } {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; + + 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 + ''; }; + programs = { fuzzel.enable = true; - hyprlock.enable = true; + swaylock.enable = true; waybar = { enable = true; }; }; + + home.sessionVariables = { + NIXOS_OZONE_WL = "1"; + }; }; # FIXME: belongs elsewhere