diff --git a/flake.lock b/flake.lock index b03b789..4de7c0d 100644 --- a/flake.lock +++ b/flake.lock @@ -147,6 +147,22 @@ "type": "github" } }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -751,7 +767,8 @@ "noctalia": "noctalia", "quickshell": "quickshell", "stylix": "stylix", - "vicinae": "vicinae" + "vicinae": "vicinae", + "vicinae-extensions": "vicinae-extensions" } }, "rust-overlay": { @@ -899,6 +916,21 @@ "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" + } + }, "tinted-kitty": { "flake": false, "locked": { @@ -1004,6 +1036,54 @@ "type": "github" } }, + "vicinae-extensions": { + "inputs": { + "flake-compat": "flake-compat_4", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_7", + "vicinae": "vicinae_2" + }, + "locked": { + "lastModified": 1777597325, + "narHash": "sha256-LfqeVlMwclHJKsJu5jJoztjlaCeIasQsiv3P9+eKDNw=", + "owner": "vicinaehq", + "repo": "extensions", + "rev": "89cc49471c3e7119bfd36d68998cefe534bddab8", + "type": "github" + }, + "original": { + "owner": "vicinaehq", + "repo": "extensions", + "type": "github" + } + }, + "vicinae_2": { + "inputs": { + "nixpkgs": [ + "vicinae-extensions", + "nixpkgs" + ], + "systems": [ + "vicinae-extensions", + "systems" + ] + }, + "locked": { + "lastModified": 1768856963, + "narHash": "sha256-u5bWDuwk6oieTnvm1YjNotcYK8iJSddH5+S68+X4TSc=", + "owner": "vicinaehq", + "repo": "vicinae", + "rev": "934bc0ad47be6dbd6498a0dac655c4613fd0ab27", + "type": "github" + }, + "original": { + "owner": "vicinaehq", + "repo": "vicinae", + "type": "github" + } + }, "xwayland-satellite-stable": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 6c9d398..93f778b 100644 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,11 @@ }; vicinae.url = "github:vicinaehq/vicinae"; + vicinae-extensions = { + url = "github:vicinaehq/extensions"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + ghostty.url = "github:ghostty-org/ghostty"; niri-flake.url = "github:sodiboo/niri-flake"; diff --git a/modules/core/cachix.nix b/modules/core/cachix.nix index a8c0b17..a117257 100644 --- a/modules/core/cachix.nix +++ b/modules/core/cachix.nix @@ -3,11 +3,13 @@ extra-substituters = [ "https://moons-dotfiles.cachix.org" "https://noctalia.cachix.org" + "https://vicinae.cachix.org" ]; extra-trusted-public-keys = [ "moons-dotfiles.cachix.org-1:WHoroKiNScG2/dpxHHL1I0qVmvuQhJbEAP+DS2j9Rr0=" "noctalia.cachix.org-1:pCOR47nnMEo5thcxNDtzWpOxNFQsBRglJzxWPp3dkU4=" + "vicinae.cachix.org-1:1kDrfienkGHPYbkpNj1mWTr7Fm1+zcenzgTizIcI3oc=" ]; }; } diff --git a/modules/core/system.nix b/modules/core/system.nix index 7bad109..bcb41e5 100644 --- a/modules/core/system.nix +++ b/modules/core/system.nix @@ -1,14 +1,10 @@ -{ ... }: -{ +{...}: { nix = { settings = { - experimental-features = [ "nix-command" "flakes" ]; - extra-substituters = [ "https://vicinae.cachix.org" ]; - extra-trusted-public-keys = [ "vicinae.cachix.org-1:1kDrfienkGHPYbkpNj1mWTr7Fm1+zcenzgTizIcI3oc=" ]; + experimental-features = ["nix-command" "flakes"]; }; }; - # Localization settings time.timeZone = "Asia/Tokyo"; i18n.defaultLocale = "ja_JP.UTF-8"; @@ -30,4 +26,5 @@ console.keyMap = "jp106"; system.stateVersion = "25.11"; -} \ No newline at end of file +} + diff --git a/modules/home/vicinae.nix b/modules/home/vicinae.nix index c0c47dc..0169104 100644 --- a/modules/home/vicinae.nix +++ b/modules/home/vicinae.nix @@ -1,23 +1,50 @@ -{ inputs, ... }: { + inputs, + pkgs, + ... +}: { imports = [ inputs.vicinae.homeManagerModules.default ]; services.vicinae = { enable = true; - # package = [ ]; + systemd = { + enable = true; + autoStart = true; + environment = { + USE_LAYER_SHELL = 1; + }; + }; + settings = { - faviconService = "twenty"; # twenty | google | none font.size = 11; - popToRootOnClose = false; - rootSearch.searchFiles = false; - theme.name = "dracula"; + close_on_focus_loss = true; + consider_preedit = true; + pop_to_root_on_close = true; + favicon_service = "twenty"; + search_files_in_root = true; + theme = { + light = { + name = "dracula"; + icon_theme = "default"; + }; + dark = { + name = "vicinae-light"; + icon_theme = "default"; + }; + }; window = { csd = true; opacity = 0.95; rounding = 10; }; }; + extensions = with inputs.vicinae-extensions.packages.${pkgs.stdenv.hostPlatform.system}; [ + bluetooth + nix + power-profile + # Extension names can be found in the link below, it's just the folder names + ]; }; }