diff --git a/common/vscode.nix b/common/vscode.nix index 7f9ed5a..618986c 100755 --- a/common/vscode.nix +++ b/common/vscode.nix @@ -13,7 +13,20 @@ mkhl.direnv catppuccin.catppuccin-vsc valentjn.vscode-ltex + ms-vscode.cpptools ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ + { + name = "better-cpp-syntax"; + publisher = "jeff-hykin"; + version = "1.27.1"; + sha256 = "sha256-GO/ooq50KLFsiEuimqTbD/mauQYcD/p2keHYo/6L9gw="; + } + { + name = "c-cpp-flylint"; + publisher = "jbenden"; + version = "1.15.0"; + sha256 = "sha256-k6sH0Rx4VjGmKjvCR9x/OWrxmo7+S2bvRlZi3Z9PNPw="; + } { name = "agda-mode"; publisher = "banacorn"; @@ -71,6 +84,7 @@ "" = false; "" = false; }; + "C_Cpp.formatting" = "disabled"; "vim.overrideCopy" = false; "window.titleBarStyle" = "custom"; "window.customMenuBarAltFocus" = false; diff --git a/flake.lock b/flake.lock index 4811436..5076994 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1728791962, - "narHash": "sha256-nr5QiXwQcZmf6/auC1UpX8iAtINMtdi2mH+OkqJQVmU=", + "lastModified": 1729864948, + "narHash": "sha256-CeGSqbN6S8JmzYJX/HqZjr7dMGlvHLLnJJarwB45lPs=", "owner": "nix-community", "repo": "home-manager", - "rev": "64c6325b28ebd708653dd41d88f306023f296184", + "rev": "0c0268a3c80d30b989d0aadbd65f38d4fa27a9a0", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1725551787, - "narHash": "sha256-6LgsZHz8w3g4c9bRUwRAR+WIMwFGGf3P1VZQcKNRf2o=", + "lastModified": 1729224425, + "narHash": "sha256-w9dNUedNe2qnhHuhcRf7A1l29+/6DxdMfwN6g4U3c/w=", "owner": "hyprwm", "repo": "contrib", - "rev": "1e531dc49ad36c88b45bf836081a7a2c8927e072", + "rev": "d72bc8b1cd30d448bd438e8328f8eeb4c0f2ddb6", "type": "github" }, "original": { @@ -49,11 +49,11 @@ }, "unstable": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", "type": "github" }, "original": { diff --git a/gunther/configuration.nix b/gunther/configuration.nix index d19cde0..2d36ef4 100755 --- a/gunther/configuration.nix +++ b/gunther/configuration.nix @@ -19,6 +19,11 @@ }; }; + # TODO remove once logseq is fixed + nixpkgs.config.permittedInsecurePackages = [ + "electron-27.3.11" + ]; + services.emacs.package = pkgs.emacs29-pgtk; services.emacs.enable = true; diff --git a/gunther/leonv.nix b/gunther/leonv.nix index 567a0e8..f2b35d1 100755 --- a/gunther/leonv.nix +++ b/gunther/leonv.nix @@ -20,17 +20,20 @@ variant = "macchiato"; }) - nextcloud-client - ausweisapp - godot_4 - dotnet-runtime - blender - aseprite + #nextcloud-client + #ausweisapp + #godot_4 + #dotnet-runtime + #blender + #aseprite # smt solver for liquid haskell z3 # stuff + man-pages + man-pages-posix + cpplint jq vlc openvpn