diff --git a/flake.lock b/flake.lock index b4f908f..2eb1308 100644 --- a/flake.lock +++ b/flake.lock @@ -240,11 +240,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1691582550, - "narHash": "sha256-h8eWTciQiAoJecxaXC79YqOq0mlp1nrFEX7+qbpgJuU=", + "lastModified": 1692203287, + "narHash": "sha256-qJdU6fyR7bYFesnxqaNCKVLviWUJgI9OcRx2i9L79gw=", "owner": "helix-editor", "repo": "helix", - "rev": "cb9b08d6507d37fd1b11ab5b40a2f17e21846210", + "rev": "56ccaedffbb8011e36012278e2a4861a8d435a60", "type": "github" }, "original": { @@ -260,11 +260,11 @@ ] }, "locked": { - "lastModified": 1691506824, - "narHash": "sha256-Z2Ms7036CCEAfCmDBDy+sFauO6/7fx2UN3aoPCpp4tA=", + "lastModified": 1692260837, + "narHash": "sha256-2FpkX1zl+7ni7djK7NeE1ZGupRUwZgjW+RPCSBgDf4k=", "owner": "nix-community", "repo": "home-manager", - "rev": "7b8d43fbaf8450c30caaed5eab876897d0af891b", + "rev": "6a94c1a59737783c282c4031555a289c28b961e4", "type": "github" }, "original": { @@ -281,11 +281,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1691611150, - "narHash": "sha256-0Jx7RQ236n6O9NIx8iUvGFVo3JRuiypWU5JIUh9Mj/M=", + "lastModified": 1692214333, + "narHash": "sha256-L2CAAvr/HYE5P/XaNad1laQQlXXOOv4BeS7Nk6uc574=", "owner": "JakeStanger", "repo": "ironbar", - "rev": "b649525a2cb43fdd673f04e0dee879d22925a821", + "rev": "e5281e96193a2f42d52a0eb736473cdb378dd243", "type": "github" }, "original": { @@ -335,11 +335,11 @@ ] }, "locked": { - "lastModified": 1691292840, - "narHash": "sha256-NA+o/NoOOQhzAQwB2JpeKoG+iYQ6yn/XXVxaGd5HSQI=", + "lastModified": 1691897365, + "narHash": "sha256-jvWIU4ht3YAmF8TDVM2Ps2+Gf4MtNGLL1zEWQZdTrzU=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "6c626d54d0414d34c771c0f6f9d771bc8aaaa3c4", + "rev": "f4d70d098f066a30c7087144063dca179495f7d6", "type": "github" }, "original": { @@ -432,11 +432,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1691421349, - "narHash": "sha256-RRJyX0CUrs4uW4gMhd/X4rcDG8PTgaaCQM5rXEJOx6g=", + "lastModified": 1692207601, + "narHash": "sha256-tfPGNKQcJT1cvT6ufqO/7ydYNL6mcJClvzbrzhKjB80=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "011567f35433879aae5024fc6ec53f2a0568a6c4", + "rev": "b30c68669df77d981ce4aefd6b9d378563f6fc4e", "type": "github" }, "original": { @@ -480,11 +480,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1691472822, - "narHash": "sha256-XVfYZ2oB3lNPVq6sHCY9WkdQ8lHoIDzzbpg8bB6oBxA=", + "lastModified": 1692174805, + "narHash": "sha256-xmNPFDi/AUMIxwgOH/IVom55Dks34u1g7sFKKebxUm0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "41c7605718399dcfa53dd7083793b6ae3bc969ff", + "rev": "caac0eb6bdcad0b32cb2522e03e4002c8975c62e", "type": "github" }, "original": { @@ -496,11 +496,11 @@ }, "nur": { "locked": { - "lastModified": 1691573523, - "narHash": "sha256-kKWUdrOaPeRhxs7HKcSUOMlod8p04gUEPDxpJFo4AD8=", + "lastModified": 1692275917, + "narHash": "sha256-PcUYd0Si3tFsxnT57IfiLy/s5VCPXuUoFK+SvQ7kexI=", "owner": "nix-community", "repo": "NUR", - "rev": "e6dbae536ff9479c7277965043763df455124fa7", + "rev": "b7fcbcbbdbf2bbbda6965cbcc8f85542c314167c", "type": "github" }, "original": { @@ -633,11 +633,11 @@ ] }, "locked": { - "lastModified": 1691547503, - "narHash": "sha256-l0AIKJucygbDFc2vuAkxmFMjNNJImDd7jYahA88/E+o=", + "lastModified": 1692238117, + "narHash": "sha256-gOoxig/GBuGOYWqE3+7OMrgPVduxjjsbo4qikRb1h3s=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3380f16b39457b49c8186d5e20e7a68ccf4fc96e", + "rev": "3e0e4ec062706ebba759795ad18ad72ad69d41f3", "type": "github" }, "original": { diff --git a/home/dots/swaync/config.json b/home/dots/swaync/config.json index 9d51c9c..5ce7f30 100644 --- a/home/dots/swaync/config.json +++ b/home/dots/swaync/config.json @@ -9,8 +9,8 @@ "control-center-margin-bottom": 8, "control-center-margin-right": 8, "control-center-margin-left": 8, - "control-center-width": 500, - "control-center-height": 600, + "control-center-width": 600, + "control-center-height": 400, "fit-to-screen": false, "layer": "overlay", @@ -21,7 +21,7 @@ "timeout": 6, "timeout-low": 6, "timeout-critical": 0, - "notification-window-width": 600, + "notification-window-width": 400, "keyboard-shortcuts": true, "image-visibility": "when-available", "transition-time": 200, @@ -56,7 +56,7 @@ }, "mpris": { "image-size": 96, - "image-radius": 12 + "image-radius": 0 } } } diff --git a/home/dots/swaync/style.css b/home/dots/swaync/style.css index 9f68917..53761e2 100644 --- a/home/dots/swaync/style.css +++ b/home/dots/swaync/style.css @@ -127,19 +127,19 @@ } .notification-action { - border-radius: 0px; + border-radius: #ROUNDINGpx; border-top: none; border-right: none; } /* add bottom border radius to eliminate clipping */ .notification-action:first-child { - border-bottom-left-radius: 10px; + border-bottom-left-radius: #ROUNDINGpx; } .notification-action:last-child { - border-bottom-right-radius: 10px; - border-right: 1px solid @noti-border-color; + border-bottom-right-radius: #ROUNDINGpx; + border-right: #BORDERpx solid @noti-border-color; } .image { @@ -148,7 +148,7 @@ .body-image { margin-top: 6px; background-color: white; - border-radius: 24px; + border-radius: #ROUNDINGpx; } .summary { @@ -216,7 +216,7 @@ background: @noti-bg; border: #BORDERpx solid @noti-border-color; box-shadow: none; - border-radius: 24px; + border-radius: #ROUNDINGpx; } .widget-title > button:hover { background: @noti-bg-hover; diff --git a/home/home.nix b/home/home.nix index 2e4e4f4..ba57280 100644 --- a/home/home.nix +++ b/home/home.nix @@ -143,9 +143,12 @@ in { wayland.windowManager.sway = { enable = true; - package = pkgs.sway; - extraConfig = '' + # package = pkgs.sway; + package = pkgs.swayfx; + extraConfig = with pkgs.rice; '' default_orientation vertical + corner_radius ${builtins.toString borders.rounding} + default_dim_inactive 0.15 ''; config = with pkgs.rice; { bars = []; @@ -177,7 +180,6 @@ in { { command = "split toggle"; criteria = { - class = ".*"; app_id = ".*"; }; } @@ -260,7 +262,7 @@ in { background = util.bg; border = bright.yellow; childBorder = bright.yellow; - indicator = normal.blue; + indicator = bright.yellow; text = util.fg; }; focusedInactive = { @@ -274,14 +276,14 @@ in { background = util.bg; border = bright.green; childBorder = bright.green; - indicator = normal.blue; + indicator = bright.green; text = util.fg; }; unfocused = { background = normal.black; border = util.bg; childBorder = util.bg; - indicator = normal.blue; + indicator = util.bg; text = normal.white; }; urgent = { @@ -301,90 +303,6 @@ in { xwayland = true; }; - # extraConfig = with pkgs.rice; (builtins.replaceStrings - # [ - # "#BGIMAGE" - # "#GTKTHEME" - # "#FONT" - # "#ICONTHEME" - # "#ACTIVEBORDER" - # "#BORDER" - # "#THICK" - # "#ROUND" - # "#GAPSIN" - # "#GAPSOUT" - # ] - # [ - # "${bg.image}" - # gtk-theme.name - # fonts.sans.name - # icons.name - # palette-shex.bright.yellow - # palette-shex.util.bg - # (builtins.toString borders.thickness) - # (builtins.toString borders.rounding) - # (builtins.toString borders.gaps_in) - # (builtins.toString borders.gaps_out) - # ] - # (builtins.readFile dots/hyprland/hyprland.conf)); - - programs.starship = { - enable = true; - settings = { - # format = "$directory$os$all"; - directory = { - truncate_to_repo = false; - }; - }; - }; - - - # programs.eww-custom = { - # enable = true; - # package = pkgs.eww-wayland; - # colors = with palette-hex; (builtins.replaceStrings - # [ - # "#BLACK" - # "#BLCKA" - # "#RED" - # "#RDA" - # "#GREEN" - # "#GRNA" - # "#YELLOW" - # "#YLWA" - # "#BLUE" - # "#BLUA" - # "#MAGENTA" - # "#MGNA" - # "#CYAN" - # "#CYNA" - # "#WHITE" - # "#WHTA" - # "#FG" - # "#BG" - # ] - # [ - # normal.black - # bright.black - # normal.red - # bright.red - # normal.green - # bright.green - # normal.yellow - # bright.yellow - # normal.blue - # bright.blue - # normal.magenta - # bright.magenta - # normal.cyan - # bright.cyan - # normal.white - # bright.white - # util.fg - # util.bg - # ] (builtins.readFile dots/eww/colors.scss)); - # }; - systemd.user.startServices = "sd-switch"; xdg.enable = true; diff --git a/overlay.nix b/overlay.nix index 85fb39c..d2843e2 100644 --- a/overlay.nix +++ b/overlay.nix @@ -19,4 +19,5 @@ }; sway-unwrapped = final: prev: {sway-unwrapped = final.unstable.sway-unwrapped.override {wlroots = final.wlroots;};}; sway = final: prev: {sway = final.unstable.sway.override {sway-unwrapped = final.sway-unwrapped;};}; + swayfx = final: prev: {swayfx = final.unstable.swayfx.override {sway-unwrapped = final.sway-unwrapped;};}; } diff --git a/rice.nix b/rice.nix index b033012..123a9e7 100644 --- a/rice.nix +++ b/rice.nix @@ -90,10 +90,10 @@ in rec { }; borders = { - thickness = 2; - rounding = 0; - gaps_in = 4; - gaps_out = 4; + thickness = 3; + rounding = 6; + gaps_in = 6; + gaps_out = 8; }; bg = { diff --git a/system/configuration.nix b/system/configuration.nix index f045b9a..62b4d35 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -30,6 +30,7 @@ nix = { registry = lib.mapAttrs (_: value: {flake = value;}) inputs; settings = { + trusted-users = [ "bolt" ]; experimental-features = "nix-command flakes"; }; };