Add basic services necessary for running projects
diff --git a/host/github.nix b/host/github.nix
deleted file mode 100644
index 189c262..0000000
--- a/host/github.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, ... }: {
- environment.systemPackages = [
- pkgs.gh
- ];
-}
diff --git a/host/shell.nix b/host/shell.nix
index cc2e6d5..762da08 100644
--- a/host/shell.nix
+++ b/host/shell.nix
@@ -1,13 +1,13 @@
{ pkgs, ... }: {
- users.defaultUserShell = pkgs.zsh;
+ users.defaultUserShell = pkgs.zsh;
- programs.zsh = {
- enable = true;
- ohMyZsh = [ "zsh-syntax-highlighting" "git" "git-auto-fetch" "gh" ];
- autosuggestions = {
- enable = true;
- async = true;
- };
- syntaxHighlighting.enable = true;
+ programs.zsh = {
+ enable = true;
+ ohMyZsh = [ "zsh-syntax-highlighting" "git" "git-auto-fetch" "gh" ];
+ autosuggestions = {
+ enable = true;
+ async = true;
};
+ syntaxHighlighting.enable = true;
+ };
}
diff --git a/host/users.nix b/host/users.nix
index a09372c..71dcea4 100644
--- a/host/users.nix
+++ b/host/users.nix
@@ -1,31 +1,33 @@
-{ pkgs, ... }: let
- createUser = { username, realname, founder = false, sudo = false, ... }: {
- description = realname;
- extraGroups = (
- (if founder then [ "founder" ] else []) ++
- (if founder || sudo then [ "wheel" ] else [])
- );
- isNormalUser = true;
- openssh.authorizedKeys.keyFiles = [ "./sshKeys/${username}" ];
- };
+{ pkgs, ... }:
+let
+ createUser = { username, realname, founder = false, sudo = false, ... }: {
+ description = realname;
+ extraGroups = (
+ (if founder then [ "founder" ] else [ ]) ++
+ (if founder || sudo then [ "wheel" ] else [ ])
+ );
+ isNormalUser = true;
+ openssh.authorizedKeys.keyFiles = [ "./sshKeys/${username}" ];
+ };
- users = {
- "coded" = { realname = "Sam"; founder = true; };
- "minion" = { realname = "Skyler"; founder = true; };
- "pineapplefan" = { realname = "Ash"; founder = true; };
- "eek" = { realname = "Nexus"; sudo = true; };
- };
-in {
- users = {
- mutableUsers = false;
- motd = ''
- Welcome to Clicks! Please make sure to follow all guidelines for using the server, which you can find by typing
- `guidelines` in your terminal. In particular, please remember to use this server as minimally as possible (e.g.
- by keeping as much of your work as is possible stateless and by using your personal
- "${builtins.readFile ./texts/MOTD}"
- '';
- defaultUserShell = pkgs.zsh;
- users = builtins.mapAttrs (name: value: createUser { username = name; } // value) users;
- groups = { };
- };
+ users = {
+ "coded" = { realname = "Sam"; founder = true; };
+ "minion" = { realname = "Skyler"; founder = true; };
+ "pineapplefan" = { realname = "Ash"; founder = true; };
+ "eek" = { realname = "Nexus"; sudo = true; };
+ };
+in
+{
+ users = {
+ mutableUsers = false;
+ motd = ''
+ Welcome to Clicks! Please make sure to follow all guidelines for using the server, which you can find by typing
+ `guidelines` in your terminal. In particular, please remember to use this server as minimally as possible (e.g.
+ by keeping as much of your work as is possible stateless and by using your personal
+ "${builtins.readFile ./texts/MOTD}"
+ '';
+ defaultUserShell = pkgs.zsh;
+ users = builtins.mapAttrs (name: value: createUser { username = name; } // value) users;
+ groups = { };
+ };
}