diff --git a/flake.lock b/flake.lock index b940f4e..9076bdb 100644 --- a/flake.lock +++ b/flake.lock @@ -1285,7 +1285,8 @@ "plasma-manager": "plasma-manager", "rust-overlay": "rust-overlay", "sops-nix": "sops-nix", - "treefmt": "treefmt" + "treefmt": "treefmt", + "vscode-extensions": "vscode-extensions" } }, "rust-analyzer-src": { @@ -1395,6 +1396,32 @@ "type": "github" } }, + "vscode-extensions": { + "inputs": { + "flake-compat": [ + "flake-compat" + ], + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1739152168, + "narHash": "sha256-Zv6eGe+c5f9Chyw6O3ePJ4hbscetuzZxYShwjn3ACEs=", + "owner": "nix-community", + "repo": "nix-vscode-extensions", + "rev": "bd6b70f681b2561f53c9522be64330c7ff9d08d8", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-vscode-extensions", + "type": "github" + } + }, "xwayland-satellite-stable": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 549faac..9ef5b79 100644 --- a/flake.nix +++ b/flake.nix @@ -84,6 +84,12 @@ inputs.rust-overlay.follows = "rust-overlay"; inputs.flake-utils.follows = "flake-utils"; }; + vscode-extensions = { + url = "github:nix-community/nix-vscode-extensions"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "flake-utils"; + inputs.flake-compat.follows = "flake-compat"; + }; nvim-github-theme = { url = "github:projekt0n/github-nvim-theme"; @@ -163,6 +169,7 @@ overlays = [ inputs.niri.overlays.niri inputs.rust-overlay.overlays.default + inputs.vscode-extensions.overlays.default ] ++ (import ./overlay { inherit inputs; }); }; in diff --git a/home/codium.nix b/home/codium.nix index b1b2044..e429959 100644 --- a/home/codium.nix +++ b/home/codium.nix @@ -6,13 +6,16 @@ enableUpdateCheck = false; enableExtensionUpdateCheck = false; mutableExtensionsDir = false; - extensions = with pkgs.vscode-extensions; [ + extensions = (with pkgs.open-vsx; [ vscodevim.vim jnoortheen.nix-ide editorconfig.editorconfig github.github-vscode-theme rust-lang.rust-analyzer - ]; + ]) ++ + (with pkgs.vscode-marketplace; [ + github.codespaces + ]); userSettings = { "workbench.colorTheme" = "GitHub Dark Default"; "files.autoSave" = "afterDelay"; diff --git a/home/plasma.nix b/home/plasma.nix index facdad1..10f5399 100644 --- a/home/plasma.nix +++ b/home/plasma.nix @@ -35,7 +35,12 @@ "launch-browser" = { name = "launch browser"; key = "Meta+B"; - command = "librewolf"; + command = "chromium"; + }; + "launch-fuzzel" = { + name = "launch-fuzzel"; + key = "Meta+d"; + command = "fuzzel"; }; }; diff --git a/justfile b/justfile index 462d283..68b7e5c 100644 --- a/justfile +++ b/justfile @@ -15,3 +15,8 @@ upgrade: git switch main git merge update git branch -d update + +switch: + sudo nixos-rebuild switch -L --flake . --use-substitutes + nixos-rebuild switch -L --flake .#chunk --target-host root@2a0f:85c1:840:2bfb::1 --use-substitutes + home-manager -L switch --flake . diff --git a/overlay/default.nix b/overlay/default.nix index 910a5a4..219f1ad 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -3,7 +3,6 @@ let overlays = [ ./conduwuit ./attic - ./vscode.nix ]; importedOverlays = map (m: import m) overlays; in