diff --git a/flake.lock b/flake.lock index b26b3d6..5faad54 100755 --- a/flake.lock +++ b/flake.lock @@ -2,7 +2,7 @@ "nodes": { "emacs": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable" }, @@ -44,6 +44,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -64,11 +80,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -96,6 +112,24 @@ } }, "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { "locked": { "lastModified": 1637014545, "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", @@ -130,6 +164,28 @@ "type": "github" } }, + "nix-vscode-extensions": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709428697, + "narHash": "sha256-NpXo8PhCG1lg731w9/7mn31zRG5ie2UwEg+QpjTSO/8=", + "owner": "nix-community", + "repo": "nix-vscode-extensions", + "rev": "ad19653822c4b9499b47a9c6a399ae5a7dc1b319", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-vscode-extensions", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1708091350, @@ -147,8 +203,8 @@ }, "nixos-wsl": { "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] @@ -207,7 +263,7 @@ "nixpkgs-fmt": { "inputs": { "fenix": "fenix", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs-f2k", "nixpkgs" @@ -329,6 +385,7 @@ "root": { "inputs": { "home-manager": "home-manager", + "nix-vscode-extensions": "nix-vscode-extensions", "nixos-hardware": "nixos-hardware", "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs", @@ -382,6 +439,21 @@ "repo": "default", "type": "github" } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 247544d..f025e0b 100755 --- a/flake.nix +++ b/flake.nix @@ -11,6 +11,10 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + nix-vscode-extensions = { + url = "github:nix-community/nix-vscode-extensions"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nixos-hardware.url = "github:nixos/nixos-hardware"; nixpkgs-f2k.url = "github:moni-dz/nixpkgs-f2k"; nur.url = "github:nix-community/nur"; diff --git a/hosts/canopus/default.nix b/hosts/canopus/default.nix index 447fc37..ba87e38 100755 --- a/hosts/canopus/default.nix +++ b/hosts/canopus/default.nix @@ -17,6 +17,7 @@ outputs.overlays.modifications outputs.overlays.unstable-packages outputs.overlays.nur + outputs.overlays.nix-vscode-extensions ]; config = { diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index d8cf426..a345dd0 100755 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -29,6 +29,7 @@ outputs.overlays.modifications outputs.overlays.unstable-packages outputs.overlays.nur + outputs.overlays.nix-vscode-extensions ]; config = { diff --git a/modules/home-manager/vs-code/default.nix b/modules/home-manager/vs-code/default.nix index 7f39936..b65236f 100644 --- a/modules/home-manager/vs-code/default.nix +++ b/modules/home-manager/vs-code/default.nix @@ -27,37 +27,44 @@ ]; userSettings = { - "window.zoomLevel" = 1; - "workbench.colorTheme" = "Gruvbox Dark Hard"; + "window.zoomLevel" = 2; + "window.menuBarVisibility" = "toggle"; - "editor" = { - "fontFamily" = "FiraCode NF, FiraCode Nerd Font"; - "fontLigatures" = true; - }; + "workbench.colorTheme" = "Poimandres Alternate"; + "workbench.startupEditor" = "none"; + + "editor.fontFamily" = "FiraCode NF, FiraCode Nerd Font"; + "editor.fontLigatures" = true; + "editor.cursorBlinking" = "smooth"; + "editor.minimap.enabled" = false; "terminal.integrated.fontFamily" = "FiraCode NF, FiraCode Nerd Font , FiraCode"; }; - extensions = with pkgs.vscode-extensions; [ - wakatime.vscode-wakatime - ms-dotnettools.csharp - naumovs.color-highlight - ms-vscode-remote.remote-containers - ms-azuretools.vscode-docker - mikestead.dotenv - golang.go - jdinhlife.gruvbox - wix.vscode-import-cost - sumneko.lua - yzhang.markdown-all-in-one - jnoortheen.nix-ide - esbenp.prettier-vscode - prisma.prisma - ms-python.python - ms-vscode-remote.remote-ssh - humao.rest-client - bradlc.vscode-tailwindcss - gruntfuggly.todo-tree - ]; + extensions = + (with pkgs.vscode-extensions; [ + wakatime.vscode-wakatime + ms-dotnettools.csharp + naumovs.color-highlight + ms-vscode-remote.remote-containers + ms-azuretools.vscode-docker + mikestead.dotenv + golang.go + wix.vscode-import-cost + sumneko.lua + yzhang.markdown-all-in-one + jnoortheen.nix-ide + esbenp.prettier-vscode + prisma.prisma + ms-python.python + ms-vscode-remote.remote-ssh + humao.rest-client + bradlc.vscode-tailwindcss + gruntfuggly.todo-tree + ]) + ++ (with pkgs.vscode-marketplace; [ + danielpriestley.poimandres-alternate + pufferbommy.pretty-poimandres + ]); }; } diff --git a/overlays/default.nix b/overlays/default.nix index d6aaade..b1b310f 100755 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -24,4 +24,6 @@ }; nur = inputs.nur.overlay; + + nix-vscode-extensions = inputs.nix-vscode-extensions.overlays.default; }