瀏覽代碼

Merge branch 'master' of https://github.com/johron/nix-dots

Johan Rong 22 小時之前
父節點
當前提交
cef22c4d54

+ 21 - 0
LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) Johan Rong 2026
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

+ 6 - 6
flake.lock

@@ -45,11 +45,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1787146702,
-        "narHash": "sha256-YbRcLdU/yK4gWsQg7V8WTKZHfXL33g8+wSFUX3wyevs=",
+        "lastModified": 1787377438,
+        "narHash": "sha256-Sxu1NLTD/Ern6hFGLlZmtKCSct3YQXZI/lls8RE1XeM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "173b7e8d40fdc8c296a9c99854314f17a3a1704c",
+        "rev": "65258d5c65a250189fde2e35f490d15e064c4c62",
         "type": "github"
       },
       "original": {
@@ -77,11 +77,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1787101114,
-        "narHash": "sha256-gwrPcFf/rDjHPaVflbDZ040ZDmBTRj/7+s8ZmE2SaIM=",
+        "lastModified": 1787753485,
+        "narHash": "sha256-BZWCi9ZRJiARTuKTbbtvFTj7t1TK4G3UEckT3HyNfRg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b18a4b905f8d028dc4476412e6d6891728695379",
+        "rev": "062346a6d85bc4b49dfaa61c986e9c5be21217d1",
         "type": "github"
       },
       "original": {

+ 6 - 0
home/features/desktop/hyprland/shells/dankmaterialshell/default.nix

@@ -19,6 +19,12 @@
       enable = true;
       restartIfChanged = true; 
     };
+
+    enableSystemMonitoring = true;
+    enableVPN = true;
+    enableDynamicTheming = true;
+    enableAudioWavelength = true;
+    enableCalendarEvents = true;
   };
 
   custom.hyprExtras = {

+ 9 - 1
nixos/flavors/application/workstation/default.nix

@@ -20,7 +20,6 @@
     gparted
     dnsmasq
     pciutils
-    python315
     playerctl
     p7zip-rar
     fastfetch
@@ -44,6 +43,7 @@
     mediawriter
     translate-shell
     firefox
+    bitwarden-desktop
   ];
 
   programs.appimage = {
@@ -145,6 +145,14 @@
 
   programs.virt-manager.enable = true;
 
+  services.udev.extraHwdb = ''
+    evdev:name:AT Translated Set 2 keyboard:*
+      KEYBOARD_KEY_3a=f12
+
+    evdev:input:b*v*p*e*
+      KEYBOARD_KEY_3a=f12
+  '';
+
   virtualisation = {
     libvirtd = {
       enable = true;

+ 5 - 0
nixos/flavors/desktop/hyprland/greeter-default.nix

@@ -13,6 +13,11 @@ in
   ];
 
   security.pam.services.greetd.enableGnomeKeyring = true;
+  security.pam.services."dankshell-u2f".text = ''
+    auth     required ${pkgs.pam_u2f}/lib/security/pam_u2f.so cue
+    account  required pam_permit.so
+  '';
+
   services.displayManager.dms-greeter = {
     enable = true;
     compositor.name = "hyprland";