瀏覽代碼

Various changes

Johan Rong 2 月之前
父節點
當前提交
6d0e55db6e

+ 9 - 9
flake.lock

@@ -8,11 +8,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781500377,
-        "narHash": "sha256-qvBoATYCZ64ikx5Vi/yWAzy0CSKdIev+sTh45H1KAHU=",
+        "lastModified": 1781930126,
+        "narHash": "sha256-AopjjM6497f3Usb6IAZgensjtzGlYGGpJLw7DRtP67I=",
         "owner": "caelestia-dots",
         "repo": "cli",
-        "rev": "5c062e6897d2e86e267e1db251eb872ebb836568",
+        "rev": "b00dabaa9351d1383dfba162f5b3575b49a126e1",
         "type": "github"
       },
       "original": {
@@ -58,11 +58,11 @@
         "quickshell": "quickshell"
       },
       "locked": {
-        "lastModified": 1781437895,
-        "narHash": "sha256-KGN7Ql7xb/1RF/xP4LInOrRHNUvjAWaL92ABNN8mFrY=",
+        "lastModified": 1781850732,
+        "narHash": "sha256-YKAWz4bSguUWwc1GxOHXRFl4fT+t9WnA2VoZGIRdFVc=",
         "owner": "caelestia-dots",
         "repo": "shell",
-        "rev": "7f358235aab727289c50f7e69b96ae7237efc358",
+        "rev": "37e603fbf6f973a09f451553b61ac584d9877cf1",
         "type": "github"
       },
       "original": {
@@ -81,11 +81,11 @@
         "quickshell": "quickshell_2"
       },
       "locked": {
-        "lastModified": 1781682211,
-        "narHash": "sha256-ssOMe5pJaZo3LpHFKpKVs6QlTM5P90pScdSFyB/Oyr8=",
+        "lastModified": 1781850732,
+        "narHash": "sha256-YKAWz4bSguUWwc1GxOHXRFl4fT+t9WnA2VoZGIRdFVc=",
         "owner": "caelestia-dots",
         "repo": "shell",
-        "rev": "f4ec2283a53d0ae6b02938e9a42422195099eda4",
+        "rev": "37e603fbf6f973a09f451553b61ac584d9877cf1",
         "type": "github"
       },
       "original": {

+ 1 - 1
home/features/desktop/hyprland/hypr/modules/autostart.lua

@@ -1,3 +1,3 @@
 hl.on("hyprland.start", function ()
-  
+  hl.exec_cmd("dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP")
 end)

+ 2 - 0
home/features/desktop/hyprland/hypr/modules/environment.lua

@@ -1,6 +1,8 @@
 hl.env("XCURSOR_SIZE", "24")
 hl.env("HYPRCURSOR_SIZE", "24")
 
+hl.env("SSH_ASKPASS", "ksshaskpass")
+
 hl.config({
   xwayland = {
     force_zero_scaling = true

+ 2 - 1
home/features/desktop/hyprland/hypr/modules/keybindings.lua

@@ -15,7 +15,8 @@ hl.bind(mainMod .. " + SHIFT + SPACE", hl.dsp.window.float({ action = "toggle" }
 
 hl.bind(secMod .. " + E", hl.dsp.exec_cmd(fileManager))
 hl.bind(secMod .. " + Q",  hl.dsp.exec_cmd("firefox"))
-hl.bind(secMod .. " + S",  hl.dsp.exec_cmd("spotify"))
+hl.bind(secMod .. " + S",  hl.dsp.exec_cmd("feishin"))
+hl.bind(secMod .. " + CONTROL + S",  hl.dsp.exec_cmd("spotify"))
 hl.bind(secMod .. " + D",  hl.dsp.exec_cmd("discord"))
 hl.bind(secMod .. " + SHIFT + C", hl.dsp.exec_cmd("hyprpicker --autocopy"))
 

+ 5 - 0
home/features/desktop/hyprland/hypr/modules/windows_and_workspaces.lua

@@ -47,4 +47,9 @@ hl.window_rule({
 hl.window_rule({
     match = { class = "Spotify" },
     workspace = "12"
+})
+
+hl.window_rule({
+    match = { class = "feishin" },
+    workspace = "12"
 })

+ 13 - 3
nixos/features/system/basic.nix

@@ -149,11 +149,21 @@
   services.seatd.enable = true;
   services.gvfs.enable = true;
 
-  virtualisation.libvirtd.enable = true;
   programs.virt-manager.enable = true;
 
-  virtualisation.docker.enable = true;
-  virtualisation.docker.storageDriver = "btrfs";
+  virtualisation = {
+    libvirtd = {
+      enable = true;
+      qemu = {
+        package = pkgs.qemu_kvm;
+        vhostUserPackages = [ pkgs.virtiofsd ];
+      };
+    };
+    docker = {
+      enable = true;
+      storageDriver = "btrfs";
+    };
+  };
 
   qt.enable = true;
 

+ 9 - 0
nixos/flavors/desktop/hyprland/default.nix

@@ -18,6 +18,13 @@
     alacritty
 
     hyprlauncher
+
+    kdePackages.dolphin
+    kdePackages.qtsvg 
+    kdePackages.kio
+    kdePackages.kio-fuse
+    kdePackages.kio-extras
+    kdePackages.ksshaskpass
   ];
 
   programs.hyprland = {
@@ -67,6 +74,8 @@
   security.pam.services.login.enableGnomeKeyring = true;
   security.pam.services.hyprland.enableGnomeKeyring = true;
 
+  security.pam.services.login.enableKwallet = true;
+
   systemd.user.services.gnome-keyring = {
     wantedBy = [ "default.target" ];
     serviceConfig = {

+ 10 - 7
nixos/hardware/networking/default.nix

@@ -1,10 +1,13 @@
 { config, pkgs, ... }:
 {
-  networking.networkmanager.enable = true;
-  networking.firewall.checkReversePath = false;
-
-  # chromecast
-  networking.firewall.allowedUDPPortRanges = [ 
-    { from = 32768; to = 60999; } 
-  ];
+  networking = {
+    networkmanager.enable = true;
+    firewall = {
+      checkReversePath = false;
+      allowedUDPPortRanges = [ 
+        { from = 32768; to = 60999; } 
+      ];
+      allowedUDPPorts = [ 5353 ];
+    };
+  };
 }