diff --git a/flake.nix b/flake.nix index 72db458..cfe7f69 100644 --- a/flake.nix +++ b/flake.nix @@ -70,6 +70,7 @@ useGlobalPkgs = true; useUserPackages = true; users.${user} = { imports = [ ./home/${host}.nix ]; }; + backupFileExtension = "bak"; }; } ./hosts/${host} diff --git a/home/Kell.nix b/home/Kell.nix index 2d8537e..a856fa5 100644 --- a/home/Kell.nix +++ b/home/Kell.nix @@ -32,6 +32,8 @@ in gnome-disk-utility moonlight-qt vscode + jetbrains.rider + discord ]; services.hyprpaper = { diff --git a/home/nvim/default.nix b/home/nvim/default.nix index 0165a0a..d70cb35 100644 --- a/home/nvim/default.nix +++ b/home/nvim/default.nix @@ -10,8 +10,8 @@ nodejs luarocks jre - python312Packages.pip - python312Packages.debugpy + python313Packages.pip + python313Packages.debugpy unzip dotnet-sdk_8 cargo diff --git a/home/nvim/files/lua/mappings.lua b/home/nvim/files/lua/mappings.lua index 84fc807..d159559 100644 --- a/home/nvim/files/lua/mappings.lua +++ b/home/nvim/files/lua/mappings.lua @@ -20,7 +20,7 @@ vim.keymap.set({"n", "v"}, "Y", [["+Y]]) vim.keymap.set("n", "", "", { noremap = true }) vim.keymap.set("n", "", ":noh", { noremap = true, silent = true }) vim.keymap.set("n", "gn", ":n", { noremap = true, silent = true }) -vim.keymap.set("n", "gi", ":ClangdSwitchSourceHeader", { noremap = true, silent = true }) +-- vim.keymap.set("n", "gi", ":ClangdSwitchSourceHeader", { noremap = true, silent = true }) vim.keymap.set("n", "-", function () require("oil").open() end, { desc = "Open parent directory" }) vim.keymap.set("n", "-", function () require("oil").open() end, { desc = "Open parent directory" }) vim.keymap.set("n", "g", function () require("neogit").open({kind="replace"}) end, { noremap = true, silent = true }) diff --git a/home/nvim/files/lua/plugins/blink.lua b/home/nvim/files/lua/plugins/blink.lua index 9a85834..a995cfa 100644 --- a/home/nvim/files/lua/plugins/blink.lua +++ b/home/nvim/files/lua/plugins/blink.lua @@ -12,6 +12,7 @@ return { {"p", vim.diagnostic.goto_prev}, {"f", vim.lsp.buf.code_action}, {"gd", vim.lsp.buf.definition}, + {"gi", vim.lsp.buf.implementation}, {"gr", vim.lsp.buf.references}, {"", vim.lsp.buf.hover}, {"rn", vim.lsp.buf.rename}, diff --git a/home/nvim/files/lua/plugins/dap.lua b/home/nvim/files/lua/plugins/dap.lua index 109d441..170a210 100644 --- a/home/nvim/files/lua/plugins/dap.lua +++ b/home/nvim/files/lua/plugins/dap.lua @@ -87,6 +87,9 @@ return { vim.api.nvim_create_user_command("DapCloseUI", function() ui.close() end, {}) + vim.api.nvim_create_user_command("DapToggleUI", function() + ui.toggle() + end, {}) -- dap.listeners.before.event_terminated.dapui_config = function() -- ui.close() -- end diff --git a/home/utils/desktop.nix b/home/utils/desktop.nix index b8f3f55..99a6273 100644 --- a/home/utils/desktop.nix +++ b/home/utils/desktop.nix @@ -17,7 +17,6 @@ home.packages = with pkgs; [ onlyoffice-bin telegram-desktop - webcord iwgtk element-desktop evince diff --git a/home/utils/python.nix b/home/utils/python.nix index fb4f3ba..e351e5c 100644 --- a/home/utils/python.nix +++ b/home/utils/python.nix @@ -20,16 +20,16 @@ let ]); # Darwin requires a different library path prefix wrapPrefix = if (!pkgs.stdenv.isDarwin) then "LD_LIBRARY_PATH" else "DYLD_LIBRARY_PATH"; - # pythonOverlay = (pkgs.python312.withPackages (ps: [ + # pythonOverlay = (pkgs.python313.withPackages (ps: [ # (ps.torch.override { rocmSupport = true; }) # ])); patchedpython = (pkgs.symlinkJoin { name = "python"; - paths = [ pkgs.python312 ]; + paths = [ pkgs.python313 ]; buildInputs = [ pkgs.makeWrapper ]; postBuild = '' - wrapProgram "$out/bin/python3.12" --prefix ${wrapPrefix} : "${pythonldlibpath}" + wrapProgram "$out/bin/python3.13" --prefix ${wrapPrefix} : "${pythonldlibpath}" ''; }); in {