Zander Hawke пре 1 година
родитељ
комит
0761b5f3d8

+ 2 - 0
hosts/modgud/default.nix

@@ -9,6 +9,8 @@
     outputs.modules.global.nix-config
     outputs.modules.global.nix-config
     outputs.modules.global.openssh
     outputs.modules.global.openssh
 
 
+    outputs.modules.global.users.thomas
+
     # ../common/users/thomas
     # ../common/users/thomas
     # ../common/users/thomas/authorized_keys.nix
     # ../common/users/thomas/authorized_keys.nix
     # ../common/users/thomas/groups.nix
     # ../common/users/thomas/groups.nix

+ 1 - 0
modules/global/default.nix

@@ -8,4 +8,5 @@
   locale = import ./locale.nix;
   locale = import ./locale.nix;
   nix-config = import ./nix-config.nix;
   nix-config = import ./nix-config.nix;
   openssh = import ./openssh.nix;
   openssh = import ./openssh.nix;
+  users = import ./users;
 }
 }

+ 3 - 0
modules/global/users/default.nix

@@ -0,0 +1,3 @@
+{
+  thomas = import ./thomas.nix;
+}

+ 17 - 0
modules/global/users/thomas.nix

@@ -0,0 +1,17 @@
+{ pkgs, lib, ... }:
+let
+  homeLocation = with pkgs.stdenv.hostPlatform;
+    if isDarwin then "/Users" else "/home";
+in
+{
+  imports = [
+    ../fish.nix
+  ];
+
+  environment.shells = [ pkgs.fish ];
+
+  users.users.thomas = {
+    home = lib.mkDefault "${homeLocation}/thomas";
+    shell = pkgs.fish;
+  };
+}

+ 2 - 2
users/thomas/cli/shell-aliases.nix

@@ -17,6 +17,6 @@
   drb = "nix run github:lnl7/nix-darwin -- build --flake .#(hostname)";
   drb = "nix run github:lnl7/nix-darwin -- build --flake .#(hostname)";
   drs = "nix run github:lnl7/nix-darwin -- switch --flake .#(hostname)";
   drs = "nix run github:lnl7/nix-darwin -- switch --flake .#(hostname)";
 
 
-  nrb = "nix run github:nixos/nixpkgs -- build --flake .#(hostname)";
-  nrs = "nix run github:nixos/nixpkgs -- switch --flake .#(hostname)";
+  nrb = "nixos-rebuild build --flake .#(hostname)";
+  nrs = "nixos-rebuild switch --flake .#(hostname)";
 }
 }