mirror of
https://github.com/Noratrieb/nixos.git
synced 2026-01-14 11:45:06 +01:00
update
This commit is contained in:
parent
6c16d90c8e
commit
6bb6294aad
3 changed files with 130 additions and 123 deletions
24
flake.lock
generated
24
flake.lock
generated
|
|
@ -28,11 +28,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1738448366,
|
||||
"narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=",
|
||||
"lastModified": 1740347597,
|
||||
"narHash": "sha256-st5q9egkPGz8TUcVVlIQX7y6G3AzHob+6M963bwVq74=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93",
|
||||
"rev": "12e26a74e5eb1a31e13daaa08858689e25ebd449",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -64,11 +64,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1738410390,
|
||||
"narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=",
|
||||
"lastModified": 1740367490,
|
||||
"narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "3a228057f5b619feb3186e986dbe76278d707b6e",
|
||||
"rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -96,11 +96,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1738142207,
|
||||
"narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=",
|
||||
"lastModified": 1740367490,
|
||||
"narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9d3ae807ebd2981d593cddd0080856873139aa40",
|
||||
"rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -117,11 +117,11 @@
|
|||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1738362438,
|
||||
"narHash": "sha256-EO2dVkMVLThWqv4hobEZEZGWBEuH2Z9SYqQDrbLSclU=",
|
||||
"lastModified": 1740420172,
|
||||
"narHash": "sha256-zT9NLRqoadbcBmW2r+wNWuSD4nr8jZbLoKRr5g06tSc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "95ddad0ff0e67c90314c6ca46324dce5f9a910d2",
|
||||
"rev": "f44d2a80e73615d5dfec70e25d1a00120c1a1c04",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
id = 0;
|
||||
name = "nora";
|
||||
|
||||
extensions = with pkgs.nur.repos.rycee.firefox-addons; [
|
||||
extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
|
||||
ublock-origin
|
||||
bitwarden
|
||||
tampermonkey
|
||||
|
|
@ -31,6 +31,10 @@
|
|||
name = "nixpkgs search";
|
||||
url = "https://search.nixos.org/packages";
|
||||
}
|
||||
{
|
||||
name = "Github Notifications";
|
||||
url = "https://github.com/notifications";
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,120 +2,123 @@
|
|||
programs.vscode = {
|
||||
enable = true;
|
||||
package = pkgs.vscode;
|
||||
enableUpdateCheck = false;
|
||||
mutableExtensionsDir = false;
|
||||
keybindings = [
|
||||
{
|
||||
key = "ctrl+[BracketRight]";
|
||||
command = "workbench.action.terminal.focus";
|
||||
when = "terminalProcessSupported";
|
||||
}
|
||||
];
|
||||
userSettings = {
|
||||
# Note: In settings.json, `.` in a key is not equivalent to a nested object property.
|
||||
# Language-specific
|
||||
"rust-analyzer.server.path" = lib.getExe' pkgs.rustup "rust-analyzer";
|
||||
"[nix]"."editor.formatOnSave" = true;
|
||||
"[nix]"."editor.defaultFormatter" = "jnoortheen.nix-ide";
|
||||
"nix.enableLanguageServer" = true;
|
||||
"nix.serverPath" = "${lib.getExe pkgs.nil}";
|
||||
"nix.serverSettings" = {
|
||||
nil = {
|
||||
formatting = {
|
||||
command = [ "${lib.getExe pkgs.nixpkgs-fmt}" ];
|
||||
profiles.default = {
|
||||
enableUpdateCheck = false;
|
||||
keybindings = [
|
||||
{
|
||||
key = "ctrl+[BracketRight]";
|
||||
command = "workbench.action.terminal.focus";
|
||||
when = "terminalProcessSupported";
|
||||
}
|
||||
];
|
||||
userSettings = {
|
||||
# Note: In settings.json, `.` in a key is not equivalent to a nested object property.
|
||||
# Language-specific
|
||||
"rust-analyzer.server.path" = lib.getExe' pkgs.rustup "rust-analyzer";
|
||||
"[nix]"."editor.formatOnSave" = true;
|
||||
"[nix]"."editor.defaultFormatter" = "jnoortheen.nix-ide";
|
||||
"nix.enableLanguageServer" = true;
|
||||
"nix.serverPath" = "${lib.getExe pkgs.nil}";
|
||||
"nix.serverSettings" = {
|
||||
nil = {
|
||||
formatting = {
|
||||
command = [ "${lib.getExe pkgs.nixpkgs-fmt}" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
"[typescript]"."editor.defaultFormatter" = "esbenp.prettier-vscode";
|
||||
"[javascript]"."editor.defaultFormatter" = "esbenp.prettier-vscode";
|
||||
"[json]"."editor.defaultFormatter" = "esbenp.prettier-vscode";
|
||||
"[jsonc]"."editor.defaultFormatter" = "esbenp.prettier-vscode";
|
||||
"[html]"."editor.defaultFormatter" = "esbenp.prettier-vscode";
|
||||
"[css]"."editor.defaultFormatter" = "esbenp.prettier-vscode";
|
||||
"[typescriptreact]"."editor.defaultFormatter" = "esbenp.prettier-vscode";
|
||||
# Generic
|
||||
"window.zoomLevel" = 1;
|
||||
"terminal.integrated.enableMultiLinePasteWarning" = false;
|
||||
"git.confirmSync" = false;
|
||||
"debug.allowBreakpointsEverywhere" = false;
|
||||
# "editor.fontFamily" = "'Monaspace Neon Var', Arial";
|
||||
"editor.fontLigatures" = true;
|
||||
"terminal.integrated.scrollback" = 5000;
|
||||
};
|
||||
"[typescript]"."editor.defaultFormatter" = "esbenp.prettier-vscode";
|
||||
"[javascript]"."editor.defaultFormatter" = "esbenp.prettier-vscode";
|
||||
"[json]"."editor.defaultFormatter" = "esbenp.prettier-vscode";
|
||||
"[jsonc]"."editor.defaultFormatter" = "esbenp.prettier-vscode";
|
||||
"[html]"."editor.defaultFormatter" = "esbenp.prettier-vscode";
|
||||
"[css]"."editor.defaultFormatter" = "esbenp.prettier-vscode";
|
||||
"[typescriptreact]"."editor.defaultFormatter" = "esbenp.prettier-vscode";
|
||||
# Generic
|
||||
"window.zoomLevel" = 1;
|
||||
"terminal.integrated.enableMultiLinePasteWarning" = false;
|
||||
"git.confirmSync" = false;
|
||||
"debug.allowBreakpointsEverywhere" = false;
|
||||
# "editor.fontFamily" = "'Monaspace Neon Var', Arial";
|
||||
"editor.fontLigatures" = true;
|
||||
"terminal.integrated.scrollback" = 5000;
|
||||
};
|
||||
extensions = with pkgs.vscode-extensions; [
|
||||
bmalehorn.vscode-fish
|
||||
dbaeumer.vscode-eslint
|
||||
eamodio.gitlens
|
||||
esbenp.prettier-vscode
|
||||
github.vscode-github-actions
|
||||
golang.go
|
||||
hashicorp.terraform
|
||||
jnoortheen.nix-ide
|
||||
timonwong.shellcheck
|
||||
mads-hartmann.bash-ide-vscode
|
||||
ms-azuretools.vscode-docker
|
||||
ms-python.python
|
||||
ms-vscode-remote.remote-ssh
|
||||
ms-vscode.cmake-tools
|
||||
ms-vscode.cpptools
|
||||
ms-vscode.hexeditor
|
||||
myriad-dreamin.tinymist
|
||||
redhat.vscode-yaml
|
||||
rust-lang.rust-analyzer
|
||||
tamasfe.even-better-toml
|
||||
tomoki1207.pdf
|
||||
usernamehw.errorlens
|
||||
vadimcn.vscode-lldb
|
||||
] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
|
||||
{
|
||||
publisher = "dtsvet";
|
||||
name = "vscode-wasm";
|
||||
version = "1.4.1";
|
||||
sha256 = "sha256-zs7E3pxf4P8kb3J+5zLoAO2dvTeepuCuBJi5s354k0I=";
|
||||
}
|
||||
{
|
||||
publisher = "redhat";
|
||||
name = "ansible";
|
||||
version = "2.7.98";
|
||||
sha256 = "sha256-b3Z40IeQbtYci2LA4/OlJkfqMB78cWRNTNWd89lfhy4=";
|
||||
}
|
||||
{
|
||||
publisher = "matthewpi";
|
||||
name = "caddyfile-support";
|
||||
version = "0.3.0";
|
||||
sha256 = "sha256-1yiOnvC2w33kiPRdQYskee38Cid/GOj9becLadP1fUY=";
|
||||
}
|
||||
{
|
||||
publisher = "evan-buss";
|
||||
name = "font-switcher";
|
||||
version = "4.1.0";
|
||||
sha256 = "sha256-KkXUfA/W73kRfs1TpguXtZvBXFiSMXXzU9AYZGwpVsY=";
|
||||
}
|
||||
{
|
||||
publisher = "polymeilex";
|
||||
name = "wgsl";
|
||||
version = "0.1.17";
|
||||
sha256 = "sha256-vGqvVrr3wNG6HOJxOnJEohdrzlBYspysTLQvWuP0QIw=";
|
||||
}
|
||||
extensions = with pkgs.vscode-extensions; [
|
||||
bmalehorn.vscode-fish
|
||||
dbaeumer.vscode-eslint
|
||||
eamodio.gitlens
|
||||
esbenp.prettier-vscode
|
||||
github.vscode-github-actions
|
||||
golang.go
|
||||
hashicorp.terraform
|
||||
jnoortheen.nix-ide
|
||||
timonwong.shellcheck
|
||||
mads-hartmann.bash-ide-vscode
|
||||
ms-azuretools.vscode-docker
|
||||
ms-python.python
|
||||
ms-vscode-remote.remote-ssh
|
||||
ms-vscode.cmake-tools
|
||||
ms-vscode.cpptools
|
||||
ms-vscode.hexeditor
|
||||
myriad-dreamin.tinymist
|
||||
redhat.vscode-yaml
|
||||
rust-lang.rust-analyzer
|
||||
tamasfe.even-better-toml
|
||||
tomoki1207.pdf
|
||||
usernamehw.errorlens
|
||||
vadimcn.vscode-lldb
|
||||
] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
|
||||
{
|
||||
publisher = "dtsvet";
|
||||
name = "vscode-wasm";
|
||||
version = "1.4.1";
|
||||
sha256 = "sha256-zs7E3pxf4P8kb3J+5zLoAO2dvTeepuCuBJi5s354k0I=";
|
||||
}
|
||||
{
|
||||
publisher = "redhat";
|
||||
name = "ansible";
|
||||
version = "2.7.98";
|
||||
sha256 = "sha256-b3Z40IeQbtYci2LA4/OlJkfqMB78cWRNTNWd89lfhy4=";
|
||||
}
|
||||
{
|
||||
publisher = "matthewpi";
|
||||
name = "caddyfile-support";
|
||||
version = "0.3.0";
|
||||
sha256 = "sha256-1yiOnvC2w33kiPRdQYskee38Cid/GOj9becLadP1fUY=";
|
||||
}
|
||||
{
|
||||
publisher = "evan-buss";
|
||||
name = "font-switcher";
|
||||
version = "4.1.0";
|
||||
sha256 = "sha256-KkXUfA/W73kRfs1TpguXtZvBXFiSMXXzU9AYZGwpVsY=";
|
||||
}
|
||||
{
|
||||
publisher = "polymeilex";
|
||||
name = "wgsl";
|
||||
version = "0.1.17";
|
||||
sha256 = "sha256-vGqvVrr3wNG6HOJxOnJEohdrzlBYspysTLQvWuP0QIw=";
|
||||
}
|
||||
|
||||
] ++ [
|
||||
((pkgs.vscode-utils.buildVscodeExtension {
|
||||
pname = "riverdelta";
|
||||
version = "0.1.0";
|
||||
src = builtins.fetchGit {
|
||||
url = "https://github.com/Noratrieb/riverdelta";
|
||||
rev = "64d81b56084d9a7663517b367b4533fb8ea83a92";
|
||||
};
|
||||
vscodeExtPublisher = "Noratrieb";
|
||||
vscodeExtName = "riverdelta";
|
||||
vscodeExtUniqueId = "Noratrieb.riverdelta";
|
||||
buildPhase = ''
|
||||
runHook preBuild;
|
||||
cd ./vscode
|
||||
runHook postBuild;
|
||||
'';
|
||||
}).overrideAttrs
|
||||
(_: { sourceRoot = null; }))
|
||||
];
|
||||
};
|
||||
|
||||
] ++ [
|
||||
((pkgs.vscode-utils.buildVscodeExtension {
|
||||
pname = "riverdelta";
|
||||
version = "0.1.0";
|
||||
src = builtins.fetchGit {
|
||||
url = "https://github.com/Noratrieb/riverdelta";
|
||||
rev = "64d81b56084d9a7663517b367b4533fb8ea83a92";
|
||||
};
|
||||
vscodeExtPublisher = "Noratrieb";
|
||||
vscodeExtName = "riverdelta";
|
||||
vscodeExtUniqueId = "Noratrieb.riverdelta";
|
||||
buildPhase = ''
|
||||
runHook preBuild;
|
||||
cd ./vscode
|
||||
runHook postBuild;
|
||||
'';
|
||||
}).overrideAttrs
|
||||
(_: { sourceRoot = null; }))
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue