From 295db5142842f409114ba3274cca4b1e74180aaa Mon Sep 17 00:00:00 2001 From: SeanOMik Date: Thu, 9 Mar 2023 12:37:12 -0500 Subject: [PATCH] "Go back to normal vscode" --- common.nix | 2 ++ home/seanomik/default.nix | 3 ++- home/vscode-fhs.nix | 2 +- home/{vscode-old.nix => vscode.nix} | 4 ++-- hosts/smallinux.nix | 6 ++++++ 5 files changed, 13 insertions(+), 4 deletions(-) rename home/{vscode-old.nix => vscode.nix} (98%) diff --git a/common.nix b/common.nix index b99e7c2..9e574fe 100755 --- a/common.nix +++ b/common.nix @@ -29,4 +29,6 @@ nixpkgs.overlays = [ (import "${builtins.fetchTarball { url="https://github.com/vlaci/openconnect-sso/archive/master.tar.gz"; sha256="sha256:04kwar7cxz7399bwlka6raqwq5jd27khkjdxk11k08846bkjckx5"; } }/overlay.nix") ]; + + boot.supportedFilesystems = [ "ntfs" ]; } diff --git a/home/seanomik/default.nix b/home/seanomik/default.nix index 3721af4..ffac4a5 100755 --- a/home/seanomik/default.nix +++ b/home/seanomik/default.nix @@ -32,7 +32,8 @@ ../emulators.nix - ../vscode-fhs.nix + ../vscode.nix +# ../vscode-fhs.nix ]; # Add open-in-vscode button to nemo diff --git a/home/vscode-fhs.nix b/home/vscode-fhs.nix index 597e165..dd8d8cd 100755 --- a/home/vscode-fhs.nix +++ b/home/vscode-fhs.nix @@ -2,6 +2,6 @@ { programs.vscode = { enable = true; - package = pkgs.vscode-fhsWithPackages (ps: with ps; [ rustup zlib openssl.dev pkg-config platformio python39 ]); + package = pkgs.vscode.fhsWithPackages (ps: with ps; [ rustup zlib openssl.dev pkg-config platformio python39 ]); }; } diff --git a/home/vscode-old.nix b/home/vscode.nix similarity index 98% rename from home/vscode-old.nix rename to home/vscode.nix index deff0e4..2d48e1c 100755 --- a/home/vscode-old.nix +++ b/home/vscode.nix @@ -4,8 +4,8 @@ programs.vscode = { enable = true; -# package = pkgs.vscode-fhs; - package = pkgs.vscode-fhsWithPackages (ps: with ps; [ rustup zlib openssl.dev pkg-config ]); + package = pkgs.vscode; +# package = pkgs.vscode-fhsWithPackages (ps: with ps; [ rustup zlib openssl.dev pkg-config ]); # userSettings = { # "workbench.colorTheme" = "Material Theme Ocean High Contrast"; # "tabnine.experimentalAutoImports" = "true"; diff --git a/hosts/smallinux.nix b/hosts/smallinux.nix index 8566d14..b556a8e 100755 --- a/hosts/smallinux.nix +++ b/hosts/smallinux.nix @@ -7,6 +7,12 @@ fsType = "btrfs"; }; + fileSystems."/mnt/windows_disk" = { + device = "/dev/disk/by-uuid/3402E4B102E4796E"; + fsType = "ntfs3"; + options = [ "rw" "uid=1000"]; + }; + # Other modules imports = [ ../hardware-configuration.nix