From e9b4268ffea68614b6d7e0f6597e82c43162dca0 Mon Sep 17 00:00:00 2001 From: Tyler Starr Date: Fri, 3 Nov 2023 20:25:40 -0700 Subject: [PATCH] some changes for combination with bulwark --- home/bin/executable_linux-backup-kestrel | 2 ++ home/dot_config/sway/config.tmpl | 4 ++-- provision/hosts/kestrel/home-configuration.nix | 7 +++++++ provision/modules/desktop/sway.nix | 1 + provision/modules/devel/tooling.nix | 1 + provision/modules/system/backup.nix | 9 +++++++++ provision/modules/system/default.nix | 2 +- 7 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 provision/modules/system/backup.nix diff --git a/home/bin/executable_linux-backup-kestrel b/home/bin/executable_linux-backup-kestrel index 12751816..1167d1ee 100644 --- a/home/bin/executable_linux-backup-kestrel +++ b/home/bin/executable_linux-backup-kestrel @@ -6,4 +6,6 @@ borg create \ --progress \ --exclude "$HOME/.?*" \ --exclude "$HOME/mnt" \ + --exclude "$HOME/tmp" \ + --exclude "$HOME/media/roms" \ "$HOME/mnt/engi/backup/borg-kestrel::kestrel-${datetime}" "$HOME" diff --git a/home/dot_config/sway/config.tmpl b/home/dot_config/sway/config.tmpl index 486a4799..bd250946 100644 --- a/home/dot_config/sway/config.tmpl +++ b/home/dot_config/sway/config.tmpl @@ -7,8 +7,8 @@ set $HOME /home/{{ .user }} -set $DISP_SEC DP-2 -set $DISP_PRI HDMI-A-1 +set $DISP_PRI DP-2 +set $DISP_SEC HDMI-A-1 set $BOR_WIDTH 3 set $GAP_INNER 3 diff --git a/provision/hosts/kestrel/home-configuration.nix b/provision/hosts/kestrel/home-configuration.nix index 49d7ea3c..fac29a0f 100644 --- a/provision/hosts/kestrel/home-configuration.nix +++ b/provision/hosts/kestrel/home-configuration.nix @@ -4,6 +4,13 @@ home.homeDirectory = "/home/${user}"; programs.home-manager.enable = true; + # Setup direnv + programs.direnv = { + enable = true; + enableBashIntegration = true; + nix-direnv.enable = true; + }; + # Setup git programs.git = { enable = true; diff --git a/provision/modules/desktop/sway.nix b/provision/modules/desktop/sway.nix index adeabdec..a47f6164 100644 --- a/provision/modules/desktop/sway.nix +++ b/provision/modules/desktop/sway.nix @@ -60,6 +60,7 @@ in { udiskie p7zip pavucontrol + borgbackup ] ++ [ pkgs-unstable.ungoogled-chromium ]; diff --git a/provision/modules/devel/tooling.nix b/provision/modules/devel/tooling.nix index ec3c8433..aff4f877 100644 --- a/provision/modules/devel/tooling.nix +++ b/provision/modules/devel/tooling.nix @@ -13,6 +13,7 @@ in { gcc coreutils gnumake + go ]; }; } diff --git a/provision/modules/system/backup.nix b/provision/modules/system/backup.nix new file mode 100644 index 00000000..202e7b73 --- /dev/null +++ b/provision/modules/system/backup.nix @@ -0,0 +1,9 @@ +{ config, lib, pkgs, user, ... }: + +let cfg = config.modules.system.backup; +in { + options.modules.system.backup.enable = lib.mkEnableOption "backup"; + config = lib.mkIf cfg.enable { + }; + +} diff --git a/provision/modules/system/default.nix b/provision/modules/system/default.nix index 9abd35a0..9a7b5865 100644 --- a/provision/modules/system/default.nix +++ b/provision/modules/system/default.nix @@ -1,4 +1,4 @@ { ... }: { - imports = [ ./wireguard-client.nix ./terminal.nix ./ssh.nix ]; + imports = [ ./backup.nix ./wireguard-client.nix ./terminal.nix ./ssh.nix ]; }