diff --git a/flake.lock b/flake.lock index 2c51d073249b25838cc12d7d22fb7ce8b43a6bda..6f0b0c1207ee63b90048debfd3fe72682aec5209 100644 --- a/flake.lock +++ b/flake.lock @@ -203,11 +203,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -220,6 +220,24 @@ "inputs": { "systems": "systems_5" }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { + "inputs": { + "systems": "systems_6" + }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -234,9 +252,9 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_6": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1705309234, @@ -429,6 +447,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1708161998, "narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=", @@ -444,7 +478,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1717696253, "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=", @@ -509,6 +543,7 @@ "nixpkgs": "nixpkgs_2", "nvf": "nvf", "rust-overlay": "rust-overlay", + "vicinae": "vicinae", "zen-browser": "zen-browser", "zig": "zig", "zls": "zls" @@ -708,6 +743,40 @@ "type": "github" } }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "vicinae": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1761759538, + "narHash": "sha256-HUN2lrtbOX1MMCVzl3yBsMDyyoXqvQS7QFs9gJWUyaw=", + "owner": "vicinaehq", + "repo": "vicinae", + "rev": "278206de88db4d336b2759582b842453bf4b3f2d", + "type": "github" + }, + "original": { + "owner": "vicinaehq", + "repo": "vicinae", + "type": "github" + } + }, "zen-browser": { "inputs": { "nixpkgs": [ @@ -731,8 +800,8 @@ "zig": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_3" + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1760747435, @@ -751,7 +820,7 @@ "zig-overlay": { "inputs": { "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "nixpkgs": [ "zls", "nixpkgs" @@ -773,10 +842,10 @@ }, "zls": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "gitignore": "gitignore_2", "langref": "langref", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "zig-overlay": "zig-overlay" }, "locked": { diff --git a/flake.nix b/flake.nix index 0d0144ab2ff35d0cb23500583c081d5ac9b5e065..43587f441ffffc7d3db2f4fb72f91955104b0b87 100644 --- a/flake.nix +++ b/flake.nix @@ -24,6 +24,8 @@ moonlight.url = "github:moonlight-mod/moonlight"; # Add `/develop` to the flake URL to use nightly. moonlight.inputs.nixpkgs.follows = "nixpkgs"; + vicinae.url = "github:vicinaehq/vicinae"; + zen-browser = { url = "github:youwen5/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/lib/mkSystem.nix b/lib/mkSystem.nix index 9e3a13c459d7382e0c7d888d249f7ccb23a00fff..e8f6a0ce18544893f6ecffe87e6e86b065885c44 100644 --- a/lib/mkSystem.nix +++ b/lib/mkSystem.nix @@ -76,6 +76,7 @@ let ) inputs.nvf.homeManagerModules.default inputs.android-nixpkgs.hmModule + inputs.vicinae.homeManagerModules.default ]; in systemFunc { diff --git a/modules/shared/nix.nix b/modules/shared/nix.nix index 7997bf0f9cf8b0613f98f2a09d69e8929a9fe821..d07ba84632ced91604678563ceaaa68c313fdc20 100644 --- a/modules/shared/nix.nix +++ b/modules/shared/nix.nix @@ -28,11 +28,15 @@ "https://nix-community.cachix.org" # For haskell "https://cache.iog.io" + #vicinae + "https://vicinae.cachix.org" ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" # For haskell "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" + #vicinae + "vicinae.cachix.org-1:1kDrfienkGHPYbkpNj1mWTr7Fm1+zcenzgTizIcI3oc=" ]; }; gc = { diff --git a/users/natalie/home/default.nix b/users/natalie/home/default.nix index 1a3bf2f38624b363453063a9e2681e1e6bbfa469..6a15901141e20096e6bf7e28deb7302f8b67db82 100644 --- a/users/natalie/home/default.nix +++ b/users/natalie/home/default.nix @@ -3,5 +3,6 @@ imports = [ ./tmux.nix ./hyprland + ./vicinae.nix ]; } diff --git a/users/natalie/home/hyprland/binds.nix b/users/natalie/home/hyprland/binds.nix index edac51ecfc9fda34b1fa911b91ccc507959080ab..4c30cd70b41e1c56fe6c83944caf49f85e6e60f9 100644 --- a/users/natalie/home/hyprland/binds.nix +++ b/users/natalie/home/hyprland/binds.nix @@ -18,6 +18,7 @@ "$mainMod, V, togglefloating," "$mainMod, R, exec, $menu " "$mainMod, J, togglesplit " + "$mainMod, Space, exec, vicinae vicinae://toggle" # "ALT, Return, exec, [float; size 1111 700] ghostty" # "$mainMod SHIFT, Return, exec, [fullscreen] ghostty" # "$mainMod, B, exec, [workspace 1 silent] zen-beta" @@ -25,7 +26,6 @@ # "$mainMod, F, fullscreen, 0" # "$mainMod SHIFT, F, fullscreen, 1" # "$mainMod, Space, exec, toggle-float" - # "$mainMod, D, exec, vicinae vicinae://toggle" # "$mainMod SHIFT, D, exec, webcord --enable-features=UseOzonePlatform --ozone-platform=wayland" # "$mainMod SHIFT, S, exec, hyprctl dispatch exec '[workspace 5 silent] SoundWireServer'" # "$mainMod, Escape, exec, swaylock" diff --git a/users/natalie/home/hyprland/exec-once.nix b/users/natalie/home/hyprland/exec-once.nix index c88d3810e7986256a04dbaff84fc4b2a5a4eb38a..e856db13f4c15671e247034901c91fac60ffa6a1 100644 --- a/users/natalie/home/hyprland/exec-once.nix +++ b/users/natalie/home/hyprland/exec-once.nix @@ -7,14 +7,13 @@ "hyprlock" - # "nm-applet &" - # "poweralertd &" - # "wl-clip-persist --clipboard both &" - # "wl-paste --watch cliphist store &" - # "waybar &" - # "swaync &" - # "vicinae server &" - # "udiskie --automount --notify --smart-tray &" + "nm-applet &" + "wl-clip-persist --clipboard both &" + "wl-paste --watch cliphist store &" + "waybar &" + "swaync &" + "vicinae server &" + "udiskie --automount --notify --smart-tray &" # "hyprctl setcursor Bibata-Modern-Ice 24 &" # "init-wallpaper &" # diff --git a/users/natalie/home/hyprland/windowrules.nix b/users/natalie/home/hyprland/windowrules.nix index 22328145104b35b901688c0ef7483b3f0324b7c5..e4d0cc88f5857cb7f72017a82433b098967ff079 100644 --- a/users/natalie/home/hyprland/windowrules.nix +++ b/users/natalie/home/hyprland/windowrules.nix @@ -75,9 +75,11 @@ # https://wiki.hypr.land/Configuring/Window-Rules/#layer-rules layerrule = [ - "dimaround, vicinae" - "dimaround, rofi" - "dimaround, swaync-control-center" + "blur, vicinae" + "ignorealpha 0, vicinae" + "noanim, vicinae" + # "dimaround, rofi" + # "dimaround, swaync-control-center" ]; # https://wiki.hypr.land/Configuring/Workspace-Rules/ diff --git a/users/natalie/home/vicinae.nix b/users/natalie/home/vicinae.nix new file mode 100644 index 0000000000000000000000000000000000000000..9e2068a3bb2852a77cc5c92b80e55c2f8e8b560e --- /dev/null +++ b/users/natalie/home/vicinae.nix @@ -0,0 +1,20 @@ +{ pkgs, ... }: +{ + services.vicinae = { + enable = true; + autoStart = false; + settings = { + faviconService = "twenty"; # twenty | google | none + font.size = 11; + popToRootOnClose = false; + rootSearch.searchFiles = true; + theme.name = "catpuccin-mocha"; + window = { + csd = true; + opacity = 0.95; + rounding = 10; + }; + + }; + }; +}