diff --git a/flake.lock b/flake.lock index 9131b34..30c05f5 100644 --- a/flake.lock +++ b/flake.lock @@ -95,11 +95,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -151,11 +151,11 @@ ] }, "locked": { - "lastModified": 1749526396, - "narHash": "sha256-UL9F76abAk87llXOrcQRjhd5OaOclUd6MIltsqcUZmo=", + "lastModified": 1750304462, + "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=", "owner": "nix-community", "repo": "home-manager", - "rev": "427c96044f11a5da50faf6adaf38c9fa47e6d044", + "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c", "type": "github" }, "original": { @@ -172,11 +172,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1749022112, - "narHash": "sha256-NNGvih5zDjic+UVxm+1YYQMgRok6PcdNE0/6vzs+XrM=", + "lastModified": 1750386831, + "narHash": "sha256-oREAoOQeAExqWMkw2r3BJfiaflh7QwHFkp8Qm0qDu6o=", "owner": "jas-singhfsu", "repo": "hyprpanel", - "rev": "20532ee760fdf492afcf987ae091497a37878197", + "rev": "d563cdb1f6499d981901336bd0f86303ab95c4a5", "type": "github" }, "original": { @@ -231,11 +231,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1749523198, - "narHash": "sha256-How2kQw0psKmCdXgojc95Sf3K5maHB3qfINxTZFCAPM=", + "lastModified": 1750215678, + "narHash": "sha256-Rc/ytpamXRf6z8UA2SGa4aaWxUXRbX2MAWIu2C8M+ok=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cdc68935eba9f86d155585fdf6f17af6824f38ac", + "rev": "5395fb3ab3f97b9b7abca147249fa2e8ed27b192", "type": "github" }, "original": { @@ -247,11 +247,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1749523198, - "narHash": "sha256-How2kQw0psKmCdXgojc95Sf3K5maHB3qfINxTZFCAPM=", + "lastModified": 1750215678, + "narHash": "sha256-Rc/ytpamXRf6z8UA2SGa4aaWxUXRbX2MAWIu2C8M+ok=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cdc68935eba9f86d155585fdf6f17af6824f38ac", + "rev": "5395fb3ab3f97b9b7abca147249fa2e8ed27b192", "type": "github" }, "original": { @@ -287,11 +287,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1749496904, - "narHash": "sha256-eNDMzrcDBOprdJs7DpMOJfCEcxribxDJP2OjozSC3Wo=", + "lastModified": 1750345447, + "narHash": "sha256-yOuSSfI4xovXQpSkZUK02CBcY1f0Nvm0RhnUN8xn2rY=", "owner": "nix-community", "repo": "nixvim", - "rev": "e0b3d8bc3a0ab5a7cc0792c7705e92f9c5c598f3", + "rev": "6a1a348ab1f00bd32d2392b5c2fc72489c699af3", "type": "github" }, "original": { @@ -311,11 +311,11 @@ ] }, "locked": { - "lastModified": 1748298102, - "narHash": "sha256-PP11GVwUt7F4ZZi5A5+99isuq39C59CKc5u5yVisU/U=", + "lastModified": 1749730855, + "narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=", "owner": "NuschtOS", "repo": "search", - "rev": "f8a1c221afb8b4c642ed11ac5ee6746b0fe1d32f", + "rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742", "type": "github" }, "original": { diff --git a/home/fabric/default.nix b/home/fabric/default.nix index 83740de..6be37df 100644 --- a/home/fabric/default.nix +++ b/home/fabric/default.nix @@ -123,7 +123,6 @@ zsh pavucontrol wofi - deno hyprpanel alejandra rustup @@ -167,6 +166,8 @@ nodejs_24 openssl psmisc + air + pyfa ]; # Enable home-manager diff --git a/home/fabric/desktop/desktop.nix b/home/fabric/desktop/desktop.nix new file mode 100644 index 0000000..093631a --- /dev/null +++ b/home/fabric/desktop/desktop.nix @@ -0,0 +1,25 @@ +{...}: { + xdg.desktopEntries = { + # The name of the entry. This becomes the filename, e.g., "firefox-private.desktop" + discord = { + # The name that will appear in Wofi + name = "Discord"; + + # A more generic name, also used by menus + genericName = "Discord"; + + # This is the most important part! + # The command to execute. %U is a placeholder for URLs if you open a link with it. + exec = "discord --enable-wayland-ime"; + + # Tell the system this is not a terminal application + terminal = false; + + # Use the standard Firefox icon for a consistent look + icon = "discord"; + + # The type of the entry + type = "Application"; + }; + }; +} diff --git a/home/fabric/desktop/hyprland.nix b/home/fabric/desktop/hyprland.nix index 62d22c4..da8fa11 100644 --- a/home/fabric/desktop/hyprland.nix +++ b/home/fabric/desktop/hyprland.nix @@ -17,6 +17,7 @@ gaps_in = 0; gaps_out = "0, 440, 0, 440"; }; + animations.enabled = false; input = { "repeat_delay" = 300; @@ -24,19 +25,27 @@ }; exec-once = [ - # "hypridle" + "fcitx5" ]; windowrule = [ + "workspace 1 silent,initialTitle:^EVE$" + "tile, initialTitle:^EVE$" + "workspace 6 silent,class:^QQ$" + "float, title:^图片查看器$" "workspace 6 silent,class:^(discord)$" "workspace 4 silent,class:^(kitty)$" "workspace 5 silent,class:^(firefox)$" ]; - # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more + workspace = [ + "r[1-3], gapsout:0" + ]; + bind = [ "$mainMod, T, exec, $terminal" "$mainMod, B, exec, $browser" + "$mainMod, S, exec, sh -c \"grim -g '$(slurp -d)' - | wl-copy\"" "$mainMod, Q, killactive" "$mainMod, M, exit" "$mainMod, E, exec, $fileManager" @@ -69,7 +78,7 @@ "$mainMod SHIFT, 3, movetoworkspace, 3" "$mainMod SHIFT, 4, movetoworkspace, 4" "$mainMod SHIFT, 5, movetoworkspace, 5" - "$mainMod SHIFT, 6, movetoworkspace, 6" + "$mainMoe SHIFT, 6, movetoworkspace, 6" # Typo was here, corrected to $mainMod "$mainMod SHIFT, 7, movetoworkspace, 7" "$mainMod SHIFT, 8, movetoworkspace, 8" "$mainMod SHIFT, 9, movetoworkspace, 9" @@ -82,7 +91,7 @@ "$mainMod, mouse:273, resizewindow" # Super + Right Mouse Button to resize windows ]; monitor = [ - "DP-5, 3440x1440@144.00HZ, 0x0, 1" + "DP-3, 3440x1440@144.00HZ, 0x0, 1" ]; }; }; diff --git a/hosts/common/optional/bluetooth.nix b/hosts/common/optional/bluetooth.nix new file mode 100644 index 0000000..7d4cda2 --- /dev/null +++ b/hosts/common/optional/bluetooth.nix @@ -0,0 +1,32 @@ +{ + config, + pkgs, + ... +}: { + # Enable Bluetooth + hardware.bluetooth = { + enable = true; + powerOnBoot = true; + settings.General = { + experimental = true; # show battery + + # https://www.reddit.com/r/NixOS/comments/1ch5d2p/comment/lkbabax/ + # for pairing bluetooth controller + Privacy = "device"; + JustWorksRepairing = "always"; + Class = "0x000100"; + FastConnectable = true; + }; + }; + services.blueman.enable = true; + + hardware.xpadneo.enable = true; # Enable the xpadneo driver for Xbox One wireless controllers + + boot = { + extraModulePackages = with config.boot.kernelPackages; [xpadneo]; + extraModprobeConfig = '' + options bluetooth disable_ertm=Y + ''; + # connect xbox controller + }; +} diff --git a/hosts/zion/default.nix b/hosts/zion/default.nix index 90b5315..8790fe5 100644 --- a/hosts/zion/default.nix +++ b/hosts/zion/default.nix @@ -14,6 +14,8 @@ ../common/optional/nvidia.nix ../common/optional/docker.nix ../common/optional/steam.nix + ../common/optional/flatpak.nix + ../common/optional/fcitx5.nix ]; # Bootloader