From 9dad1e07cbf55f430ab6a766dd30ab94908cab00 Mon Sep 17 00:00:00 2001 From: cy Date: Mon, 10 Feb 2025 02:35:13 -0500 Subject: [PATCH 1/2] more vscode, plasma stuff, add switch to justfile --- flake.lock | 29 ++++++++++++++++++++++++++++- flake.nix | 7 +++++++ home/codium.nix | 7 +++++-- home/plasma.nix | 7 ++++++- justfile | 5 +++++ overlay/default.nix | 1 - 6 files changed, 51 insertions(+), 5 deletions(-) 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 From 84bf3863069871b32a77621b0b6828b82d3970d6 Mon Sep 17 00:00:00 2001 From: cy Date: Mon, 10 Feb 2025 09:26:07 -0500 Subject: [PATCH 2/2] flake update Signed-off-by: cy --- flake.lock | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 9076bdb..8218e71 100644 --- a/flake.lock +++ b/flake.lock @@ -623,11 +623,11 @@ ] }, "locked": { - "lastModified": 1737639419, - "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", + "lastModified": 1739186342, + "narHash": "sha256-2j+sln9RwQn+g7J4GmdFFgvqXnLkvWBNMaUzONlkzUE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", + "rev": "3bdeebbc484a09391c4f0ec8a37bb77809426660", "type": "github" }, "original": { @@ -683,11 +683,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1739035579, - "narHash": "sha256-Zc7KAA3iC5Ak9reV/peqELKXJn6rLcSZptq1Tzcx9Nc=", + "lastModified": 1739137265, + "narHash": "sha256-WejZuOso5ElVYLA/17uVw7Noqi72ZbydPwMrbqNzC0c=", "ref": "refs/heads/main", - "rev": "132d11c2d85425b7d23785ec306acb9b1d1ddba6", - "revCount": 17397, + "rev": "7d4912bcf9028db491fe1061d3efcf2392c4bd76", + "revCount": 17398, "type": "git", "url": "https://git.lix.systems/lix-project/lix" }, @@ -763,11 +763,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1739042449, - "narHash": "sha256-9zLFUpEebwhjCgtznsI61gTzefI3+fuXATHUOFzJi5w=", + "lastModified": 1739136145, + "narHash": "sha256-KgADxpdWMVevqNaxpJzlocRU+DclrFSyzvUiGFsARcQ=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "98e3666a9dc4143cbf93d957a15d749b5acef046", + "rev": "c5a3826e2bf96f3092b79415e17703a7b194e1a8", "type": "github" }, "original": { @@ -916,11 +916,11 @@ ] }, "locked": { - "lastModified": 1738573732, - "narHash": "sha256-cyUaLyn9oQp/ArxVnpyajKXFQhe+xxGCEvscAOt2Kco=", + "lastModified": 1739178399, + "narHash": "sha256-DCe+29pX+CCGCVoYWXXoHUidXI1AAmvpOfu/xHHPGVo=", "owner": "nix-community", "repo": "nix-ld", - "rev": "8fed868d17954b09421d2456afccc2e7afdee96f", + "rev": "530547e81232969a07af94dcfcfa3bfe58371812", "type": "github" }, "original": { @@ -1027,11 +1027,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1738843498, - "narHash": "sha256-7x+Q4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i+jBHE=", + "lastModified": 1739055578, + "narHash": "sha256-2MhC2Bgd06uI1A0vkdNUyDYsMD0SLNGKtD8600mZ69A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f5a32fa27df91dfc4b762671a0e0a859a8a0058f", + "rev": "a45fa362d887f4d4a7157d95c28ca9ce2899b70e", "type": "github" }, "original": { @@ -1091,11 +1091,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1739097848, - "narHash": "sha256-bbdQB0Y4mB2msqbyQ9QC+YPDZGt1evUK53AwQSyShHM=", + "lastModified": 1739184465, + "narHash": "sha256-7Z9kNbr6qZwPG1z/6Hn/re4SS9nu1krxyknyNeCBh/o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9a0b855695c31ea653181b742c65e026bada3881", + "rev": "58edd1e2acbc9be9fe29964344c6419db013141e", "type": "github" }, "original": { @@ -1313,11 +1313,11 @@ ] }, "locked": { - "lastModified": 1739068147, - "narHash": "sha256-3DtLkjQFlIUOXw3TBH+iP0jglpqO6Lv2KaQc+ADg39I=", + "lastModified": 1739154531, + "narHash": "sha256-QGeN6e0nMJlNLzm3Y2A7P6riXhQXMeCXLZ7yajZYFQM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f61820fa2c3844d6940cce269a6afdec30aa2e6c", + "rev": "035dac86ab7ce5c1e8a4d59dfe85e6911a3526ea", "type": "github" }, "original": {