diff --git a/flake.nix b/flake.nix index fcb8537..a169fb6 100644 --- a/flake.nix +++ b/flake.nix @@ -77,7 +77,7 @@ overlay = final: prev: { - unstable = pkgs'; + #unstable = pkgs'; my = self.packages."${system}"; }; diff --git a/home-manager/users/sstent/default.nix b/home-manager/users/sstent/default.nix index 24512c5..a3d2cce 100644 --- a/home-manager/users/sstent/default.nix +++ b/home-manager/users/sstent/default.nix @@ -30,6 +30,7 @@ home.packages = with pkgs; [ autossh azure-cli + bitwarden-cli ansible # sshpass (import ./python-packages.nix { pkgs = pkgs; }) @@ -50,6 +51,7 @@ # nixos-generators nixpkgs-fmt # deploy-rs + gnumake ]; custom = { diff --git a/hosts/common.nix b/hosts/common.nix index 26d08a0..cf1e3ee 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -59,6 +59,8 @@ config = { nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; # nix.nixPath = [ "nixpkgs=pkgs.outPath" ]; + +#services.envfs.enable = true; environment.systemPackages = [ pkgs.git pkgs.home-manager diff --git a/hosts/user-sstent.nix b/hosts/user-sstent.nix index 03d5568..ba53352 100644 --- a/hosts/user-sstent.nix +++ b/hosts/user-sstent.nix @@ -9,12 +9,14 @@ users.users = { sstent = { # initialPassword = "farscape5"; + uid = 1000; passwordFile = config.sops.secrets.sstent_password.path; isNormalUser = true; openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+D4o3mL4BQsRr0UIhB1hn0brSTIJ9Lr0m2fMMVGF3tIuEihnmwGTeAX78q5/bmoo4gZy7G+CHal54S1lY8LY1KvmIDCpPJ8848HvLbTiTX3qZ7Mjaav+Ox9eHMwX+7zkPwdhfP8TDvmNe12j1GEKBhAm+FhdBQCbEV7cbm1SkX0+WBGoVvI2qbRm1RF0mOuTAmO3Lr2YeAcKJ21YxwNMv1Qrj7oxGYH9rLHLNwZ/0soIdTC9cikl4DHyvCs4HRYcVw36uuCVc/AyIT2GeETRapAQr8nzT89Haa1IThgZ9ztjSsSSOtrUhxatlMIfTIpVjl/gWq7GLfqd/ei/evTal sstent@StuPC" ]; extraGroups = [ "wheel" "video" ]; + }; }; diff --git a/modules/nixos/wsl2/default.nix b/modules/nixos/wsl2/default.nix index 4dba399..01af8d8 100644 --- a/modules/nixos/wsl2/default.nix +++ b/modules/nixos/wsl2/default.nix @@ -15,6 +15,7 @@ in { wslConf.automount.root = "/mnt"; defaultUser = "sstent"; startMenuLaunchers = true; + wslConf.interop.appendWindowsPath = false; #No longer needed in 23.05 #interop.preserveArgvZero = true; #docker-native.enable = true;