Compare commits

..

No commits in common. "1fa99855e6b2132bd434ea05955657f71e566419" and "fc1c594ca59311a76138eee0f1e585a6c1bb13d3" have entirely different histories.

3 changed files with 19 additions and 76 deletions

View file

@ -9,11 +9,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1692261000, "lastModified": 1692133626,
"narHash": "sha256-cW69c+S2hk5JMDnar/Yve+AFVIYvGc7/UeDUDrSFWE0=", "narHash": "sha256-avfejRiRuLDofwGLZPn3bWMXV+n0NkkgWFhjJiKd5fk=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "9088136d270494b3b0c8d39959da7d7facabd0ae", "rev": "3ff268e34c6531fba32b30f5954e00cc37e298fd",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -76,11 +76,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1692311310, "lastModified": 1692134936,
"narHash": "sha256-K3VAwgGl7BnoAbDp6qNoCiE2TRuF7j/3nUao57hfh6U=", "narHash": "sha256-Z68O969cioC6I3k/AFBxsuEwpJwt4l9fzwuAMUhCCs0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "53baed0863ff7df14b14444b779ddfaa80621f1a", "rev": "bfd953b2c6de4f550f75461bcc5768b6f966be10",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -92,11 +92,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1692264070, "lastModified": 1692174805,
"narHash": "sha256-WepAkIL2UcHOj7JJiaFS/vxrA9lklQHv8p+xGL+7oQ0=", "narHash": "sha256-xmNPFDi/AUMIxwgOH/IVom55Dks34u1g7sFKKebxUm0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "42c25608aa2ad4e5d3716d8d63c606063513ba33", "rev": "caac0eb6bdcad0b32cb2522e03e4002c8975c62e",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -12,7 +12,6 @@ in
ccat = "egrep -v '^\s*(#|$)'"; ccat = "egrep -v '^\s*(#|$)'";
ga = "git add"; ga = "git add";
gc = "git commit"; # interactive commit gc = "git commit"; # interactive commit
gg = "git graph";
gcm = "git commit -m"; # quick commit gcm = "git commit -m"; # quick commit
gp = "git push"; gp = "git push";
gs = "git status"; gs = "git status";

View file

@ -1,16 +1,10 @@
{ config, outputs, pkgs, lib, ... }: { { config, outputs, pkgs, lib, ... }: {
home.packages = with pkgs; [
hadolint
];
programs.vscode = { programs.vscode = {
enable = true; enable = true;
enableExtensionUpdateCheck = false; enableExtensionUpdateCheck = false;
enableUpdateCheck = false; enableUpdateCheck = false;
package = pkgs.unstable.vscode;
extensions = with pkgs.vscode-extensions; [ extensions = with pkgs.vscode-extensions; [
# extensions available as nix packages
bbenoist.nix bbenoist.nix
github.copilot github.copilot
golang.go golang.go
@ -22,45 +16,6 @@
timonwong.shellcheck timonwong.shellcheck
vscodevim.vim vscodevim.vim
yzhang.markdown-all-in-one yzhang.markdown-all-in-one
] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
# extensions from the vscode marketplace
{
name = "auto-align";
publisher = "bladnman";
version = "0.0.13";
sha256 = "sha256-N5XMHW6UadKjE29p2vevtjgqLA4QysYu2xT3njmyHLk=";
}
# copilot chat requires vscode 1.82
# {
# name = "copilot-chat";
# publisher = "github";
# version = "0.7.2023081801";
# sha256 = "sha256-4n28k0pqHEluL7mbsTfMMkePfRK5U5MzMNhLTRogoVY=";
# }
{
name = "hadolint";
publisher = "exiasr";
version = "1.1.2";
sha256 = "sha256-6GO1f8SP4CE8yYl87/tm60FdGHqHsJA4c2B6UKVdpgM=";
}
{
name = "hcl";
publisher = "hashicorp";
version = "0.3.2";
sha256 = "sha256-cxF3knYY29PvT3rkRS8SGxMn9vzt56wwBXpk2PqO0mo=";
}
{
name = "jinjahtml";
publisher = "samuelcolvin";
version = "0.20.0";
sha256 = "sha256-wADL3AkLfT2N9io8h6XYgceKyltJCz5ZHZhB14ipqpM=";
}
{
name = "markdown-table-prettify";
publisher = "darkriszty";
version = "3.6.0";
sha256 = "sha256-FZTiNGSY+8xk3DJsTKQu4AHy1UFvg0gbrzPpjqRlECI=";
}
]; ];
keybindings = [ keybindings = [
{ {
@ -125,16 +80,6 @@
} }
]; ];
userSettings = { userSettings = {
"autoalign.moveableItems" = [
"="
":"
"+="
"-="
];
"autoalign.nonMoveableItemsAdditional" = [
"ks="
"ds="
];
"diffEditor.ignoreTrimWhitespace" = false; "diffEditor.ignoreTrimWhitespace" = false;
"editor.acceptSuggestionOnCommitCharacter" = false; "editor.acceptSuggestionOnCommitCharacter" = false;
"editor.acceptSuggestionOnEnter" = "off"; "editor.acceptSuggestionOnEnter" = "off";
@ -146,7 +91,6 @@
"editor.tabCompletion" = "off"; "editor.tabCompletion" = "off";
"editor.tabSize" = 2; "editor.tabSize" = 2;
"explorer.confirmDragAndDrop" = false; "explorer.confirmDragAndDrop" = false;
"extensions.autoCheckUpdates" = false;
"files.hotExit" = "onExitAndWindowClose"; "files.hotExit" = "onExitAndWindowClose";
"files.trimTrailingWhitespace" = true; "files.trimTrailingWhitespace" = true;
"git.confirmSync" = false; "git.confirmSync" = false;
@ -164,23 +108,23 @@
}; };
"powershell.promptToUpdatePowerShell" = false; "powershell.promptToUpdatePowerShell" = false;
"security.workspace.trust.untrustedFiles" = "open"; "security.workspace.trust.untrustedFiles" = "open";
"update.mode" = "none"; "vim.statusBarColorControl" = true;
"vim.useCtrlKeys" = false;
"window.restoreWindows" = "none";
"workbench.startupEditor" = "none";
"workbench.colorCustomizations" = {
"statusBar.background" = "#005f5f";
"statusBar.debuggingBackground" = "#005f5f";
"statusBar.noFolderBackground" = "#005f5f";
};
"vim.normalModeKeyBindings" = [ "vim.normalModeKeyBindings" = [
{ {
"after" = ["@q"]; "after" = ["@q"];
"before" = ["Q"]; "before" = ["Q"];
} }
]; ];
"vim.statusBarColorControl" = true;
"vim.useCtrlKeys" = false;
"window.restoreWindows" = "none";
"workbench.colorCustomizations" = {
"statusBar.background" = "#005f5f";
"statusBar.debuggingBackground" = "#005f5f";
"statusBar.noFolderBackground" = "#005f5f";
};
"workbench.startupEditor" = "none";
}; };
}; };
} }