diff --git a/hosts/x86_64-linux/beleth/comin.nix b/common/comin.nix similarity index 100% rename from hosts/x86_64-linux/beleth/comin.nix rename to common/comin.nix diff --git a/home/config-files/wezterm.lua b/home/config-files/wezterm.lua index 5c11f99..19606f6 100644 --- a/home/config-files/wezterm.lua +++ b/home/config-files/wezterm.lua @@ -13,7 +13,7 @@ local HOSTNAME = getHostname() config.color_scheme = "Apathy" -- config.font = wezterm.font 'Hack Nerd Font Mono' -config.font = wezterm.font 'ComicShannsMono Nerd Font Mono' +config.font = wezterm.font 'Hasklug Nerd Font Mono' if getHostname() == "lilith" or getHostname() == "alastor" then config.font_size = 15 else @@ -119,7 +119,7 @@ wezterm.on('update-status', function(window, pane) end window:set_right_status(wezterm.format { - { Text = bat .. date .. ' 🐱 |' }, + { Text = bat .. date .. '🏴 🏳️‍⚧️' }, }) end) wezterm.on('update-status', function(window, pane) diff --git a/home/modules/git.nix b/home/modules/git.nix index f10696d..8b29fc5 100644 --- a/home/modules/git.nix +++ b/home/modules/git.nix @@ -17,5 +17,6 @@ defaultBranch = "main"; }; }; + diff-so-fancy.enable = true; }; } diff --git a/home/modules/shell.nix b/home/modules/shell.nix index bb2027e..c3c9fb6 100644 --- a/home/modules/shell.nix +++ b/home/modules/shell.nix @@ -35,6 +35,10 @@ atuin = { enable = true; enableNushellIntegration = true; + settings = { + style = "compact"; + inline_height = 10; + }; }; eza.enable = true; nushell = { diff --git a/hosts/x86_64-linux/asmodeus/default.nix b/hosts/x86_64-linux/asmodeus/default.nix index f216cdd..826ecb0 100644 --- a/hosts/x86_64-linux/asmodeus/default.nix +++ b/hosts/x86_64-linux/asmodeus/default.nix @@ -37,6 +37,7 @@ ./hardware-configuration.nix ../../../common ../../antivirus.nix + ../../../common/comin.nix ../../../modules/home-manager.nix ../../gc.nix ]; diff --git a/hosts/x86_64-linux/beleth/default.nix b/hosts/x86_64-linux/beleth/default.nix index 7cc0bb7..73a82c3 100644 --- a/hosts/x86_64-linux/beleth/default.nix +++ b/hosts/x86_64-linux/beleth/default.nix @@ -7,9 +7,9 @@ with lib; { imports = [ ./hardware-configuration.nix + ../../../common/comin.nix ./monitoring.nix ./caddy.nix - ./comin.nix ./jellyfin.nix # ./factorio.nix ./calibre-web.nix diff --git a/modules/home-manager.nix b/modules/home-manager.nix index b5e4ced..735ee2d 100644 --- a/modules/home-manager.nix +++ b/modules/home-manager.nix @@ -11,6 +11,7 @@ in { config = { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; + home-manager.backupFileExtension = "hm_bak"; home-manager.extraSpecialArgs = { inherit inputs;