diff options
author | Katharina Fey <kookie@spacekookie.de> | 2019-10-06 10:50:06 +0000 |
---|---|---|
committer | Katharina Fey <kookie@spacekookie.de> | 2019-10-06 10:50:06 +0000 |
commit | 029100bf230606303e5669c01ffbed192d06c0fd (patch) | |
tree | b2889489ac50eef815dda9d584e74c63c9aa0321 | |
parent | e1ce40f9f7b0e74f2d2f4e2b05253a7dcdb02c40 (diff) |
module/base: fixing user group
-rw-r--r-- | modules/base/fish/config.fish | 4 | ||||
-rw-r--r-- | modules/base/fish/default.nix | 4 | ||||
-rw-r--r-- | modules/base/user.nix | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/modules/base/fish/config.fish b/modules/base/fish/config.fish index 633ccbca4fc..dbfed5b661d 100644 --- a/modules/base/fish/config.fish +++ b/modules/base/fish/config.fish @@ -2,7 +2,6 @@ set -gx PATH $HOME/.cargo/bin $PATH set -gx PATH $HOME/.local/bin $PATH set -gx PATH /usr/sbin $PATH -set -gx GRAAL_HOME ~/.local/share/graalvm/ # The o bit is a bit of a hack # umask u=rw,g=rw,o-rwx @@ -14,9 +13,6 @@ set -x SSH_AUTH_SOCK "/run/user/1000/gnupg/S.gpg-agent.ssh" # Fix some utf-8 errors set -x LC_ALL en_GB.utf8 - -# Include the nix environment -# fenv source /home/spacekookie/.nix-profile/etc/profile.d/nix.sh # Better nix-shell support! any-nix-shell fish --info-right | source diff --git a/modules/base/fish/default.nix b/modules/base/fish/default.nix index e73a0acb632..73ca2e878b3 100644 --- a/modules/base/fish/default.nix +++ b/modules/base/fish/default.nix @@ -4,6 +4,10 @@ home-manager.users.spacekookie = { ... }: { programs.fish.enable = true; programs.fish.shellInit = import ./config.nix { inherit pkgs; }; + + home.packages = [ + pkgs.any-nix-shell + ]; }; programs.fish.enable = true; diff --git a/modules/base/user.nix b/modules/base/user.nix index 73d4db62461..4983196e978 100644 --- a/modules/base/user.nix +++ b/modules/base/user.nix @@ -11,7 +11,7 @@ in description = "Katharina Fey"; home = mkDefault "/home"; uid = mkDefault 1000; - group = "qyliss"; + group = "spacekookie"; extraGroups = [ "wheel" ]; shell = lib.mkDefault pkgs.fish; }; |