From 3750ae75887a42ecea56051f82480007324166d0 Mon Sep 17 00:00:00 2001 From: Asaki Yuki Date: Sun, 12 Apr 2026 19:02:41 +0700 Subject: [PATCH] add some package --- .vscode/settings.json | 3 - devices/ideapad-slim-5/configuration.nix | 3 +- flake.lock | 66 +++++++++---------- modules/features/home/packages.nix | 21 ++++++ modules/features/system/packages.nix | 27 ++------ modules/programs/hyprland/settings/input.nix | 23 +++---- .../programs/hyprland/settings/key-bind.nix | 2 + 7 files changed, 75 insertions(+), 70 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 10b1817..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "nixEnvSelector.suggestion": false -} diff --git a/devices/ideapad-slim-5/configuration.nix b/devices/ideapad-slim-5/configuration.nix index 107ca63..324b837 100755 --- a/devices/ideapad-slim-5/configuration.nix +++ b/devices/ideapad-slim-5/configuration.nix @@ -55,9 +55,8 @@ in mode = "1920x1200@60"; position = "0x0"; scale = 1; - - bitdepth = 10; } // lib.optionalAttrs ENABLE_HDR { + bitdepth = 10; cm = "hdr"; supports_wide_color = 1; supports_hdr = 1; diff --git a/flake.lock b/flake.lock index 8da0186..eea7df1 100644 --- a/flake.lock +++ b/flake.lock @@ -104,11 +104,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1772408722, - "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -312,11 +312,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1775578056, - "narHash": "sha256-TiSPoIM8EBf6Z6Hrne5wX4hPfss1xTRcRfTL6+DfmLo=", + "lastModified": 1775828308, + "narHash": "sha256-XsijqtwDQd8pf/PweiGGuX7O1250f3YOchQ+oGm0eCc=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "75dc67e63f1873f1e97f73daf0ce284f75afa97c", + "rev": "f7755322fc515108cc9eed8113c09492d4a352c1", "type": "github" }, "original": { @@ -612,11 +612,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1775566751, - "narHash": "sha256-5Xkx4NQvl2azAQe3lCZCMUx4FiwGOlEb+I4kyycQYw8=", + "lastModified": 1775877135, + "narHash": "sha256-nAqtUMy22olwyiOJB0CASVrbu5XB5+43GjlbIJ1KuvQ=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "6aa49a9c5b82911459e230db5bd64289082d4354", + "rev": "f943da038fd668d435c2d17916577f295faa8839", "type": "github" }, "original": { @@ -686,11 +686,11 @@ "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { - "lastModified": 1775609538, - "narHash": "sha256-wuEAtQEyYLSTljliQJfCktlaougrr2x72AL3elomMe8=", + "lastModified": 1775824780, + "narHash": "sha256-WwXmevM7d7A60pXuBIjhDts1WMj/yFym3XYsf7EVoEg=", "owner": "FlameFlag", "repo": "nixcord", - "rev": "62128fa01d11c887437114248536438fd3add38d", + "rev": "8b7178802e247cb5d29545e286d5664ff4fb83bc", "type": "github" }, "original": { @@ -733,11 +733,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1772328832, - "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", + "lastModified": 1774748309, + "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", + "rev": "333c4e0545a6da976206c74db8773a1645b5870a", "type": "github" }, "original": { @@ -748,11 +748,11 @@ }, "nixpkgs-nixcord": { "locked": { - "lastModified": 1773222311, - "narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=", + "lastModified": 1775595990, + "narHash": "sha256-OEf7YqhF9IjJFYZJyuhAypgU+VsRB5lD4DuiMws5Ltc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0590cd39f728e129122770c029970378a79d076a", + "rev": "4e92bbcdb030f3b4782be4751dc08e6b6cb6ccf2", "type": "github" }, "original": { @@ -764,11 +764,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1775305101, - "narHash": "sha256-/74n1oQPtKG52Yw41cbToxspxHbYz6O3vi+XEw16Qe8=", + "lastModified": 1775811116, + "narHash": "sha256-t+HZK42pB6N+i5RGbuy7Xluez/VvWbembBdvzsc23Ss=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "36a601196c4ebf49e035270e10b2d103fe39076b", + "rev": "54170c54449ea4d6725efd30d719c5e505f1c10e", "type": "github" }, "original": { @@ -843,11 +843,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1775423009, - "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", + "lastModified": 1775710090, + "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", + "rev": "4c1018dae018162ec878d42fec712642d214fdfa", "type": "github" }, "original": { @@ -859,11 +859,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1773222311, - "narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=", + "lastModified": 1775595990, + "narHash": "sha256-OEf7YqhF9IjJFYZJyuhAypgU+VsRB5lD4DuiMws5Ltc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0590cd39f728e129122770c029970378a79d076a", + "rev": "4e92bbcdb030f3b4782be4751dc08e6b6cb6ccf2", "type": "github" }, "original": { @@ -875,11 +875,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1775305101, - "narHash": "sha256-/74n1oQPtKG52Yw41cbToxspxHbYz6O3vi+XEw16Qe8=", + "lastModified": 1775811116, + "narHash": "sha256-t+HZK42pB6N+i5RGbuy7Xluez/VvWbembBdvzsc23Ss=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "36a601196c4ebf49e035270e10b2d103fe39076b", + "rev": "54170c54449ea4d6725efd30d719c5e505f1c10e", "type": "github" }, "original": { @@ -1038,11 +1038,11 @@ }, "unstablepkgs": { "locked": { - "lastModified": 1775423009, - "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", + "lastModified": 1775710090, + "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", + "rev": "4c1018dae018162ec878d42fec712642d214fdfa", "type": "github" }, "original": { diff --git a/modules/features/home/packages.nix b/modules/features/home/packages.nix index bf3a668..37fd013 100644 --- a/modules/features/home/packages.nix +++ b/modules/features/home/packages.nix @@ -5,17 +5,38 @@ inputs, ... }: +let + custom-catppuccin-gtk = pkgs.catppuccin-gtk.override { + variant = "mocha"; + accents = [ "sapphire" ]; + size = "compact"; + }; + + custom-catppuccin-kde = (pkgs.catppuccin-kde.override { + flavour = [ "mocha" ]; + accents = [ "sapphire" ]; + }); +in { home.packages = with pkgs; [ + custom-catppuccin-gtk + hyprshot antigravity prismlauncher protonup-qt + protonplus vlc gimp libreoffice-qt-fresh lutris osu-lazer-bin + lmstudio + xprop + + bluetuith + lxqt.pavucontrol-qt + nwg-look proton-pass proton-authenticator diff --git a/modules/features/system/packages.nix b/modules/features/system/packages.nix index ed3e0ce..109d7a2 100644 --- a/modules/features/system/packages.nix +++ b/modules/features/system/packages.nix @@ -4,25 +4,10 @@ config, ... }: -let - custom-catppuccin-gtk = pkgs.catppuccin-gtk.override { - variant = "mocha"; - accents = [ "sapphire" ]; - size = "compact"; - }; - - custom-catppuccin-kde = (pkgs.catppuccin-kde.override { - flavour = [ "mocha" ]; - accents = [ "sapphire" ]; - }); -in { environment.systemPackages = with pkgs; - [ - custom-catppuccin-gtk - papirus-icon-theme - + [ git vim wget @@ -34,16 +19,16 @@ in brightnessctl php ntfs3g - + zip + unzip + wine wine64 winetricks protontricks - + quickshell - bluetuith - lxqt.pavucontrol-qt - nwg-look + papirus-icon-theme ] ++ ( with pkgs; diff --git a/modules/programs/hyprland/settings/input.nix b/modules/programs/hyprland/settings/input.nix index 2914e07..d46fdd7 100644 --- a/modules/programs/hyprland/settings/input.nix +++ b/modules/programs/hyprland/settings/input.nix @@ -1,13 +1,14 @@ -{ ... }: { - wayland.windowManager.hyprland.settings = { - "$LAPTOP_TOUCHPAD_ENABLE" = false; +{ ... }: +{ + wayland.windowManager.hyprland.settings = { + "$LAPTOP_TOUCHPAD_ENABLE" = false; - device = { - name = "gxtp5100:00-27c6:01e0-touchpad"; - enabled = "$LAPTOP_TOUCHPAD_ENABLE"; - natural_scroll = true; - }; - - input.touchpad.natural_scroll = true; + device = { + name = "gxtp5100:00-27c6:01e0-touchpad"; + enabled = "$LAPTOP_TOUCHPAD_ENABLE"; + natural_scroll = true; }; -} \ No newline at end of file + + input.touchpad.natural_scroll = true; + }; +} diff --git a/modules/programs/hyprland/settings/key-bind.nix b/modules/programs/hyprland/settings/key-bind.nix index d5d70ea..624f81a 100644 --- a/modules/programs/hyprland/settings/key-bind.nix +++ b/modules/programs/hyprland/settings/key-bind.nix @@ -47,6 +47,8 @@ "SUPER, MOUSE_UP, workspace, e+1" "ALT, SPACE, global, asakiyuki:launcher" + ", XF86TouchpadToggle, global, asakiyuki:touchpadtoggle" + ", Caps_Lock, global, asakiyuki:capslock" ",XF86MonBrightnessDown, exec, brightnessctl s 5%-" ",XF86MonBrightnessUp, exec, brightnessctl s +5%"