diff --git a/computers/python/configs/alacritty/alacritty.toml b/computers/python/configs/alacritty/alacritty.toml index f38ed3a..61c2f3d 100644 --- a/computers/python/configs/alacritty/alacritty.toml +++ b/computers/python/configs/alacritty/alacritty.toml @@ -2,8 +2,8 @@ decorations = "None" [window.padding] -x = 8 -y = 8 +x = 16 +y = 16 [font] size = 14 diff --git a/computers/python/configs/river/init b/computers/python/configs/river/init index 58dbfeb..ae3bf4d 100755 --- a/computers/python/configs/river/init +++ b/computers/python/configs/river/init @@ -1,7 +1,7 @@ #!/bin/sh riverctl spawn kanshi -riverctl spawn "swaybg -i ~/.local/share/wallpapers/01.png -m fill" +riverctl spawn "wbg ~/.local/share/wallpapers/04.png" riverctl spawn "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" riverctl spawn "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=river" @@ -80,8 +80,8 @@ done riverctl rule-add ssd riverctl background-color 0x00000000 -riverctl border-color-focused 0x9ccfd8ff -riverctl border-color-unfocused 0x524f67ff +riverctl border-color-focused 0x27a1b9ff +riverctl border-color-unfocused 0x15161eff riverctl keyboard-layout "us" riverctl set-repeat 50 300 @@ -89,4 +89,4 @@ riverctl set-repeat 50 300 riverctl xcursor-theme "BreezeX-RosePine-Linux" riverctl default-layout rivertile -rivertile -view-padding 6 -outer-padding 6 & +rivertile -view-padding 10 -outer-padding 10 & diff --git a/computers/python/users.nix b/computers/python/users.nix index 67ea290..7ef1c2c 100644 --- a/computers/python/users.nix +++ b/computers/python/users.nix @@ -24,6 +24,7 @@ fractal nicotine-plus nautilus + librewolf ; }; groups = [ diff --git a/computers/shared/river.nix b/computers/shared/river.nix index 1ed2ed4..b7a9347 100644 --- a/computers/shared/river.nix +++ b/computers/shared/river.nix @@ -1,4 +1,9 @@ -{config, lib, pkgs, ...}: let +{ + config, + lib, + pkgs, + ... +}: let cfg = config.alqueva.river; in { options.alqueva.river = { @@ -12,7 +17,7 @@ in { enable = true; xwayland.enable = false; extraPackages = [ - pkgs.swaybg + pkgs.wbg pkgs.kanshi ]; }; diff --git a/computers/shared/support.nix b/computers/shared/support.nix index 35ca24e..2cf0455 100644 --- a/computers/shared/support.nix +++ b/computers/shared/support.nix @@ -1,4 +1,9 @@ -{config, lib, pkgs, ...}: let +{ + config, + lib, + pkgs, + ... +}: let cfg = config.alqueva.support; inherit (lib) mkEnableOption; in { @@ -22,12 +27,13 @@ in { environment = { systemPackages = builtins.attrValues { - inherit (pkgs) + inherit + (pkgs) slurp grim wf-recorder fuzzel - alacritty + wezterm wl-clipboard ; }; diff --git a/flake.lock b/flake.lock index 1eb0ac6..717eb64 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1732742778, - "narHash": "sha256-i+Uw8VOHzQe9YdNwKRbzvaPWLE07tYVqUDzSFTXhRgk=", + "lastModified": 1732894783, + "narHash": "sha256-7hBU7L07hYPNjamlm/v5scUUwsHQJvyb1a4flozHNt0=", "owner": "nix-community", "repo": "disko", - "rev": "341482e2f4d888e3f60cae1c12c3df896e7230d8", + "rev": "a75ba3b87b7ff230ca8b3a1fbfd4ad907a1a5fa2", "type": "github" }, "original": { @@ -24,11 +24,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1732759838, - "narHash": "sha256-bBghlNpHztnrUb1o7BAinp+rrWZMpaVNPrxnefhk1LY=", + "lastModified": 1732845489, + "narHash": "sha256-7DKGn0D915PZUr/NklO41WsITUfLr+RM/RJqQezKjUI=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f704f6f113bef121c7e38f807e3397f7dbe1aee0", + "rev": "6b78552e35d0a1b050091401ee9959070383ac36", "type": "github" }, "original": { @@ -301,11 +301,11 @@ "parts": "parts" }, "locked": { - "lastModified": 1732762929, - "narHash": "sha256-yBDsONLtGIgZBHR0wz/oIcw8J+6gHFwJ8dN892UU3ks=", + "lastModified": 1732849319, + "narHash": "sha256-GzPk7gDQyX6irVp5ZzEoj8zcpavZrjD+0QAyrdhPkK0=", "owner": "moni-dz", "repo": "nixpkgs-f2k", - "rev": "3bafc3c1780940112b56c5f1cbeaa7f6c2f08c44", + "rev": "abb5ffb1f9e711c6989a7625175683290e249ca4", "type": "github" }, "original": { @@ -379,11 +379,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1732632634, - "narHash": "sha256-+G7n/ZD635aN0sEXQLynU7pWMd3PKDM7yBIXvYmjABQ=", + "lastModified": 1732749044, + "narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6f6076c37180ea3a916f84928cf3a714c5207a30", + "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685", "type": "github" }, "original": { @@ -475,11 +475,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1732760247, - "narHash": "sha256-jK0m/p3Xrl2byR0+Wlj/q0H3+9yojSfX0syeqkzXNBI=", + "lastModified": 1732848913, + "narHash": "sha256-lut6G8zGfDvQ24iUq2BvHr7OUE9pNuEEnYgM0OcPytc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d9cb77fbc1914a895740a266c3f12fc41de0314", + "rev": "fec9222abfd8e466d8e4be306f79605e0a31d595", "type": "github" }, "original": { @@ -491,11 +491,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "github" }, "original": { @@ -507,11 +507,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1730958623, - "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=", + "lastModified": 1732617236, + "narHash": "sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS+s3NVclJw7YC43w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "85f7e662eda4fa3a995556527c87b2524b691933", + "rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e", "type": "github" }, "original": { @@ -696,11 +696,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1732389691, - "narHash": "sha256-s9BgpJK+9DzmrTCcfnLX6xzXIHleSmJTITQ+Kw+xTjQ=", + "lastModified": 1732835777, + "narHash": "sha256-srgGCL+4ZwY5Zf7jOIhSC/6S9kf32/Vu9EWMwX818io=", "owner": "NotAShelf", "repo": "nvf", - "rev": "8c95b996c7828b0c3c1acea2b01486505fba68bb", + "rev": "fee1b46924d34a5ba569f37dfd92a761ea373cf2", "type": "github" }, "original": { @@ -716,11 +716,11 @@ "nvf": "nvf" }, "locked": { - "lastModified": 1732810796, - "narHash": "sha256-LUmD3MgZojFmWbZzr2V+enuVmsBdZ7yyEyynvq/snNY=", + "lastModified": 1732902058, + "narHash": "sha256-bAu/SqbzRVxOpeKbdI5Bp6GIdaVh72sc9jCdBlA4O0M=", "ref": "master", - "rev": "a8e8db709bf2f6189b573bc3966ca0c3322483c6", - "revCount": 5, + "rev": "761f993054a81bf119b3e5e878ace6eaf7ad72e1", + "revCount": 6, "type": "git", "url": "https://codeberg.org/amadaluzia/painless-neovim.git" }, @@ -2347,11 +2347,11 @@ "plugin-rustaceanvim": { "flake": false, "locked": { - "lastModified": 1731172933, - "narHash": "sha256-B2AdSgGPANCBbVN+Sd7gvJ16ODZZwv4WSOxnRs3SWnk=", + "lastModified": 1732565373, + "narHash": "sha256-WRaNW0trZYEUKd05Uc+5nP+G81HI14d6lM7/WWz61E0=", "owner": "mrcjkb", "repo": "rustaceanvim", - "rev": "244443311f1c4e34ec1ea7f219a4b682b6ec066e", + "rev": "fee0aa094b0c9f93fffe5a385b3d5d2386c2b072", "type": "github" }, "original": { @@ -2787,11 +2787,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1730262671, - "narHash": "sha256-UkB5NVODOqZA1yXmyhE+bXv+qqQ8xr5LIDCXVGomwlo=", + "lastModified": 1732891015, + "narHash": "sha256-LHa140YaLwy+aTcQMxmYwLlf7F9VlCV/Lu8QPrzDbDk=", "owner": "notashelf", "repo": "wallpkgs", - "rev": "d1d49188ab88db39c94c45b949eaa29a9dade108", + "rev": "5229eb2e8c3636590a74764f9edc1ea01cc01ae7", "type": "github" }, "original": {