diff --git a/dotfiles/kitagawa/equibop/equicord-settings.json b/dotfiles/kitagawa/equibop/equicord-settings.json index 0efb47b..f7d7ba0 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": 1788610714905 + "settingsSyncVersion": 1789074408620 }, "enableOnlineThemes": true, "enabledThemeLinks": [ diff --git a/dotfiles/kitagawa/niri.kdl b/dotfiles/kitagawa/niri.kdl index 75d7b3e..333298e 100644 --- a/dotfiles/kitagawa/niri.kdl +++ b/dotfiles/kitagawa/niri.kdl @@ -34,7 +34,7 @@ layout { } binds { Mod+B hotkey-overlay-title="Open web browser (Floorp)" { spawn "floorp"; } - Mod+C hotkey-overlay-title="Open calculator (Qalculate)" { spawn "qalculate-qt"; } + Mod+C hotkey-overlay-title="Open calculator (Qalculate)" { spawn "noctalia" "msg" "panel-toggle" "yuuto/calculator:panel"; } Mod+E hotkey-overlay-title="Open file manager (Nautilus)" { spawn "nautilus" "-w"; } Mod+Comma { spawn "noctalia" "msg" "panel-toggle" "dunarand/bookmarks:panel" "search"; } @@ -61,7 +61,7 @@ window-rule { } window-rule { match app-id="^kitty$" - default-column-width { proportion 0.58; } + default-column-width { proportion 0.52; } } switch-events { lid-close { spawn "systemctl hibernate"; } diff --git a/dotfiles/shared/niri-shared.kdl b/dotfiles/shared/niri-shared.kdl index 7710439..0c93c69 100644 --- a/dotfiles/shared/niri-shared.kdl +++ b/dotfiles/shared/niri-shared.kdl @@ -35,6 +35,7 @@ binds { Mod+D hotkey-overlay-title="Application launcher" { spawn "noctalia" "msg" "panel-toggle" "launcher"; } Mod+Return hotkey-overlay-title="Open terminal (Kitty)" { spawn "kitty"; } Mod+O hotkey-overlay-title="Open Obsidian" { spawn "obsidian"; } + Mod+G hotkey-overlay-title="Open GitHub Desktop" { spawn "github-desktop"; } Mod+Z hotkey-overlay-title="Apply NixOS / Home Manager config" { spawn "kitty" "zsh" "-i" "-c" "apply-config"; } Mod+K { show-hotkey-overlay; } @@ -55,6 +56,7 @@ binds { Mod+P hotkey-overlay-title="Show power info" { spawn "noctalia" "msg" "panel-toggle" "control-center" "power"; } Mod+W hotkey-overlay-title="Show wallpaper panel" { spawn "noctalia" "msg" "panel-toggle" "wallpaper"; } Ctrl+Shift+Escape { spawn "noctalia" "msg" "panel-toggle" "control-center" "system"; } + Mod+R hotkey-overlay-title="Open Remmina panel" { spawn "noctalia" "msg" "panel-toggle" "rylos/remmina:connections"; } Mod+Up { focus-workspace-up; } Mod+Down { focus-workspace-down; } diff --git a/dotfiles/shared/vscode/settings.json b/dotfiles/shared/vscode/settings.json index 392ca1a..15d8bc7 100644 --- a/dotfiles/shared/vscode/settings.json +++ b/dotfiles/shared/vscode/settings.json @@ -33,5 +33,6 @@ } } } - } + }, + "kdl.enable": false } diff --git a/flake.lock b/flake.lock index cc9f953..eb4b92f 100644 --- a/flake.lock +++ b/flake.lock @@ -76,11 +76,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1788678358, - "narHash": "sha256-xFu9deElkBd81tRYo2yRSZQ40LDXMnVd/gO1/uELxhI=", + "lastModified": 1789012949, + "narHash": "sha256-KBgLlh6RZxutLDtAF/s6hUYqlY2W4xtrfoL9H804LNs=", "owner": "rycee", "repo": "nur-expressions", - "rev": "2554c0e25259c6ab3e71dac5177f8d38f76a6e1c", + "rev": "0a05d0d144297405cb33aed943b93612e3fcf3fa", "type": "gitlab" }, "original": { @@ -207,11 +207,11 @@ ] }, "locked": { - "lastModified": 1788651960, - "narHash": "sha256-v9wJd32eZ2bvhBzVOd7TIjLQd011P7nwOhjKtWlci5I=", + "lastModified": 1789071706, + "narHash": "sha256-S+oyh2YSP9V5bSjWbbK0N7GxdxxMwgBfUOtUdVcAWc4=", "owner": "nix-community", "repo": "home-manager", - "rev": "2c0350c759688177331b8f5242311fae8877bdb3", + "rev": "150f9ce4ddd41544ea42eb9d6043a75bd615fa24", "type": "github" }, "original": { @@ -237,11 +237,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1788614874, - "narHash": "sha256-7QYjT2vHLuX9Z1pdxHXDKCbh1CR3D/2rywB9Tx0MPRg=", + "lastModified": 1789006805, + "narHash": "sha256-xB8mKMOx1IA9vTDNLmJZ6n4wCMq/cuWBBOzGCRnqxrU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c043004d1c6985732bcc1cbc5a9c9aecbbb4e0f0", + "rev": "8ce4ef6cb6f871616146b9fe26d2a5ae594e94fe", "type": "github" }, "original": { @@ -253,11 +253,11 @@ }, "nixpkgs-26-05": { "locked": { - "lastModified": 1788584326, - "narHash": "sha256-Fd3OB8J9JhgliQwOKcqx4M672CInxi1I5VnwsaXeSQo=", + "lastModified": 1789009968, + "narHash": "sha256-GB16oaxpsrnGNnGIE+0uYBqMRzB9X6FYDUvjvnJAYew=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6713828a351efa628b025a1adf7f43cbf8597513", + "rev": "d58a46e3bc02d91ebe04667f8397752a749c0024", "type": "github" }, "original": { @@ -289,11 +289,11 @@ ] }, "locked": { - "lastModified": 1788659825, - "narHash": "sha256-daBPX2MPsVb0fD/wTX68K6lWU4uqWwNrmqhcBTCGTwc=", + "lastModified": 1789065747, + "narHash": "sha256-kX5eqD+MGMtGNRw6Y86eNTvC1zYUye49ESaiCXY9n0o=", "owner": "noctalia-dev", "repo": "noctalia", - "rev": "224da6dd4360c5d2400fea967736c8195396ebb9", + "rev": "0565d25c1d3f13c7432fd64d32d08e27dbaff444", "type": "github" }, "original": { @@ -501,11 +501,11 @@ ] }, "locked": { - "lastModified": 1788672837, - "narHash": "sha256-FgtxJIiNZfqNkLeIz30/CDE6v6gbou0MhuiFLt2En7w=", + "lastModified": 1789052017, + "narHash": "sha256-eMVl0S4U91QZqTHKpykeUhwiXV6U9X2UB6JxYtHLDG8=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "ec2c94c95846c36130edb9872a8ca4c203028c84", + "rev": "36f84edf5f170d460ab3a1723b9283f169b817c7", "type": "github" }, "original": { diff --git a/modules/components/boot-loaders/limine.nix b/modules/components/boot-loaders/limine.nix index ac8cd79..9f2fe53 100644 --- a/modules/components/boot-loaders/limine.nix +++ b/modules/components/boot-loaders/limine.nix @@ -4,7 +4,8 @@ enable = true; maxGenerations = config.components.bootLoader.maxGenerations; extraConfig = '' - timeout: ${if config.components.bootLoader.timeout == -1 then "no" else builtins.toString (config.components.bootLoader.timeout)} + timeout: ${if config.components.bootLoader.timeout == -1 then "no" else toString (config.components.bootLoader.timeout)} + mouse: no ''; }; }; diff --git a/modules/components/window-managers/niri.nix b/modules/components/window-managers/niri.nix index 0341b03..d07cd1b 100644 --- a/modules/components/window-managers/niri.nix +++ b/modules/components/window-managers/niri.nix @@ -7,7 +7,6 @@ libsecret cage wev - qalculate-qt ]; services.upower.enable = true; diff --git a/modules/hosts/kitagawa/home/fastfetch.nix b/modules/hosts/kitagawa/home/fastfetch.nix index fadc8e7..9514483 100644 --- a/modules/hosts/kitagawa/home/fastfetch.nix +++ b/modules/hosts/kitagawa/home/fastfetch.nix @@ -4,23 +4,22 @@ programs.fastfetch = { settings = { logo = { - type = "builtin"; + type = "file"; + source = "/home/grey/Documents/nixos-ascii.txt"; padding = { - top = 1; + top = 3; left = 2; right = 2; }; + color = { + "1" = "green"; + }; }; modules = [ { type = "custom"; - format = "┌────────────────── Software ──────────────────┐"; - } - { - type = "title"; - key = " Session"; - format = "{user-name}@{host-name}"; + format = "┌───────────────── Software ─────────────────┐"; } { type = "os"; @@ -50,12 +49,12 @@ } { type = "custom"; - format = "└──────────────────────────────────────────────┘"; + format = "└────────────────────────────────────────────┘"; } "break" { type = "custom"; - format = "┌────────────────── Hardware ──────────────────┐"; + format = "┌───────────────── Hardware ─────────────────┐"; } { type = "cpu"; @@ -71,16 +70,6 @@ type = 0; }; } - { - type = "swap"; - key = " Swap"; - percent = { - green = 50; - yellow = 80; - type = 0; - }; - separate = false; - } { type = "disk"; key = " Disk"; @@ -97,6 +86,7 @@ yellow = 80; type = 0; }; + format = "{size-used} / {size-total} ({size-percentage})"; } { type = "localip"; @@ -115,12 +105,12 @@ } { type = "custom"; - format = "└──────────────────────────────────────────────┘"; + format = "└────────────────────────────────────────────┘"; } "break" { type = "custom"; - format = "┌──────────────── Age + Uptime ────────────────┐"; + format = "┌─────────────── Age + Uptime ───────────────┐"; } { type = "disk"; @@ -134,7 +124,7 @@ } { type = "custom"; - format = "└──────────────────────────────────────────────┘"; + format = "└────────────────────────────────────────────┘"; } ]; };