diff --git a/hosts/Styx/configuration.nix b/hosts/Styx/configuration.nix index 4cc1e1c..0b0b6a7 100644 --- a/hosts/Styx/configuration.nix +++ b/hosts/Styx/configuration.nix @@ -136,6 +136,7 @@ openssl efibootmgr nautilus + i2c-tools wl-clipboard @@ -150,6 +151,24 @@ server.port = 6742; }; + # The board's ACPI tables reserve I/O ports 0xB00-0xB0F for an OpRegion + # (\GSA1.SMBI), which overlaps the AMD FCH SMBus controller's I/O range. + # With strict ACPI resource enforcement (the default), the kernel refuses + # to let i2c-piix4 claim that range, so the driver never binds to the + # SMBus PCI device (00:14.0 stays disabled) and no I2C bus is created for + # OpenRGB to reach the Corsair Vengeance RGB controller on the DIMMs. + boot.kernelParams = [ "acpi_enforce_resources=lax" ]; + + # i2c-dev/i2c-piix4 otherwise only get autoloaded lazily during the + # session, which loses the race against openrgb.service at boot: the + # server starts with no working I2C/SMBus interface, so the RAM + # controller never gets enumerated. Loading them via systemd-modules-load + # (very early in boot) ensures they're ready before openrgb.service starts. + boot.kernelModules = [ + "i2c-dev" + "i2c-piix4" + ]; + environment.sessionVariables = { NIXOS_OZONE_WL = "1"; XCURSOR_THEME = "Bibata-Modern-Classic"; diff --git a/modules/home/tools/filaments/config/config.ron b/modules/home/tools/filaments/config/config.ron index 62d2430..f9f6f03 100644 --- a/modules/home/tools/filaments/config/config.ron +++ b/modules/home/tools/filaments/config/config.ron @@ -1,59 +1,87 @@ ( - directory: "/Users/suri/dev/personal/filaments", + directory: "/home/suri/doc/personal/ZettelKasten", global_key_binds: { - "up": MoveUp, - "down": MoveDown, - "ctrl-z": Suspend, + "down": MoveDown, "ctrl-c": Quit, + "up": MoveUp, + "ctrl-z": Suspend, }, zk: ( keybinds: { - "tab": SwitchTo(page: Todo(TaskList)), + "tab": SwitchTo( + page: Todo(Explorer), + ), "ctrl-n": NewZettel, - "enter": OpenZettel, + "enter": OpenZettel, }, ), todo: ( explorer: ( keybinds: { - "tab": SwitchTo(page: Zk), - "1": SwitchTo(page: Todo(Explorer)), - "2": SwitchTo(page: Todo(Inspector)), - "3": SwitchTo(page: Todo(TaskList)), - "j": MoveDown, + "1": SwitchTo( + page: Todo(Explorer), + ), + "tab": SwitchTo( + page: Zk, + ), + "3": SwitchTo( + page: Todo(TaskList), + ), "k": MoveUp, "shift-g": NewGroup, - "g": NewSubGroup, + "enter": SwitchTo( + page: Todo(Inspector), + ), "t": NewTask, - "enter": SwitchTo(page: Todo(Inspector)) + "2": SwitchTo( + page: Todo(Inspector), + ), + "g": NewSubGroup, + "j": MoveDown, }, ), inspector: ( keybinds: { - "tab": SwitchTo(page: Zk), - "1": SwitchTo(page: Todo(Explorer)), - "2": SwitchTo(page: Todo(Inspector)), - "3": SwitchTo(page: Todo(TaskList)), - "n": EditName, + "1": SwitchTo( + page: Todo(Explorer), + ), + "2": SwitchTo( + page: Todo(Inspector), + ), "p": EditPriority, - "d": EditDue, + "3": SwitchTo( + page: Todo(TaskList), + ), "o": OpenZettel, "f": ToggleFinish, - "r": RandomColor + "r": RandomColor, + "tab": SwitchTo( + page: Zk, + ), + "d": EditDue, + "n": EditName, }, ), tasklist: ( keybinds: { - "tab": SwitchTo(page: Zk), - "1": SwitchTo(page: Todo(Explorer)), - "2": SwitchTo(page: Todo(Inspector)), - "3": SwitchTo(page: Todo(TaskList)), + "2": SwitchTo( + page: Todo(Inspector), + ), + "tab": SwitchTo( + page: Zk, + ), + "3": SwitchTo( + page: Todo(TaskList), + ), + "enter": SwitchTo( + page: Todo(Inspector), + ), + "1": SwitchTo( + page: Todo(Explorer), + ), "j": MoveDown, "k": MoveUp, - "enter": SwitchTo(page: Todo(Inspector)) }, ), ), -) - - +) \ No newline at end of file diff --git a/modules/home/tools/jujutsu/config.toml b/modules/home/tools/jujutsu/config.toml index e665763..6b07615 100644 --- a/modules/home/tools/jujutsu/config.toml +++ b/modules/home/tools/jujutsu/config.toml @@ -6,6 +6,8 @@ email = "suri312006@gmail.com" [ui] default-command = ["log", "--reversed"] +pager = "delta" +diff-formatter = ":git" [revset-aliases] "immutable_heads()" = "builtin_immutable_heads() | (trunk().. & ~mine())" @@ -17,3 +19,4 @@ key = "~/.ssh/signing_key.pub" [git] write-change-id-header = true + diff --git a/modules/home/tools/jujutsu/default.nix b/modules/home/tools/jujutsu/default.nix index 2812d6d..2b06223 100644 --- a/modules/home/tools/jujutsu/default.nix +++ b/modules/home/tools/jujutsu/default.nix @@ -17,6 +17,7 @@ in home.packages = with pkgs; [ jujutsu + delta ]; home.file = { diff --git a/modules/home/tools/zed/config/settings.json b/modules/home/tools/zed/config/settings.json index a0c7eab..eb89c4e 100644 --- a/modules/home/tools/zed/config/settings.json +++ b/modules/home/tools/zed/config/settings.json @@ -21,6 +21,9 @@ ] } ], + "markdown_preview_font_size": 18.0, + "markdown_preview_code_font_family": "TX-02", + "markdown_preview_font_family": "TX-02", "cli_default_open_behavior": "existing_window", "agent_ui_font_size": 14.0, "server_url": "https://zed.dev", @@ -77,7 +80,7 @@ "tab_bar": { "show_nav_history_buttons": false, "show_tab_bar_buttons": false, - "show": false + "show": true }, "tabs": { "file_icons": false @@ -86,6 +89,13 @@ "provider": "none" }, "agent_servers": { + "claude-acp": { + "default_config_options": { + "mode": "acceptEdits", + "model": "default" + }, + "type": "registry" + }, "codex-acp": { "favorite_config_option_values": { "mode": [ diff --git a/modules/home/tools/zellij/config/config.kdl b/modules/home/tools/zellij/config/config.kdl index f91866e..c77ad84 100644 --- a/modules/home/tools/zellij/config/config.kdl +++ b/modules/home/tools/zellij/config/config.kdl @@ -211,6 +211,14 @@ keybinds clear-defaults=true { move_to_focused_tab true } } + + bind "Ctrl s" { + LaunchOrFocusPlugin "session-manager" { + floating true + move_to_focused_tab true + } + + } bind "Super x" { CloseFocus; } } shared_except "locked" "renametab" "renamepane" { diff --git a/modules/home/wm/niri/config.kdl b/modules/home/wm/niri/config.kdl index be8316a..af42ca5 100644 --- a/modules/home/wm/niri/config.kdl +++ b/modules/home/wm/niri/config.kdl @@ -257,6 +257,7 @@ binds { } +spawn-at-startup "openrgb" "--client" "127.0.0.1:6742" "--mode" "direct" "--color" "DDDDDD"; spawn-at-startup "noctalia"; spawn-at-startup "zeditor"; spawn-at-startup "zen";