Merge branch 'main' of git.vatthauer.xyz:leonv/nixos

This commit is contained in:
Leon Vatthauer 2024-10-25 16:25:46 +02:00
commit 26a4a83adb
Signed by: leonv
SSH key fingerprint: SHA256:G4+ddwoZmhLPRB1agvXzZMXIzkVJ36dUYZXf5NxT+u8
4 changed files with 37 additions and 15 deletions

View file

@ -13,7 +13,20 @@
mkhl.direnv mkhl.direnv
catppuccin.catppuccin-vsc catppuccin.catppuccin-vsc
valentjn.vscode-ltex valentjn.vscode-ltex
ms-vscode.cpptools
] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ ] ++ 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"; name = "agda-mode";
publisher = "banacorn"; publisher = "banacorn";
@ -71,6 +84,7 @@
"<C-a>" = false; "<C-a>" = false;
"<C-d>" = false; "<C-d>" = false;
}; };
"C_Cpp.formatting" = "disabled";
"vim.overrideCopy" = false; "vim.overrideCopy" = false;
"window.titleBarStyle" = "custom"; "window.titleBarStyle" = "custom";
"window.customMenuBarAltFocus" = false; "window.customMenuBarAltFocus" = false;

View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728791962, "lastModified": 1729864948,
"narHash": "sha256-nr5QiXwQcZmf6/auC1UpX8iAtINMtdi2mH+OkqJQVmU=", "narHash": "sha256-CeGSqbN6S8JmzYJX/HqZjr7dMGlvHLLnJJarwB45lPs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "64c6325b28ebd708653dd41d88f306023f296184", "rev": "0c0268a3c80d30b989d0aadbd65f38d4fa27a9a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -27,11 +27,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725551787, "lastModified": 1729224425,
"narHash": "sha256-6LgsZHz8w3g4c9bRUwRAR+WIMwFGGf3P1VZQcKNRf2o=", "narHash": "sha256-w9dNUedNe2qnhHuhcRf7A1l29+/6DxdMfwN6g4U3c/w=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "contrib", "repo": "contrib",
"rev": "1e531dc49ad36c88b45bf836081a7a2c8927e072", "rev": "d72bc8b1cd30d448bd438e8328f8eeb4c0f2ddb6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -49,11 +49,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1728492678, "lastModified": 1729665710,
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -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.package = pkgs.emacs29-pgtk;
services.emacs.enable = true; services.emacs.enable = true;

View file

@ -20,17 +20,20 @@
variant = "macchiato"; variant = "macchiato";
}) })
nextcloud-client #nextcloud-client
ausweisapp #ausweisapp
godot_4 #godot_4
dotnet-runtime #dotnet-runtime
blender #blender
aseprite #aseprite
# smt solver for liquid haskell # smt solver for liquid haskell
z3 z3
# stuff # stuff
man-pages
man-pages-posix
cpplint
jq jq
vlc vlc
openvpn openvpn