m

5 files changed, 20 insertions, 15 deletions

diff --git a/hosts/local/gui.nix b/hosts/local/gui.nix
index cf6beff..4de3358 100644
--- a/hosts/local/gui.nix
+++ b/hosts/local/gui.nix
@@ -3,9 +3,10 @@
   pkgs,
   ...
 }: let
-  spkgs = import inputs.nixstaging {
-    system = pkgs.system;
-  };
+  # spkgs = import inputs.nixstaging {
+  #   system = pkgs.system;
+  # };
+  _lol = "lmao";
 in {
   environment.systemPackages = with pkgs; [
     pavucontrol
@@ -47,7 +48,7 @@ in {
     wineWowPackages.staging
     dosbox
     siyuan
-    inputs.zen-browser.packages.${pkgs.system}.default
+    # inputs.zen-browser.packages.${pkgs.system}.default
     qimgv
     # inputs.quickshell.packages.${pkgs.system}.default
     # chat
@@ -60,6 +61,7 @@ in {
     #
     xorg.xhost
     gparted
+    zed-editor
   ];
 
   i18n.inputMethod = {
@@ -71,7 +73,7 @@ in {
       fcitx5-gtk
       libsForQt5.fcitx5-qt
       fcitx5-lua
-      fcitx5-configtool
+      qt6Packages.fcitx5-configtool
       fcitx5-rime
     ];
   };
diff --git a/hosts/local/niri.nix b/hosts/local/niri.nix
index ee5fae2..042fff9 100644
--- a/hosts/local/niri.nix
+++ b/hosts/local/niri.nix
@@ -15,7 +15,7 @@
     enable32Bit = true;
     extraPackages = [
       pkgs.mesa
-      pkgs.vaapiVdpau
+      pkgs.libva-vdpau-driver
       pkgs.libvdpau-va-gl
     ];
   };
@@ -169,15 +169,11 @@
         inconsolata # monospaced
         noto-fonts
         noto-fonts-cjk-sans
-        noto-fonts-emoji
-        noto-fonts-extra
+        noto-fonts-color-emoji
         powerline-fonts
-        source-han-sans-japanese
-        source-han-sans-korean
-        source-han-sans-simplified-chinese
-        source-han-sans-traditional-chinese
+        source-han-sans
         source-sans-pro
-        ubuntu_font_family
+        ubuntu-classic
         wqy_microhei
         wqy_zenhei
       ]
diff --git a/hosts/local/sway.nix b/hosts/local/sway.nix
index 30834c3..af00969 100644
--- a/hosts/local/sway.nix
+++ b/hosts/local/sway.nix
@@ -12,7 +12,7 @@
     enable32Bit = true;
     extraPackages = [
       pkgs.mesa
-      pkgs.vaapiVdpau
+      pkgs.libva-vdpau-driver
       pkgs.libvdpau-va-gl
     ];
   };
diff --git a/hosts/pkgs.nix b/hosts/pkgs.nix
index 22ca094..f496128 100644
--- a/hosts/pkgs.nix
+++ b/hosts/pkgs.nix
@@ -23,8 +23,9 @@
       nvitop
       rlwrap
       bat
-      gitAndTools.gitFull
+      gitFull
       lazygit
+      tig
       git-lfs
       lsd
       lsof
@@ -40,6 +41,11 @@
       pigz
       rclone
       socat
+      fd
+      jujutsu
+      zoxide
+      delta
+      httpie
       # files/disk
       nnn
       ranger
diff --git a/hosts/users.nix b/hosts/users.nix
index a016642..7bfe0bf 100644
--- a/hosts/users.nix
+++ b/hosts/users.nix
@@ -16,6 +16,7 @@
     sourceit = ". (sed 's/^/export /' .env | psub)";
     sqlite = "rlwrap sqlite3";
     # rsyn = "rsync -zuvaP --filter=':- .gitignore'"
+    rsyn = "rsync -vhraP --include='**.gitignore' --filter=':- .gitignore' --delete-after";
   };
 in {
   programs.fish = {