feat: remove vscode flatpak in favour of native package, due to too many issues

Tomaszal · Tomaszal · commit f2c10adc204e · 2024-03-26T22:50:38.000Z
flathub/com.visualstudio.code#56 flathub/com.visualstudio.code#427 flathub/com.visualstudio.code#428 flathub/com.visualstudio.code#476
diff --git a/src/flatpak/packages/default.nix b/src/flatpak/packages/default.nix
@@ -1,6 +1,5 @@
 {
   imports = [
-    ./vscode
     ./wayland.nix
   ];
 
diff --git a/src/flatpak/packages/vscode/default.nix b/src/flatpak/packages/vscode/default.nix
diff --git a/src/flatpak/packages/vscode/flatpak-entrypoint.patch b/src/flatpak/packages/vscode/flatpak-entrypoint.patch
diff --git a/src/gnome.nix b/src/gnome.nix
@@ -8,6 +8,8 @@
     desktopManager.gnome.enable = true;
   };
 
+  environment.sessionVariables.NIXOS_OZONE_WL = "1";
+
   environment.systemPackages =
     [pkgs.gnome.gnome-tweaks]
     ++ (with pkgs.gnomeExtensions; [
diff --git a/src/nixos.nix b/src/nixos.nix
@@ -29,6 +29,7 @@
           ./state-version.nix
           ./udisks.nix
           ./user.nix
+          ./vscode.nix
           ./zsh.nix
         ];
       };
diff --git a/src/vscode.nix b/src/vscode.nix
@@ -0,0 +1,4 @@
+{
+  allowUnfreePackages = ["vscode"];
+  hm.programs.vscode.enable = true;
+}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  allowUnfreePackages = ["vscode"];
 +  hm.programs.vscode.enable = true;
 +}