diff --git a/flake.lock b/flake.lock index 697a926..048076d 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "filter": { "locked": { - "lastModified": 1694857738, - "narHash": "sha256-bxxNyLHjhu0N8T3REINXQ2ZkJco0ABFPn6PIe2QUfqo=", + "lastModified": 1705332318, + "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", "owner": "numtide", "repo": "nix-filter", - "rev": "41fd48e00c22b4ced525af521ead8792402de0ea", + "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", "type": "github" }, "original": { @@ -18,11 +18,27 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -36,11 +52,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -72,11 +88,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -90,11 +106,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -110,11 +126,11 @@ ] }, "locked": { - "lastModified": 1702814678, - "narHash": "sha256-zDtO0jV2QLoddUJinLlTQrQqCUW3dPiIWOSYgg98T7E=", + "lastModified": 1705273357, + "narHash": "sha256-JAlkxgJbWh7+auiT0rJL3IUXXtkULRqygfxQA6mvLgc=", "owner": "nix-community", "repo": "home-manager", - "rev": "1488651d02c1a7a15e284210f0d380a62d8d8cef", + "rev": "924d91e1e4c802fd8e60279a022dbae5acb36f2d", "type": "github" }, "original": { @@ -131,11 +147,11 @@ ] }, "locked": { - "lastModified": 1694102001, - "narHash": "sha256-vky6VPK1n1od6vXbqzOXnekrQpTL4hbPAwUhT5J9c9E=", + "lastModified": 1703887061, + "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "9e21c80adf67ebcb077d75bd5e7d724d21eeafd6", + "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", "type": "github" }, "original": { @@ -161,13 +177,35 @@ "type": "github" } }, + "nix-ld-rs": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1699781621, + "narHash": "sha256-l8OMloSbDyjIb9yVeD10M7aK7qDCVMt3huBztihrbwM=", + "owner": "nix-community", + "repo": "nix-ld-rs", + "rev": "5806f307048a9ae9e3e88cc48006d4d0b2df4410", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-ld-rs", + "type": "github" + } + }, "nixos-hardware": { "locked": { - "lastModified": 1696614066, - "narHash": "sha256-nAyYhO7TCr1tikacP37O9FnGr2USOsVBD3IgvndUYjM=", + "lastModified": 1705312285, + "narHash": "sha256-rd+dY+v61Y8w3u9bukO/hB55Xl4wXv4/yC8rCGVnK5U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "bb2db418b616fea536b1be7f6ee72fb45c11afe0", + "rev": "bee2202bec57e521e3bd8acd526884b9767d7fa0", "type": "github" }, "original": { @@ -178,18 +216,18 @@ }, "nixos-wsl": { "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1696239710, - "narHash": "sha256-Ps7zIKYGT7TEi9JrG1fV9cdUY5X6hmaidUcTaEDxPO4=", + "lastModified": 1705315256, + "narHash": "sha256-WZsP/+HKz0hc0JHc8gR3E+/SRdaNOsuVr0VzjKpBqm4=", "owner": "nix-community", "repo": "nixos-wsl", - "rev": "337edef90c8abe35b42e95aecf510a063dad02dd", + "rev": "7ec7609b16ced598e30b6a4c85aa40254c92967f", "type": "github" }, "original": { @@ -200,11 +238,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702914177, - "narHash": "sha256-jdl4G81clnCQIWomhzajrGaLldkzUHV5LfVVAWb4bB4=", + "lastModified": 1705346841, + "narHash": "sha256-eN0J4Ohnwpt2LAp1jRfJOLFXAN3Azf0Qnv9VI2Qb2/Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9de4582e66797e748798e5c61ce968e3b6519945", + "rev": "fc392ddd75f20810cdf9cb6149d8283d4604d10a", "type": "github" }, "original": { @@ -216,11 +254,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1696123266, - "narHash": "sha256-S6MZEneQeE4M/E/C8SMnr7B7oBnjH/hbm96Kak5hAAI=", + "lastModified": 1705033721, + "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dbe90e63a36762f1fbde546e26a84af774a32455", + "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea", "type": "github" }, "original": { @@ -232,11 +270,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1696375444, - "narHash": "sha256-Sv0ICt/pXfpnFhTGYTsX6lUr1SljnuXWejYTI2ZqHa4=", + "lastModified": 1705133751, + "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "81e8f48ebdecf07aab321182011b067aafc78896", + "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", "type": "github" }, "original": { @@ -248,11 +286,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1695978539, - "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=", + "lastModified": 1704842529, + "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bd9b686c0168041aea600222be0805a0de6e6ab8", + "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", "type": "github" }, "original": { @@ -262,20 +300,6 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1682134069, - "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fd901ef4bf93499374c5af385b2943f5801c0833", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "root": { "inputs": { "filter": "filter", @@ -283,13 +307,13 @@ "home-manager": "home-manager", "ignore": "ignore", "library": "library", + "nix-ld-rs": "nix-ld-rs", "nixos-hardware": "nixos-hardware", "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix", - "utils": "utils", - "vscode-server": "vscode-server" + "utils": "utils" } }, "sops-nix": { @@ -298,11 +322,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1696320910, - "narHash": "sha256-fbuEc6wylH+0VxG48lhPBK+SQJHfo2lusUwWHZNipIM=", + "lastModified": 1705201153, + "narHash": "sha256-y0/a4IMDZrc7lAkR7Gcm5R3W2iCBiARHnYZe6vkmiNE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "746c7fa1a64c1671a4bf287737c27fdc7101c4c2", + "rev": "70dd0d521f7849338e487a219c1a07c429a66d77", "type": "github" }, "original": { @@ -373,7 +397,7 @@ }, "utils": { "inputs": { - "flake-utils": "flake-utils_3" + "flake-utils": "flake-utils_4" }, "locked": { "lastModified": 1696331477, @@ -388,25 +412,6 @@ "repo": "flake-utils-plus", "type": "github" } - }, - "vscode-server": { - "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1684517665, - "narHash": "sha256-SaAr66uCQ8CF75jIr23FZjk1+9Kfwm5sQnwV25206Gs=", - "owner": "msteen", - "repo": "nixos-vscode-server", - "rev": "1e1358493df6529d4c7bc4cc3066f76fd16d4ae6", - "type": "github" - }, - "original": { - "owner": "msteen", - "repo": "nixos-vscode-server", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 9e94135..c6e7cc4 100644 --- a/flake.nix +++ b/flake.nix @@ -27,9 +27,13 @@ }; sops-nix.url = github:Mic92/sops-nix; flake-utils.url = "github:numtide/flake-utils"; - # nix.url = "github:NixOS/nix/2.12.0"; - vscode-server.url = "github:msteen/nixos-vscode-server"; + nix-ld-rs = { + inputs.nixpkgs.follows = "nixpkgs"; + url = "github:nix-community/nix-ld-rs"; + }; + # nix.url = "github:NixOS/nix/2.12.0"; + # vscode-server.url = "github:msteen/nixos-vscode-server"; # homeage = {url = "github:jordanisaacs/homeage"; inputs.nixpkgs.follows = "nixpkgs";}; # Nix Library Functions library = { @@ -91,8 +95,9 @@ import ./shell.nix {inherit pkgs;}; overlay = final: prev: { - #unstable = pkgs'; + unstable = pkgs'; my = self.packages."${system}"; + keybase = pkgs'.keybase; }; overlays = import ./overlays {inherit inputs;}; diff --git a/home-manager/global.nix b/home-manager/global.nix index e8e36fc..8568ab0 100644 --- a/home-manager/global.nix +++ b/home-manager/global.nix @@ -10,7 +10,7 @@ [ # ./beets.nix # ./keybase.nix - "${inputs.vscode-server}/modules/vscode-server/home.nix" + # "${inputs.vscode-server}/modules/vscode-server/home.nix" ] ++ (builtins.attrValues outputs.homeManagerModules); @@ -53,9 +53,9 @@ }; ##VSCode - services.vscode-server.enable = true; - services.vscode-server.enableFHS = true; - services.vscode-server.nodejsPackage = pkgs.nodejs-18_x; + # services.vscode-server.enable = true; + # services.vscode-server.enableFHS = true; + # services.vscode-server.nodejsPackage = pkgs.nodejs-18_x; programs = { home-manager.enable = true; diff --git a/home-manager/users/sstent/default.nix b/home-manager/users/sstent/default.nix index aa4fb6f..4779638 100644 --- a/home-manager/users/sstent/default.nix +++ b/home-manager/users/sstent/default.nix @@ -4,6 +4,7 @@ lib, config, pkgs, + #unstable, hostName, ... }: { @@ -62,8 +63,8 @@ nixpkgs-fmt # deploy-rs gnumake - # beets-originquery - ]; + unstable.keybase +]; custom = { ssh-proxy.enable = false; diff --git a/modules/nixos/mnt_public/default.nix b/modules/nixos/mnt_public/default.nix index 165b359..acef760 100644 --- a/modules/nixos/mnt_public/default.nix +++ b/modules/nixos/mnt_public/default.nix @@ -15,7 +15,7 @@ in { device = "//192.168.1.109/Public"; fsType = "cifs"; # options = ["uid=0,gid=1000"]; - options = ["guest" "uid=1000"]; + options = ["guest" "uid=1000" "iocharset=utf8"]; }; }; } diff --git a/modules/nixos/wsl2/default.nix b/modules/nixos/wsl2/default.nix index 7f66d7a..814bc32 100644 --- a/modules/nixos/wsl2/default.nix +++ b/modules/nixos/wsl2/default.nix @@ -15,12 +15,38 @@ in { # Enable native Docker support virtualisation.docker.enable = true; + wsl.extraBin = [ + # Required by VS Code's Remote WSL extension + # Required by VS Code's Remote WSL extension + { src = "${pkgs.coreutils}/bin/dirname"; } + { src = "${pkgs.coreutils}/bin/readlink"; } + { src = "${pkgs.coreutils}/bin/uname"; } + { src = "${pkgs.coreutils}/bin/mkdir"; } + { src = "${pkgs.coreutils}/bin/rm"; } + { src = "${pkgs.coreutils}/bin/wc"; } + { src = "${pkgs.coreutils}/bin/date"; } + { src = "${pkgs.coreutils}/bin/mv"; } + { src = "${pkgs.coreutils}/bin/sleep"; } + { src = "${pkgs.gnutar}/bin/tar"; } + { src = "${pkgs.gzip}/bin/gzip"; } + ]; + programs.nix-ld = { + enable = true; + libraries = [ + # Required by NodeJS installed by VS Code's Remote WSL extension + pkgs.stdenv.cc.cc + ]; + + # Use `nix-ld-rs` instead of `nix-ld`, because VS Code's Remote WSL extension launches a non-login non-interactive shell, which is not supported by `nix-ld`, while `nix-ld-rs` works in non-login non-interactive shells. + package = inputs.nix-ld-rs.packages.${pkgs.system}.nix-ld-rs; + }; + wsl = { enable = true; wslConf.automount.root = "/mnt"; defaultUser = "sstent"; startMenuLaunchers = true; - wslConf.interop.appendWindowsPath = false; + # wslConf.interop.appendWindowsPath = false; #No longer needed in 23.05 #interop.preserveArgvZero = true; # docker-native.enable = true;