Post server fs corruption

6 files changed, 12 insertions, 5 deletions

diff --git a/nix/programs/bash.nix b/nix/programs/bash.nix
index ca6b7d9..4fb9cd3 100644
--- a/nix/programs/bash.nix
+++ b/nix/programs/bash.nix
@@ -9,7 +9,7 @@
     programs.bash = {
       enable = true;
       shellAliases = {
-        cp = "rsync -avz";
+        cp = "rsync -av";
         top = "htop";
         bc = "bc -l";
         pgrep = "pgrep -f";
diff --git a/nix/programs/kitty.nix b/nix/programs/kitty.nix
index c070871..74b6c6a 100644
--- a/nix/programs/kitty.nix
+++ b/nix/programs/kitty.nix
@@ -17,7 +17,6 @@ in {
         mode = "enabled";
         enableBashIntegration = true;
       };
-      # @TODO: https://sw.kovidgoyal.net/kitty/conf/#opt-kitty.active_tab_title_template
       extraConfig = ''
         shell ${pkgs.bashInteractive}/bin/bash --login
         update_check_interval 0
@@ -41,6 +40,7 @@ in {
         cursor_trail_decay 0.075 0.425
         cursor_trail_start_threshold 3
         cursor #${colo.foreground}
+        #cursor none
         cursor_text_color background
         foreground #${colo.foreground}
         background #${colo.background}
@@ -72,6 +72,11 @@ in {
         active_border_color #${colo.color4}
         bell_border_color #${colo.color1}
         inactive_border_color #${colo.color3}
+        active_tab_foreground #${colo.background}
+        active_tab_background #${colo.color5}
+        active_tab_font_style bold-italic
+        inactive_tab_foreground #${colo.background}
+        inactive_tab_background #${colo.color4}
         url_color #${colo.color5}
         enabled_layouts splits,stack
       '';
@@ -79,12 +84,12 @@ in {
     home.file.".config/kitty/quick-access-terminal.conf".text = ''
       lines 18
       background_opacity 0.925
+      output_name ${loc.monitors.monitor1}
       kitty_override startup_session=quick-access-session.conf
       kitty_override placement_strategy=bottom-right
       kitty_override window_padding_width=0 12 8 0
     '';
     home.file.".config/kitty/quick-access-session.conf".text = ''
-      output_name ${loc.monitors.monitor1}
       layout splits
       launch --var window=main
       launch --location=vsplit --bias=17.1 /home/andrew/dl/tmp/clock/a.out
diff --git a/nix/programs/nvim.nix b/nix/programs/nvim.nix
index 5c70f35..b12ad52 100644
--- a/nix/programs/nvim.nix
+++ b/nix/programs/nvim.nix
@@ -185,7 +185,7 @@ in {
           footer_offset = ${toString s.footer-offset},
           picture = {
             path = '${s.picture}',
-            kitty = true,
+            kitty = os.getenv('TERM') == 'xterm-kitty',
             width = ${toString s.width},
             position = '${s.position}',
             padding = {
diff --git a/nix/scripts.nix b/nix/scripts.nix
index e8c63f6..c965157 100644
--- a/nix/scripts.nix
+++ b/nix/scripts.nix
@@ -21,7 +21,7 @@ in {
     '')
   ] ++ (lib.lists.forEach loc.scripts.imports (x: pkgs.writeTextFile {
     name = x;
-    text = (builtins.readFile ../scripts/${x});
+    text = (builtins.readFile ../scripts/desktop/${x});
     executable = true;
     destination = "/bin/${x}";
   }));
diff --git a/nix/system.nix b/nix/system.nix
index 5f1943e..92b95df 100644
--- a/nix/system.nix
+++ b/nix/system.nix
@@ -87,6 +87,7 @@
     appimage-run
     i2c-tools
     pciutils
+    smartmontools
     lm_sensors
     libdrm
     libva-utils
diff --git a/nix/user.nix b/nix/user.nix
index 0050182..01d6e84 100644
--- a/nix/user.nix
+++ b/nix/user.nix
@@ -108,6 +108,7 @@ in {
     "ts-date"
     "term-font-size"
     "shift-jis-zip"
+    "7z-password"
     "moonrune-charset-utf8"
     "gpg-pubkey"
     "img-fstype"