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