diff --git a/dotfiles/kitagawa/equibop/equicord-settings.json b/dotfiles/kitagawa/equibop/equicord-settings.json index f7d7ba0..8effbde 100644 --- a/dotfiles/kitagawa/equibop/equicord-settings.json +++ b/dotfiles/kitagawa/equibop/equicord-settings.json @@ -4,7 +4,7 @@ "authenticated": false, "settingsSync": false, "url": "https://cloud.equicord.org/", - "settingsSyncVersion": 1789074408620 + "settingsSyncVersion": 1789519293603 }, "enableOnlineThemes": true, "enabledThemeLinks": [ diff --git a/dotfiles/kitagawa/niri.kdl b/dotfiles/kitagawa/niri.kdl index 579015d..12e345c 100644 --- a/dotfiles/kitagawa/niri.kdl +++ b/dotfiles/kitagawa/niri.kdl @@ -1,4 +1,6 @@ include "./shared.kdl" +include "./noctalia-shared.kdl" +include "./biri-shared.kdl" input { keyboard { @@ -63,7 +65,7 @@ window-rule { default-column-width { proportion 0.52; } } switch-events { - lid-close { spawn "systemctl hibernate"; } + lid-close { spawn "systemctl" "hibernate"; } } include "noctalia.kdl" diff --git a/dotfiles/kitagawa/noctalia/plugins/data/dunarand/bookmarks/data.json b/dotfiles/kitagawa/noctalia/plugins/data/dunarand/bookmarks/data.json new file mode 100644 index 0000000..c178470 --- /dev/null +++ b/dotfiles/kitagawa/noctalia/plugins/data/dunarand/bookmarks/data.json @@ -0,0 +1 @@ +[{"glyph":"folder","items":[{"cmd":"ssh sakamoto .local/bin/wake-takamaki","description":"","glyph":"coffee","label":"Wake","runInBackground":false,"runInTerminal":false,"type":"bookmark"},{"cmd":"ssh takamaki universal-shutdown","description":"","glyph":"shutdown","label":"Shutdown","runInBackground":false,"runInTerminal":false,"type":"bookmark"},{"cmd":"ssh takamaki switch-os","description":"","glyph":"switch","label":"Switch OS","runInBackground":false,"runInTerminal":false,"type":"bookmark"},{"cmd":"moonlight stream takamaki Desktop","description":"","glyph":"brand-redhat","label":"Remote Desktop (Linux)","runInBackground":true,"runInTerminal":false,"type":"bookmark"},{"cmd":"remmina -c /home/grey/.local/share/remmina/group_rdp_takamaki_greyweather-dev.remmina","description":"","glyph":"brand-windows","label":"Remote Desktop (Windows)","runInBackground":false,"runInTerminal":false,"type":"bookmark"}],"label":"takamaki","type":"folder"}] \ No newline at end of file diff --git a/dotfiles/kitagawa/noctalia/settings.toml b/dotfiles/kitagawa/noctalia/settings.toml index 3c90437..91a0f80 100644 --- a/dotfiles/kitagawa/noctalia/settings.toml +++ b/dotfiles/kitagawa/noctalia/settings.toml @@ -1,4 +1,4 @@ -config_version = 13 +config_version = 14 [audio] enable_sounds = true @@ -11,7 +11,7 @@ tint_intensity = 0.19999999552965164 [bar.default] background_opacity = 0.79999998211860657 center = [ "active_window" ] -end = [ "tray", "notifications", "bluetooth", "network", "volume", "battery", "control-center" ] +end = [ "tray", "notifications", "network", "bluetooth", "volume", "battery", "control-center" ] font_family = "JetBrainsMono Nerd Font" font_weight = 300 margin_edge = 6 @@ -32,26 +32,23 @@ enabled = true type = "google" [control_center] +hidden_tabs = [ "media", "monitor" ] +show_session_button = false +show_shortcut_labels = false +sidebar = "full" sidebar_section = "none" -width = 750 +width = 700 [control_center.calendar] show_events_card = true [desktop_widgets] +enabled = false schema_version = 2 widget_order = [ - "desktop-widget-000000000000000e", "desktop-widget-0000000000000001", "desktop-widget-0000000000000002", - "desktop-widget-0000000000000006", - "desktop-widget-0000000000000007", "desktop-widget-0000000000000008", - "desktop-widget-0000000000000009", - "desktop-widget-000000000000000a", - "desktop-widget-000000000000000c", - "desktop-widget-000000000000000d", - "desktop-widget-000000000000000f", "desktop-widget-0000000000000010" ] @@ -64,7 +61,7 @@ widget_order = [ box_height = 128.0 box_width = 128.0 cx = 1408.0 - cy = 336.0 + cy = 144.0 output = "eDP-1" placement_height = 864.0 placement_width = 1536.0 @@ -89,7 +86,7 @@ widget_order = [ box_height = 112.0 box_width = 160.0 cx = 1200.0 - cy = 712.0 + cy = 288.0 output = "eDP-1" placement_height = 864.0 placement_width = 1536.0 @@ -106,49 +103,11 @@ widget_order = [ stat = "cpu_usage" stat2 = "cpu_temp" - [desktop_widgets.widget.desktop-widget-0000000000000006] - box_height = 128.0 - box_width = 352.0 - cx = 1296.0 - cy = 176.0 - output = "eDP-1" - placement_height = 864.0 - placement_width = 1536.0 - rotation = 0.0 - type = "media_player" - - [desktop_widgets.widget.desktop-widget-0000000000000006.settings] - background_opacity = 0.59999999999999998 - background_padding = 8 - background_radius = 8 - hide_when_no_media = false - layout = "horizontal" - shadow = false - - [desktop_widgets.widget.desktop-widget-0000000000000007] - box_height = 32.0 - box_width = 352.0 - cx = 1298.5 - cy = 96.0 - output = "eDP-1" - placement_height = 864.0 - placement_width = 1536.0 - rotation = 0.0 - type = "audio_visualizer" - - [desktop_widgets.widget.desktop-widget-0000000000000007.settings] - background = false - background_opacity = 0.0 - bands = 64 - centered = false - mirrored = false - show_when_idle = false - [desktop_widgets.widget.desktop-widget-0000000000000008] box_height = 128.0 box_width = 192.0 cx = 1216.0 - cy = 336.0 + cy = 144.0 output = "eDP-1" placement_height = 864.0 placement_width = 1536.0 @@ -158,120 +117,14 @@ widget_order = [ [desktop_widgets.widget.desktop-widget-0000000000000008.settings] background_opacity = 0.59999999999999998 background_radius = 8 + shadow = false show_forecast = true - [desktop_widgets.widget.desktop-widget-0000000000000009] - box_height = 32.0 - box_width = 128.0 - cx = 1216.0 - cy = 520.0 - output = "eDP-1" - placement_height = 864.0 - placement_width = 1536.0 - rotation = -0.0 - type = "button" - - [desktop_widgets.widget.desktop-widget-0000000000000009.settings] - background = true - command = "ssh sakamoto .local/bin/wake-takamaki" - glyph = "coffee" - label = "Wake" - variant = "default" - - [desktop_widgets.widget.desktop-widget-000000000000000a] - box_height = 32.0 - box_width = 128.0 - cx = 1376.0 - cy = 576.0 - output = "eDP-1" - placement_height = 864.0 - placement_width = 1536.0 - rotation = 0.0 - type = "button" - - [desktop_widgets.widget.desktop-widget-000000000000000a.settings] - background = true - command = "remmina -c /home/grey/.local/share/remmina/group_rdp_takamaki_greyweather-dev.remmina" - glyph = "brand-windows-filled" - label = "Windows" - variant = "default" - - [desktop_widgets.widget.desktop-widget-000000000000000c] - box_height = 32.0 - box_width = 128.0 - cx = 1376.0 - cy = 520.0 - output = "eDP-1" - placement_height = 864.0 - placement_width = 1536.0 - rotation = 0.0 - type = "button" - - [desktop_widgets.widget.desktop-widget-000000000000000c.settings] - background = true - command = "ssh takamaki universal-shutdown" - glyph = "shutdown" - label = "Shutdown" - variant = "default" - - [desktop_widgets.widget.desktop-widget-000000000000000d] - box_height = 32.0 - box_width = 128.0 - cx = 1216.0 - cy = 576.0 - output = "eDP-1" - placement_height = 864.0 - placement_width = 1536.0 - rotation = 0.0 - type = "button" - - [desktop_widgets.widget.desktop-widget-000000000000000d.settings] - background = true - command = "moonlight stream takamaki Desktop" - glyph = "brand-redhat" - label = "Linux" - variant = "default" - - [desktop_widgets.widget.desktop-widget-000000000000000e] - box_height = 192.0 - box_width = 352.0 - cx = 1296.0 - cy = 528.0 - output = "eDP-1" - placement_height = 864.0 - placement_width = 1536.0 - rotation = 0.0 - type = "label" - - [desktop_widgets.widget.desktop-widget-000000000000000e.settings] - background_opacity = 0.59999999999999998 - background_radius = 8 - opacity = 1.0 - shadow = false - title = "" - - [desktop_widgets.widget.desktop-widget-000000000000000f] - box_height = 0.0 - box_width = 0.0 - cx = 1298.5 - cy = 467.0 - output = "eDP-1" - placement_height = 864.0 - placement_width = 1536.0 - rotation = 0.0 - type = "label" - - [desktop_widgets.widget.desktop-widget-000000000000000f.settings] - background = false - opacity = 1.0 - shadow = false - title = "Remote Desktop" - [desktop_widgets.widget.desktop-widget-0000000000000010] box_height = 112.0 box_width = 160.0 cx = 1392.0 - cy = 712.0 + cy = 288.0 output = "eDP-1" placement_height = 864.0 placement_width = 1536.0 @@ -282,6 +135,7 @@ widget_order = [ background_opacity = 0.59999999999999998 background_padding = 8 background_radius = 8 + shadow = false stat = "net_rx" stat2 = "net_tx" @@ -293,7 +147,7 @@ icon_size = 40 inactive_scale = 0.90000001341104507 magnification_scale = 1.1000000014901161 main_axis_padding = 12 -margin_edge = 16 +margin_edge = 12 pinned = [ "signal", "equibop", "thunderbird", "spotify", "code", "github-desktop", "proton.vpn.app.gtk" ] radius = 16 reserve_space = false @@ -413,8 +267,37 @@ enabled = true temperature_day = 6000 temperature_night = 3800 +[plugin_settings."avivbintangaringga/nix-monitor"] +clean_command = "nh clean all --keep 10 --keep-since 7d" +panel_placement = "floating" +show_update_available_notification = false + +[plugin_settings."dunarand/bookmarks"] +panel_placement = "floating" +panel_position = "auto" + +[plugin_settings."noctalia/bitwarden"] +clear_clipboard_seconds = 30 +gen_length = 32 +gen_passphrase_capitalize = true +gen_passphrase_include_number = true +gen_special = true +server_url = "https://vault.bitwarden.eu" +vault_timeout = "30" + +[plugin_settings."rylos/remmina"] +connections_placement = "floating" + +[plugin_settings."yugaaank/better-clock"] +show_date = false + +[plugin_settings."yuuto/calculator"] +angle_unit = "deg" +panel_open_near_click = false +panel_placement = "floating" + [plugins] -enabled = [] +enabled = [ "noctalia/bitwarden", "dunarand/bookmarks", "rylos/remmina", "yuuto/calculator", "noctalia/wallhaven" ] [shell] corner_radius_scale = 1.2500000186264515 @@ -422,21 +305,32 @@ niri_overview_type_to_launch_enabled = true polkit_agent = true [shell.animation] - speed = 1.5000000223517418 + speed = 1.7500000260770321 [shell.launcher] + app_grid = true categories = false + show_app_origin_indicator = false [shell.panel] - clipboard_placement = "attached" - launcher_placement = "attached" - session_position = "center" - shadow = false + clipboard_placement = "floating" + clipboard_position = "auto" + control_center_placement = "floating" + floating_offset = 6 + launcher_placement = "floating" + launcher_position = "auto" + polkit_position = "auto" + session_placement = "floating" + session_position = "auto" + shadow = true transparency_mode = "glass" + wallpaper_placement = "floating" [shell.screen_corners] enabled = true - size = 16 + + [shell.screenshot] + confirm_region = true [[shell.session.actions]] action = "lock" @@ -477,33 +371,56 @@ polkit_agent = true variant = "destructive" [shell.shadow] - alpha = 0.44999998994171619 + alpha = 0.4999999888241291 + direction = "down_right" [theme] -builtin = "Rosé Pine" -community_palette = "Ayu Blue" -source = "wallpaper" -wallpaper_scheme = "muted" +builtin = "Nord" +community_palette = "Cherry Blossom" +mode = "dark" +source = "community" +wallpaper_scheme = "m3-monochrome" [theme.templates] - builtin_ids = [ "niri" ] - enable_community_templates = false + builtin_ids = [ "gtk3", "gtk4", "kcolorscheme", "kitty", "niri", "qt" ] + community_ids = [ "papirus-icons" ] + enable_community_templates = true [wallpaper] -directory = "/home/grey/nixos/modules/hosts/kitagawa" +directory = "~/Pictures/Wallpapers" [wallpaper.default] - path = "/home/grey/nixos/modules/hosts/kitagawa/wallpaper.jpg" + path = "/home/grey/Pictures/Wallpapers/wallhaven-jewvzy.jpg" [wallpaper.last] - path = "/home/grey/nixos/modules/hosts/kitagawa/wallpaper.jpg" + path = "/home/grey/Pictures/Wallpapers/wallhaven-jewvzy.jpg" [wallpaper.monitors.eDP-1] - path = "/home/grey/nixos/modules/hosts/kitagawa/wallpaper.jpg" + path = "/home/grey/Pictures/Wallpapers/wallhaven-jewvzy.jpg" [[wallpaper.favorite]] - path = "/home/grey/nixos/modules/hosts/kitagawa/wallpaper.jpg" - theme_mode = "auto" + palette_source = "wallpaper" + path = "/home/grey/Pictures/Wallpapers/evangelion.jpg" + theme_mode = "dark" + wallpaper_scheme = "muted" + + [[wallpaper.favorite]] + palette_source = "wallpaper" + path = "/home/grey/Pictures/Wallpapers/wallhaven-yqv637.png" + theme_mode = "dark" + wallpaper_scheme = "m3-monochrome" + + [[wallpaper.favorite]] + builtin_palette = "Nord" + palette_source = "builtin" + path = "/home/grey/Pictures/Wallpapers/wallhaven-og7x7p.jpg" + theme_mode = "dark" + + [[wallpaper.favorite]] + community_palette = "Cherry Blossom" + palette_source = "community" + path = "/home/grey/Pictures/Wallpapers/wallhaven-jewvzy.jpg" + theme_mode = "dark" [widget.active_window] enabled = true @@ -516,14 +433,15 @@ title_scroll = "on_hover" enabled = true [widget.bluetooth] -enabled = false +enabled = true [widget.brightness] enabled = true [widget.control-center] -custom_image = "/nix/store/5mywyh8lp60x9li5688q1m39rqvy0ckp-noctalia-5.0.0/share/noctalia/assets/images/distros/nixos.svg" +custom_image = "/nix/store/gpf2ydsxn993c3rrrnj40d0kvygf0i9a-nixos-icons-0-unstable-2025-06-28/share/icons/hicolor/512x512/apps/nix-snowflake.png" enabled = true +glyph = "" [widget.custom_button_2] type = "custom_button" @@ -539,15 +457,16 @@ show_label = false [widget.notifications] hide_when_no_unread = true -[widget.session] -enabled = false +[widget.status] +type = "icefish/phone-operate:status" [widget.tray] -hidden = [ "Udiskie" ] +hidden = [ "Udiskie", "Blueman" ] [widget.volume] mute_color = "on_surface" show_label = false [widget.workspaces] +label_source = "name" scale = 0.90000000000000013 \ No newline at end of file diff --git a/flake.lock b/flake.lock index 4a3bbae..28fb62b 100644 --- a/flake.lock +++ b/flake.lock @@ -235,64 +235,6 @@ "type": "github" } }, - "niri-flake": { - "inputs": { - "niri-stable": "niri-stable", - "niri-unstable": "niri-unstable", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable", - "xwayland-satellite-stable": "xwayland-satellite-stable", - "xwayland-satellite-unstable": "xwayland-satellite-unstable" - }, - "locked": { - "lastModified": 1785857305, - "narHash": "sha256-25q05zpF1sqOCxPPUG9DPPGd+EDW7SiAOWCzBWRS7r0=", - "owner": "sodiboo", - "repo": "niri-flake", - "rev": "9ee3e13b60643448228353097880521658b2fe0e", - "type": "github" - }, - "original": { - "owner": "sodiboo", - "repo": "niri-flake", - "type": "github" - } - }, - "niri-stable": { - "flake": false, - "locked": { - "lastModified": 1756556321, - "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "ref": "v25.08", - "repo": "niri", - "type": "github" - } - }, - "niri-unstable": { - "flake": false, - "locked": { - "lastModified": 1785701241, - "narHash": "sha256-ircVOzPWRircI39ac/tqJajr5OoJxEVrDlBb05TULEk=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "feb3e43f1475e0865bb89cbd1e898b34d1d2ccf6", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "repo": "niri", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1789546076, @@ -340,22 +282,6 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1782847189, - "narHash": "sha256-twXPFqFsrrY5r28Zh7Homgcp2gUMBgQ6WDS98Q/3xFI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b6018f87da91d19d0ab4cf979885689b469cdd41", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.11", - "repo": "nixpkgs", - "type": "github" - } - }, "noctalia": { "inputs": { "nixpkgs": [ @@ -408,7 +334,6 @@ "helpers": "helpers", "home-manager": "home-manager", "import-tree": "import-tree", - "niri-flake": "niri-flake", "nixpkgs": "nixpkgs", "nixpkgs-26-05": "nixpkgs-26-05", "noctalia": "noctalia", @@ -566,39 +491,6 @@ "type": "github" } }, - "xwayland-satellite-stable": { - "flake": false, - "locked": { - "lastModified": 1755491097, - "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=", - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "rev": "388d291e82ffbc73be18169d39470f340707edaa", - "type": "github" - }, - "original": { - "owner": "Supreeeme", - "ref": "v0.7", - "repo": "xwayland-satellite", - "type": "github" - } - }, - "xwayland-satellite-unstable": { - "flake": false, - "locked": { - "lastModified": 1784679892, - "narHash": "sha256-Mb7jpqnrcYCfNSItIkkHpuR3YxWFxPuIBfcwNKlRBkk=", - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "rev": "8d135d3b2854b30fd01ea6cd6c27e523dd50a839", - "type": "github" - }, - "original": { - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "type": "github" - } - }, "zen-browser": { "inputs": { "home-manager": [ diff --git a/modules/features/applications/gui/kitty.nix b/modules/features/applications/gui/kitty.nix index 6a1c25c..5a0de52 100644 --- a/modules/features/applications/gui/kitty.nix +++ b/modules/features/applications/gui/kitty.nix @@ -15,6 +15,10 @@ in { enable = true; shellIntegration.enableBashIntegration = true; enableGitIntegration = true; + extraConfig = '' + include ${config.xdg.configHome}/kitty/themes/noctalia.conf + include ${config.xdg.configHome}/kitty/current-theme.conf + ''; }; }) ]; }; diff --git a/modules/features/nixos/stylix.nix b/modules/features/nixos/stylix.nix index a92bc78..bbbb186 100644 --- a/modules/features/nixos/stylix.nix +++ b/modules/features/nixos/stylix.nix @@ -8,22 +8,22 @@ inputs.stylix.nixosModules.stylix ]; - config = lib.mkIf (config.features.nixos.stylix.enable) { - stylix.enable = true; - stylix.image = builtins.path { path = "${self}/modules/hosts/${config.info.hostName}/wallpaper.jpg"; }; - stylix.polarity = "dark"; + stylix = lib.mkIf (config.features.nixos.stylix.enable) { + enable = true; + image = builtins.path { path = "${self}/modules/hosts/${config.info.hostName}/wallpaper.jpg"; }; + polarity = "dark"; + }; - home-manager.users.${config.info.userName} = lib.mkIf (config.features.nixos.home-manager.enable) { - features.nixos.stylix.enable = lib.mkDefault config.features.nixos.stylix.enable; - }; + home-manager.users.${config.info.userName} = lib.mkIf (config.features.nixos.stylix.enable && config.features.nixos.home-manager.enable) { + features.nixos.stylix.enable = lib.mkDefault true; }; }; - flake.homeModules.graphics = { pkgs, lib, config, ... }: { - config = lib.mkIf (config.features.nixos.stylix.enable) { + flake.homeModules.graphics = { lib, config, options, ... }: { + config = lib.mkIf (config.features.nixos.stylix.enable) (lib.optionalAttrs (builtins.hasAttr "stylix" options) { stylix.targets = lib.mkIf (config.features.applications.gui.floorp.enable) { floorp.profileNames = [ "default" ]; }; - }; + }); }; } \ No newline at end of file diff --git a/modules/hosts/kitagawa/home/fastfetch.nix b/modules/hosts/kitagawa/home/fastfetch.nix index 9514483..b8edd0c 100644 --- a/modules/hosts/kitagawa/home/fastfetch.nix +++ b/modules/hosts/kitagawa/home/fastfetch.nix @@ -12,7 +12,7 @@ right = 2; }; color = { - "1" = "green"; + "1" = "blue"; }; }; diff --git a/modules/hosts/kitagawa/kitagawa.nix b/modules/hosts/kitagawa/kitagawa.nix index ec2f238..ff19968 100644 --- a/modules/hosts/kitagawa/kitagawa.nix +++ b/modules/hosts/kitagawa/kitagawa.nix @@ -23,7 +23,7 @@ features = { nixos = { home-manager.enable = true; - stylix.enable = true; + stylix.enable = false; }; shells.zsh.antidote.enable = true; diff --git a/modules/hosts/kitagawa/wallpaper.jpg b/modules/hosts/kitagawa/wallpaper.jpg deleted file mode 100644 index 7599dfb..0000000 Binary files a/modules/hosts/kitagawa/wallpaper.jpg and /dev/null differ diff --git a/modules/hosts/takamaki/home/kitty.nix b/modules/hosts/takamaki/home/kitty.nix index 37c5c7f..7842a69 100644 --- a/modules/hosts/takamaki/home/kitty.nix +++ b/modules/hosts/takamaki/home/kitty.nix @@ -6,11 +6,6 @@ package = pkgs.nerd-fonts.jetbrains-mono; size = 12; }; - - extraConfig = '' - include ${config.xdg.configHome}/kitty/themes/noctalia.conf - include ${config.xdg.configHome}/kitty/current-theme.conf - ''; }; }; }