From 6d3fadd0b2ae99c9928902ebe761a3fc303b54cf Mon Sep 17 00:00:00 2001 From: Joshua Potter Date: Tue, 23 Jan 2024 20:58:09 +0000 Subject: [PATCH] Have phobos mirror more of framework. --- hive/framework/default.nix | 5 +++-- hive/phobos/default.nix | 39 +++++++++++++++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/hive/framework/default.nix b/hive/framework/default.nix index 1217b91..84a1844 100644 --- a/hive/framework/default.nix +++ b/hive/framework/default.nix @@ -119,6 +119,9 @@ xkbOptions = "ctrl:swapcaps"; }; }; + + time.timeZone = "America/Denver"; + users.users.jrpotter = { isNormalUser = true; extraGroups = [ @@ -129,8 +132,6 @@ ]; }; - time.timeZone = "America/Denver"; - virtualisation = { libvirtd.enable = true; docker.rootless = { diff --git a/hive/phobos/default.nix b/hive/phobos/default.nix index dd0e419..c900c93 100644 --- a/hive/phobos/default.nix +++ b/hive/phobos/default.nix @@ -1,4 +1,4 @@ -{ lib, system, home-manager, ... }: +{ pkgs, lib, system, home-manager, ... }: { imports = lib.optional (builtins.pathExists ./do-userdata.nix) ./do-userdata.nix ++ [ ../../digital-ocean/configuration.nix @@ -7,6 +7,32 @@ deployment.targetHost = "144.126.218.252"; + environment = { + systemPackages = with pkgs; [ + gcc + git + ((vim_configurable.override {}).customize { + name = "vim"; + vimrcConfig.customRC = '' + set nocompatible + syntax on + + set colorcolumn=80,100 + set expandtab " Spaces instead of tabs. + set list " Show hidden characters. + set listchars=tab:>\ ,trail:-,nbsp:+ + set shiftwidth=2 " # of spaces to use for each (auto)indent. + set tabstop=2 " # of spaces a in the file counts for. + ''; + }) + ]; + variables = { + EDITOR = "vim"; + }; + }; + + fonts.packages = with pkgs; [ iosevka ]; + home-manager = { useGlobalPkgs = true; useUserPackages = true; @@ -21,10 +47,14 @@ networking.hostName = "phobos"; + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + programs.mosh.enable = true; services.openssh.enable = true; + time.timeZone = "America/Denver"; + users.users.jrpotter = { isNormalUser = true; extraGroups = [ @@ -35,5 +65,12 @@ ]; }; + virtualisation.docker.rootless = { + enable = true; + # Sets the `DOCKER_HOST` variable to the rootless Docker instance for normal + # users by default. + setSocketVariable = true; + }; + system.stateVersion = "23.11"; }