From cdb8341737e398743a5e5b13d24b408fd8398974 Mon Sep 17 00:00:00 2001 From: Isabella Bastaja Date: Tue, 15 Sep 2026 19:48:26 +0200 Subject: chore: update flake.lock --- flake.lock | 56 +++--- hosts/tower/default.nix | 4 +- share/cfg/default.nix | 1 - share/cfg/emacs.nix | 2 +- share/cfg/zed/default.nix | 4 - share/cfg/zed/keymap.json5 | 409 ----------------------------------------- share/home/dev-stuff.nix | 34 +--- share/home/gui-tools.nix | 8 +- share/system/client-common.nix | 2 - 9 files changed, 38 insertions(+), 482 deletions(-) delete mode 100644 share/cfg/zed/default.nix delete mode 100644 share/cfg/zed/keymap.json5 diff --git a/flake.lock b/flake.lock index 9230e6c..8640783 100644 --- a/flake.lock +++ b/flake.lock @@ -103,11 +103,11 @@ ] }, "locked": { - "lastModified": 1785958398, - "narHash": "sha256-5r/JgsoNMTx+qIh83WkxpujEKBR7PF5ssnh5vYCuSAw=", + "lastModified": 1789482455, + "narHash": "sha256-pD3qVlQ4mUCFoTWrYtxecpSitQMsgJvJIN0FUIDZoEU=", "owner": "nix-community", "repo": "home-manager", - "rev": "a7c70cc290290f373f50cd820403833d250459ac", + "rev": "efa3ccb4c3cc90d832eab232976379058fa75aa3", "type": "github" }, "original": { @@ -128,11 +128,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1786002382, - "narHash": "sha256-aOUYSWA95OeiZ/o0xgdFozBnoUZ8McLLidTZL9Z0Sb8=", + "lastModified": 1789483853, + "narHash": "sha256-pN4fo5utHReFUgLgIrUEjma4bwHBZGFNMLX4oYPYXxM=", "owner": "epireyn", "repo": "niri-flake", - "rev": "d7fbe986aadf00b1e0d16b24c7548e05b3028fec", + "rev": "fe81caf8cff8aeeea137dd12f1688791e0d56175", "type": "github" }, "original": { @@ -161,11 +161,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1785701241, - "narHash": "sha256-ircVOzPWRircI39ac/tqJajr5OoJxEVrDlBb05TULEk=", + "lastModified": 1789471123, + "narHash": "sha256-L3+grfAYTHYULHEDYlab2srN69R4kLdkSkkQGRfeb2k=", "owner": "niri-wm", "repo": "niri", - "rev": "feb3e43f1475e0865bb89cbd1e898b34d1d2ccf6", + "rev": "ef3be0541ca39c5aa94461b3dc3a9eba31a63c60", "type": "github" }, "original": { @@ -176,11 +176,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1785967620, - "narHash": "sha256-IItrdb7Puk05RqOBWZYFC5X6Wl1sJmCfh5MWVHw5iMM=", + "lastModified": 1789286504, + "narHash": "sha256-eiEK7cKZORNEvX0GeF3RtNEF/JXhgf2RqSp3230q13E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b7c2ada94fe99c15b0dbcf4d11fd7850b957a436", + "rev": "ef34387ddd751e1ab8857adf4676492d32eb24ec", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1785858998, - "narHash": "sha256-fKCq5jphd6l/Ms6gc3dptkw/TcKLYub9lQE5g6rbbkc=", + "lastModified": 1789344334, + "narHash": "sha256-vdhpDJ3Lr24lkZ+fDCjmBRRtw9/vcSzkqGJOJyF5h2U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "04607e1165ac22c5fde6dcc54c9e0b3c0487c555", + "rev": "c3eea5b2156db11c7eeeada3dc737711255b253e", "type": "github" }, "original": { @@ -272,11 +272,11 @@ ] }, "locked": { - "lastModified": 1783174389, - "narHash": "sha256-aCWC8ngycU7OdJrU2+Je3qf+1a2ykuBvpPhZT/9tXMc=", + "lastModified": 1788914643, + "narHash": "sha256-4GuMPW90JSxXWDPUB9M+1m7fYbe3H0apOd86/zBQ2Kw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f1406619a3884cd5c47992a70b8b35c9c0fcb4c9", + "rev": "13616fff713a9f94055c66f15687ebdc17a335df", "type": "github" }, "original": { @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1785945821, - "narHash": "sha256-NLSyTCW4K4ofhNBllt3omPasm6QpralXH1DBZOc91Dw=", + "lastModified": 1786901030, + "narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "ae7910970dddc408fe6ab1c8e4b277bb21d72dc0", + "rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa", "type": "github" }, "original": { @@ -382,16 +382,16 @@ "xwayland-satellite-stable": { "flake": false, "locked": { - "lastModified": 1771195969, - "narHash": "sha256-BUE41HjLIGPjq3U8VXPjf8asH8GaMI7FYdgrIHKFMXA=", + "lastModified": 1784679892, + "narHash": "sha256-Mb7jpqnrcYCfNSItIkkHpuR3YxWFxPuIBfcwNKlRBkk=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "536bd32efc935bf876d6de385ec18a1b715c9358", + "rev": "8d135d3b2854b30fd01ea6cd6c27e523dd50a839", "type": "github" }, "original": { "owner": "Supreeeme", - "ref": "v0.8.1", + "ref": "v0.8.2", "repo": "xwayland-satellite", "type": "github" } @@ -399,11 +399,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1784679892, - "narHash": "sha256-Mb7jpqnrcYCfNSItIkkHpuR3YxWFxPuIBfcwNKlRBkk=", + "lastModified": 1788991189, + "narHash": "sha256-0TxfMgqW0/BLD4M942c5DCKYrtPvzsPJwvdcco4LQUM=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "8d135d3b2854b30fd01ea6cd6c27e523dd50a839", + "rev": "add2795134593faafce60e404a0a75df68e9ee0c", "type": "github" }, "original": { diff --git a/hosts/tower/default.nix b/hosts/tower/default.nix index 841e54f..311702b 100644 --- a/hosts/tower/default.nix +++ b/hosts/tower/default.nix @@ -14,9 +14,7 @@ time.timeZone = "Europe/Zagreb"; # Set the max amount of space used for logs - services.journald.extraConfig = '' - SystemMaxUse=100M - ''; + services.journald.settings.Journal.SystemMaxUse = "100M"; # Select internationalisation properties. i18n.defaultLocale = "en_US.UTF-8"; diff --git a/share/cfg/default.nix b/share/cfg/default.nix index 569052a..d39021e 100644 --- a/share/cfg/default.nix +++ b/share/cfg/default.nix @@ -10,7 +10,6 @@ ./shellenv.nix ./fish.nix ./emacs.nix - ./zed ./kitty.nix ]; } diff --git a/share/cfg/emacs.nix b/share/cfg/emacs.nix index dae2520..e6f9137 100644 --- a/share/cfg/emacs.nix +++ b/share/cfg/emacs.nix @@ -2,7 +2,7 @@ { services.emacs = { # package = pkgs.nur.repos.sorre.sorremacs; - package = pkgs.emacs30-pgtk; # wayland-native + package = pkgs.emacs-pgtk; # wayland-native client.enable = true; startWithUserSession = true; }; diff --git a/share/cfg/zed/default.nix b/share/cfg/zed/default.nix deleted file mode 100644 index 16b4c22..0000000 --- a/share/cfg/zed/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ ... }: -{ - # xdg.configFile."zed/keymap.json".source = ./keymap.json5; -} diff --git a/share/cfg/zed/keymap.json5 b/share/cfg/zed/keymap.json5 deleted file mode 100644 index 3bae9bd..0000000 --- a/share/cfg/zed/keymap.json5 +++ /dev/null @@ -1,409 +0,0 @@ -[ - { - "bindings": { - "cmd-k cmd-p": "workspace::ActivatePreviousPane", - "cmd-k cmd-n": "workspace::ActivateNextPane", - "cmd-'": "editor::ToggleCodeActions" - } - }, - { - "context": "Editor", - "bindings": { - "cmd-b": "editor::GoToDefinition", - "alt-cmd-b": "editor::GoToDefinitionSplit", - "cmd-<": "editor::ScrollCursorCenter", - "cmd-g": [ - "editor::SelectNext", - { - "replace_newest": true - } - ], - "ctrl-cmd-g": [ - "editor::SelectPrevious", - { - "replace_newest": true - } - ], - "ctrl-shift-down": "editor::AddSelectionBelow", - "ctrl-shift-up": "editor::AddSelectionAbove", - "cmd-shift-backspace": "editor::DeleteToBeginningOfLine" - } - }, - { - "context": "Editor && mode == full", - "bindings": { - "cmd-r": "outline::Toggle" - } - }, - { - "context": "BufferSearchBar", - "bindings": { - "cmd-f3": "search::SelectNextMatch", - "cmd-shift-f3": "search::SelectPrevMatch" - } - }, - { - "context": "Workspace", - "bindings": { - "cmd-\\": "workspace::ToggleLeftDock", - "cmd-k cmd-b": "workspace::ToggleLeftDock", - "cmd-t": "file_finder::Toggle", - "cmd-shift-r": "project_symbols::Toggle" - } - }, - { - "context": "Pane", - "bindings": { - // "alt-cmd-/": "search::ActivateRegexMode", - "ctrl-0": "project_panel::ToggleFocus", - "cmd-1": ["pane::ActivateItem", 0], - "cmd-2": ["pane::ActivateItem", 1], - "cmd-3": ["pane::ActivateItem", 2], - "cmd-4": ["pane::ActivateItem", 3], - "cmd-5": ["pane::ActivateItem", 4], - "cmd-6": ["pane::ActivateItem", 5], - "cmd-7": ["pane::ActivateItem", 6], - "cmd-8": ["pane::ActivateItem", 7], - "cmd-9": "pane::ActivateLastItem" - } - }, - { - "context": "ProjectPanel", - "bindings": { - "ctrl-[": "project_panel::CollapseSelectedEntry", - "ctrl-b": "project_panel::CollapseSelectedEntry", - "alt-b": "project_panel::CollapseSelectedEntry", - "ctrl-]": "project_panel::ExpandSelectedEntry", - "ctrl-f": "project_panel::ExpandSelectedEntry", - "ctrl-shift-c": "project_panel::CopyPath" - } - }, - { - "context": "Editor && vim_mode != helix_normal && vim_operator == none && !VimWaiting", - "bindings": { - "escape": ["vim::SwitchMode", "HelixNormal"] - // "escape": ["vim::HelixNormalAfter"] - } - }, - { - "context": "vim_mode == helix_normal && !menu", - // "use_layout_keys": true, - "bindings": { - "space": "vim::Space", - "$": "vim::EndOfLine", - "end": "vim::EndOfLine", - "^": "vim::FirstNonWhitespace", - "_": "vim::StartOfLineDownward", - "g _": "vim::EndOfLineDownward", - "shift-g": "vim::EndOfDocument", - "{": "vim::StartOfParagraph", - "}": "vim::EndOfParagraph", - "(": "vim::SentenceBackward", - ")": "vim::SentenceForward", - "|": "vim::GoToColumn", - "] ]": "vim::NextSectionStart", - "] [": "vim::NextSectionEnd", - "[ [": "vim::PreviousSectionStart", - "[ ]": "vim::PreviousSectionEnd", - "] m": "vim::NextMethodStart", - "] M": "vim::NextMethodEnd", - "[ m": "vim::PreviousMethodStart", - "[ M": "vim::PreviousMethodEnd", - "[ *": "vim::PreviousComment", - "[ /": "vim::PreviousComment", - "] *": "vim::NextComment", - "] /": "vim::NextComment", - // Word motions - "w": "vim::NextWordStart", - "e": "vim::NextWordEnd", - "b": "vim::PreviousWordStart", - // Subword motions - // "w": "vim::NextSubwordStart", - // "b": "vim::PreviousSubwordStart", - // "e": "vim::NextSubwordEnd", - // "g e": "vim::PreviousSubwordEnd", - "shift-w": ["vim::NextWordStart", { "ignorePunctuation": true }], - "shift-e": ["vim::NextWordEnd", { "ignorePunctuation": true }], - "shift-b": ["vim::PreviousWordStart", { "ignorePunctuation": true }], - "g shift-e": ["vim::PreviousWordEnd", { "ignorePunctuation": true }], - "/": "vim::Search", - "g /": "pane::DeploySearch", - "?": ["vim::Search", { "backwards": true }], - "*": "vim::MoveToNext", - "#": "vim::MoveToPrev", - "n": "vim::MoveToNextMatch", - "shift-n": "vim::MoveToPrevMatch", - "%": "vim::Matching", - "] }": ["vim::UnmatchedForward", { "char": "}" }], - "[ {": ["vim::UnmatchedBackward", { "char": "{" }], - "] )": ["vim::UnmatchedForward", { "char": ")" }], - "[ (": ["vim::UnmatchedBackward", { "char": "(" }], - "f": ["vim::PushOperator", { "FindForward": { "before": false } }], - "t": ["vim::PushOperator", { "FindForward": { "before": true } }], - "shift-f": ["vim::PushOperator", { "FindBackward": { "after": false } }], - "shift-t": ["vim::PushOperator", { "FindBackward": { "after": true } }], - "m": ["vim::PushOperator", "Mark"], - "'": ["vim::PushOperator", { "Jump": { "line": true } }], - "`": ["vim::PushOperator", { "Jump": { "line": false } }], - ";": "vim::RepeatFind", - ",": "vim::RepeatFindReversed", - "ctrl-o": "pane::GoBack", - "ctrl-i": "pane::GoForward", - "ctrl-]": "editor::GoToDefinition", - "v": "vim::ToggleVisual", - "shift-v": "vim::ToggleVisualLine", - "ctrl-v": "vim::ToggleVisualBlock", - "ctrl-q": "vim::ToggleVisualBlock", - "shift-k": "editor::Hover", - "shift-r": "vim::ToggleReplace", - "0": "vim::StartOfLine", - "home": "vim::StartOfLine", - "ctrl-f": "vim::PageDown", - "pagedown": "vim::PageDown", - "ctrl-b": "vim::PageUp", - "pageup": "vim::PageUp", - "ctrl-d": "vim::ScrollDown", - "ctrl-u": "vim::ScrollUp", - "ctrl-e": "vim::LineDown", - "ctrl-y": "vim::LineUp", - // "g" commands - "g g": "vim::StartOfDocument", - "g d": "editor::GoToDefinition", - "g shift-d": "editor::GoToDeclaration", - "g shift-i": "editor::GoToImplementation", - "g x": "editor::OpenUrl", - "g f": "editor::OpenFile", - "g shift-l": "vim::SelectPrevious", - "g >": ["editor::SelectNext", { "replace_newest": true }], - "g <": ["editor::SelectPrevious", { "replace_newest": true }], - "g a": "editor::SelectAllMatches", - "g shift-s": "project_symbols::Toggle", - "g .": "editor::ToggleCodeActions", // zed specific - "g shift-a": "editor::FindAllReferences", // zed specific - "g space": "editor::OpenExcerpts", // zed specific - "g *": ["vim::MoveToNext", { "partialWord": true }], - "g #": ["vim::MoveToPrev", { "partialWord": true }], - "g j": ["vim::Down", { "displayLines": true }], - "g down": ["vim::Down", { "displayLines": true }], - "g k": ["vim::Up", { "displayLines": true }], - "g up": ["vim::Up", { "displayLines": true }], - "g $": ["vim::EndOfLine", { "displayLines": true }], - "g end": ["vim::EndOfLine", { "displayLines": true }], - "g 0": ["vim::StartOfLine", { "displayLines": true }], - "g home": ["vim::StartOfLine", { "displayLines": true }], - "g ^": ["vim::FirstNonWhitespace", { "displayLines": true }], - "g v": "vim::RestoreVisualSelection", - "g ]": "editor::GoToDiagnostic", - "g [": "editor::GoToPrevDiagnostic", - "g i": "vim::InsertAtPrevious", - "g ,": "vim::ChangeListNewer", - "g ;": "vim::ChangeListOlder", - "shift-h": "vim::WindowTop", - "shift-m": "vim::WindowMiddle", - "shift-l": "vim::WindowBottom", - "q": "vim::ToggleRecord", - "shift-q": "vim::ReplayLastRecording", - "@": ["vim::PushOperator", "ReplayRegister"], - // z commands - "z enter": ["workspace::SendKeystrokes", "z t ^"], - "z -": ["workspace::SendKeystrokes", "z b ^"], - "z ^": ["workspace::SendKeystrokes", "shift-h k z b ^"], - "z +": ["workspace::SendKeystrokes", "shift-l j z t ^"], - "z t": "editor::ScrollCursorTop", - "z z": "editor::ScrollCursorCenter", - "z .": ["workspace::SendKeystrokes", "z z ^"], - "z b": "editor::ScrollCursorBottom", - "z a": "editor::ToggleFold", - "z shift-a": "editor::ToggleFoldRecursive", - "z c": "editor::Fold", - "z shift-c": "editor::FoldRecursive", - "z o": "editor::UnfoldLines", - "z shift-o": "editor::UnfoldRecursive", - "z f": "editor::FoldSelectedRanges", - "z shift-m": "editor::FoldAll", - "z shift-r": "editor::UnfoldAll", - "shift-z shift-q": ["pane::CloseActiveItem", { "saveIntent": "skip" }], - "shift-z shift-z": ["pane::CloseActiveItem", { "saveIntent": "saveAll" }], - // Count support - "1": ["vim::Number", 1], - "2": ["vim::Number", 2], - "3": ["vim::Number", 3], - "4": ["vim::Number", 4], - "5": ["vim::Number", 5], - "6": ["vim::Number", 6], - "7": ["vim::Number", 7], - "8": ["vim::Number", 8], - "9": ["vim::Number", 9], - "ctrl-w d": "editor::GoToDefinitionSplit", - "ctrl-w g d": "editor::GoToDefinitionSplit", - "ctrl-w shift-d": "editor::GoToTypeDefinitionSplit", - "ctrl-w g shift-d": "editor::GoToTypeDefinitionSplit", - "ctrl-w space": "editor::OpenExcerptsSplit", - "ctrl-w g space": "editor::OpenExcerptsSplit", - "ctrl-6": "pane::AlternateFile", - - "escape": "editor::Cancel", - "ctrl-[": "editor::Cancel", - ":": "command_palette::Toggle", - ".": "vim::Repeat", - "shift-d": "vim::DeleteToEndOfLine", - "shift-j": "vim::JoinLines", - "y": "vim::Yank", - "shift-y": "vim::YankLine", - "i": "vim::InsertBefore", - "shift-i": "vim::InsertFirstNonWhitespace", - "a": "vim::InsertAfter", - "shift-a": "vim::InsertEndOfLine", - "x": "vim::DeleteRight", - "shift-x": "vim::DeleteLeft", - "o": "vim::InsertLineBelow", - "shift-o": "vim::InsertLineAbove", - "~": "vim::ChangeCase", - "ctrl-a": "vim::Increment", - "ctrl-x": "vim::Decrement", - "p": "vim::Paste", - "shift-p": ["vim::Paste", { "before": true }], - "u": "vim::Undo", - "ctrl-r": "vim::Redo", - "r": ["vim::PushOperator", "Replace"], - "s": "vim::Substitute", - "shift-s": "vim::SubstituteLine", - ">": ["vim::PushOperator", "Indent"], - "<": ["vim::PushOperator", "Outdent"], - "=": ["vim::PushOperator", "AutoIndent"], - "g u": ["vim::PushOperator", "Lowercase"], - "g shift-u": ["vim::PushOperator", "Uppercase"], - "g ~": ["vim::PushOperator", "OppositeCase"], - "\"": ["vim::PushOperator", "Register"], - "g q": ["vim::PushOperator", "Rewrap"], - "g w": ["vim::PushOperator", "Rewrap"], - "ctrl-pagedown": "pane::ActivateNextItem", - "ctrl-pageup": "pane::ActivatePrevItem", - "insert": "vim::InsertBefore", - // tree-sitter related commands - "[ x": "editor::SelectLargerSyntaxNode", - "] x": "editor::SelectSmallerSyntaxNode", - "] d": "editor::GoToDiagnostic", - "[ d": "editor::GoToPrevDiagnostic", - "] c": "editor::GoToHunk", - "[ c": "editor::GoToPrevHunk", - // Goto mode - "g n": "pane::ActivateNextItem", - "g p": "pane::ActivatePrevItem", - // "tab": "pane::ActivateNextItem", - // "shift-tab": "pane::ActivatePrevItem", - "H": "pane::ActivatePrevItem", - "L": "pane::ActivateNextItem", - "g l": "vim::EndOfLine", - "g h": "vim::StartOfLine", - "g s": "vim::FirstNonWhitespace", // "g s" default behavior is "space s" - "g e": "vim::EndOfDocument", - "g y": "editor::GoToTypeDefinition", - "g r": "editor::FindAllReferences", // zed specific - "g t": "vim::WindowTop", - "g c": "vim::WindowMiddle", - "g b": "vim::WindowBottom", - // Window mode - "space w h": ["workspace::ActivatePaneInDirection", "Left"], - "space w l": ["workspace::ActivatePaneInDirection", "Right"], - "space w k": ["workspace::ActivatePaneInDirection", "Up"], - "space w j": ["workspace::ActivatePaneInDirection", "Down"], - "space w q": "pane::CloseActiveItem", - "space w s": "pane::SplitRight", - "space w r": "pane::SplitRight", - "space w v": "pane::SplitDown", - "space w d": "pane::SplitDown", - // Space mode - "space f": "file_finder::Toggle", - "space k": "editor::Hover", - "space s": "outline::Toggle", - "space shift-s": "project_symbols::Toggle", - "space d": "editor::GoToDiagnostic", - "space shift-d": "diagnostics::Deploy", - "space r": "editor::Rename", - "space a": "editor::ToggleCodeActions", - "space h": "editor::SelectAllMatches", - "space c": "editor::ToggleComments", - "space y": "editor::Copy", - "space p": "editor::Paste", - // Match mode - "m m": "vim::Matching", - "m i w": ["workspace::SendKeystrokes", "v i w"], - // Misc - "ctrl-k": "editor::MoveLineUp", - "ctrl-j": "editor::MoveLineDown", - // "ctrl-v": "editor::Paste", - "shift-u": "editor::Redo", - "ctrl-c": "editor::ToggleComments", - "d": "editor::Delete", // TODO: yank first - } - }, - - { - "context": "Editor && vim_mode == visual || vim_mode == helix_normal && !VimWaiting && !VimObject", - "bindings": { - "x": "editor::SelectLine" - } - }, - { - "context": "Editor && vim_mode == visual || vim_mode == helix_normal && !VimWaiting && !VimObject", - "bindings": { - "x": "editor::SelectLine" - } - }, - { - "context": "Editor && (showing_code_actions || showing_completions)", - "bindings": { - "ctrl-j": "editor::ContextMenuNext", - "ctrl-k": "editor::ContextMenuPrev" - } - }, - { - "context": "Editor && VimControl && (vim_mode == helix_normal || vim_mode == visual) && !VimWaiting && !menu", - "bindings": { - // put key-bindings here if you want them to work in normal & visual mode - } - }, - { - "context": "Editor && VimControl && vim_mode == Visual && !VimWaiting && !menu", - "bindings": { - // put key-bindings here if you want them to work only in normal mode - } - }, - { - "context": "Editor && VimControl && vim_mode == visual && !VimWaiting && !menu", - "bindings": { - "A": "vim::InsertAfter", - "i": "vim::InsertBefore", - "a": "vim::InsertAtPrevious", - // visual, visual line & visual block modes - "b": ["workspace::SendKeystrokes", "v v ctrl-shift-alt-b"], - "w": ["workspace::SendKeystrokes", "v v ctrl-shift-alt-w"], - "e": ["workspace::SendKeystrokes", "v v ctrl-shift-alt-e"], - // "w": "editor::SelectToNextWordEnd", - // "b": "editor::SelectToPreviousWordStart", - // "e": "editor::SelectToNextSubwordEnd", - ";": ["vim::SwitchMode", "Normal"], - "": "editor::SplitSelectionIntoLines", - "x": ["workspace::SendKeystrokes", "j g l"], - "C": ["workspace::SendKeystrokes", "j"] - } - }, - { - "context": "Editor && VimControl && vim_mode == insert && !menu", - "bindings": { - // put key-bindings here if you want them to work in insert mode - } - }, - { - "context": "Dock", - "bindings": { - // Window mode - "ctrl-w h": ["workspace::ActivatePaneInDirection", "Left"], - "ctrl-w l": ["workspace::ActivatePaneInDirection", "Right"], - "ctrl-w k": ["workspace::ActivatePaneInDirection", "Up"], - "ctrl-w j": ["workspace::ActivatePaneInDirection", "Down"] - } - } -] - diff --git a/share/home/dev-stuff.nix b/share/home/dev-stuff.nix index e0ba8b6..8234844 100644 --- a/share/home/dev-stuff.nix +++ b/share/home/dev-stuff.nix @@ -27,9 +27,6 @@ in man-pages man-pages-posix git - scheme-manpages - guile - racket gcc clang-tools gdb @@ -46,26 +43,13 @@ in nodejs_26 node-gyp # bun - postgresql_17 # for the CLI tools - # pgcli - podman-compose + postgresql_18 # for the CLI tools git-annex git-remote-gcrypt - # xh # Convenient HTTP client for testing - # typos typescript-language-server # duckdb - lua - lua-language-server - deno go gopls - # gleam - # erlang - # sqlx-cli - # cachix - # process-compose - # rr hexyl # radare2 xxd @@ -74,23 +58,15 @@ in typst # minisign # dotnet-sdk_10 - fossil - b3sum + # fossil + # b3sum # TUI/GUI - vscodium-fhs - dbeaver-bin + # vscodium-fhs + # dbeaver-bin ; }; - home.file.guile-init = { - target = ".guile"; - text = '' - (use-modules (ice-9 readline)) - (activate-readline) - ''; - }; - programs.git.enable = true; programs.jujutsu = { enable = true; diff --git a/share/home/gui-tools.nix b/share/home/gui-tools.nix index 1caefe4..59a7e81 100644 --- a/share/home/gui-tools.nix +++ b/share/home/gui-tools.nix @@ -13,12 +13,10 @@ qbittorrent # bittorrent client discord gimp - libreoffice-qt6-fresh + libreoffice-qt-stable haruna calibre - mullvad-vpn - ente-desktop - wireshark + # ente-desktop # Other # It seems that not all gtk icon themes contain all icons? At least the @@ -31,12 +29,12 @@ programs.firefox = { enable = true; - configPath = "${config.xdg.configHome}/mozilla/firefox"; package = pkgs.sorre.firefox; }; programs.kitty.enable = true; home.pointerCursor = { + enable = true; gtk.enable = true; package = pkgs.vanilla-dmz; name = "Vanilla-DMZ"; diff --git a/share/system/client-common.nix b/share/system/client-common.nix index 1f6f378..7906cd7 100644 --- a/share/system/client-common.nix +++ b/share/system/client-common.nix @@ -66,8 +66,6 @@ options = "--delete-older-than 7d"; }; - services.mullvad-vpn.enable = true; - virtualisation.docker = { enable = true; autoPrune.enable = true; -- cgit v1.3.1