much improvement

home/programs/desktop/niri/override-config.nix

@@ -44,11 +44,7 @@ let
           }
       }
       layer-rule {
-          match namespace="noctalia-*"
-          exclude namespace="noctalia-bar-exclusion*"
-          exclude namespace="noctalia-desktop*"
-          exclude namespace="noctalia-osd*"
-          exclude namespace="noctalia-notifications*"
+          match namespace="^noctalia-(background|launcher-overlay|dock)-.*$"
           background-effect {
               xray false
               blur true

home/programs/desktop/noctalia.nix

@@ -30,9 +30,11 @@
       setupCompleted = true;
       bar = {
         density = "comfortable";
-        floating = false;
+        floating = true;
         showCapsule = true;
         outerCorners = true;
+        marginVertical = 6;
+        marginHorizontal = 6;
         widgets = {
           center = [
             {
@@ -92,14 +94,47 @@
           ];
         };
       };
+      controlCenter.cards = [
+        {
+          enabled = true;
+          id = "profile-card";
+        }
+        {
+          enabled = true;
+          id = "shortcuts-card";
+        }
+        {
+          enabled = true;
+          id = "audio-card";
+        }
+        {
+          enabled = true;
+          id = "brightness-card";
+        }
+        {
+          enabled = true;
+          id = "weather-card";
+        }
+        {
+          enabled = true;
+          id = "media-sysmon-card";
+        }
+      ];
+      idle = {
+        enabled = true;
+        screenOffTimeout = 500;
+        lockTimeout = 560;
+        suspendTimeout = 1800;
+        fadeDuration = 10;
+      };
       colorSchemes = {
         generateTemplatesForPredefined = false;
         useWallpaperColors = false;
       };
       general = {
         avatarImage = "/home/${user}/.face";
-        forceBlackScreenCorners = true;
-        showScreenCorners = true;
+        forceBlackScreenCorners = false;
+        showScreenCorners = false;
       };
       location = {
         name = "西湖";

home/programs/network/zjuconnect.nix

@@ -1,7 +1,7 @@
 { pkgs, config, ... }:
 let
-  zju-connect = pkgs.callPackage ../../../pkgs/zju-connect.nix { };
-  zjuconnect = pkgs.writeShellScriptBin "zjuconnect" ''exec ${zju-connect}/bin/zju-connect --username 3220101015 --password $(cat ${config.age.secrets.zjuconnect_password.path})'';
+  zju-connect = pkgs.nur.repos.hhr2020.zju-connect;
+  zjuconnect = pkgs.writeShellScriptBin "zjuconnect" "exec ${zju-connect}/bin/zju-connect --username 3220101015 --password $(cat ${config.age.secrets.zjuconnect_password.path})";
 in
 {
   home.packages = [

home/programs/shell/fish.nix

@@ -25,6 +25,7 @@
 
         set -g fish_color_command = blue --italics
         set -g fish_color_quote = yellow --italics
+        set -g fish_key_bindings fish_vi_key_bindings
       '';
       plugins = with pkgs.fishPlugins; [
         {

home/programs/utils/default.nix

@@ -49,6 +49,7 @@
     gnome-disk-utility
     upower
     android-tools
+    tree-sitter
   ];
   imports = [
     ./eye-candy.nix