From f0e9294982b57d2dde93352f206635372ad3d781 Mon Sep 17 00:00:00 2001 From: Hadi <112569860+anotherhadi@users.noreply.github.com> Date: Fri, 30 Aug 2024 14:16:30 +0200 Subject: [PATCH] Update --- flake.lock | 72 ++++++++++++++++---------------- home/system/hyprland/default.nix | 32 +++++++------- hosts/laptop/configuration.nix | 2 + hosts/laptop/home.nix | 2 +- hosts/modules/gvfs.nix | 1 + hosts/modules/power-profiles.nix | 1 + 6 files changed, 57 insertions(+), 53 deletions(-) create mode 100644 hosts/modules/gvfs.nix create mode 100644 hosts/modules/power-profiles.nix diff --git a/flake.lock b/flake.lock index bad877d..6f3ead4 100644 --- a/flake.lock +++ b/flake.lock @@ -63,11 +63,11 @@ ] }, "locked": { - "lastModified": 1724273991, - "narHash": "sha256-+aUSOXKGpS5CRm1oTitgNAr05ThQNbKIXalZHl3nC6Y=", + "lastModified": 1725016199, + "narHash": "sha256-2TMk7F2a27ZtOUW/bftkDyZKp3OQ71E5XnfKSUT8HZQ=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "9a3161ad4c78dc420d1cbb3aae638222608c7de4", + "rev": "cff00196f0fcf734a2bf164eb0dfdb6e58c5c906", "type": "github" }, "original": { @@ -201,11 +201,11 @@ ] }, "locked": { - "lastModified": 1724440431, - "narHash": "sha256-9etXEOUtzeMgqg1u0wp+EdwG7RpmrAZ2yX516bMj2aE=", + "lastModified": 1724857454, + "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "c8a54057aae480c56e28ef3e14e4960628ac495b", + "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", "type": "github" }, "original": { @@ -318,11 +318,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1724784150, - "narHash": "sha256-XlmFLoLppuKxSh2eGPXy27+tNIQ+w+cXoh8Ln3vBJew=", + "lastModified": 1725016246, + "narHash": "sha256-hAebBhn28+PzBeqi8n3CSHuLTiIL3OJU0kFtruN/sT8=", "ref": "refs/heads/main", - "rev": "17ed4fc04cedbaad365bdebf6bfe0160c527f3fe", - "revCount": 5147, + "rev": "ef33198e8f9fa874b3ad2e2775f8474af62d7fee", + "revCount": 5158, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -425,15 +425,15 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1724741517, - "narHash": "sha256-jC8FN8L4Xl/btXJg/gEPjJfC+NAf0oNnHwOA+goG52Y=", - "owner": "Jas-SinghFSU", + "lastModified": 1725018968, + "narHash": "sha256-/NshXiZv436Hh1Vn71AnjCLJ4DMxCSmrdI4wHOY5cLU=", + "owner": "anotherhadi", "repo": "HyprPanel", - "rev": "6140778e5d2dc6f71c5ab18c166254490bc26bac", + "rev": "af5011471b9a2a2ba50ec82623b506af14fa96f7", "type": "github" }, "original": { - "owner": "Jas-SinghFSU", + "owner": "anotherhadi", "repo": "HyprPanel", "type": "github" } @@ -450,11 +450,11 @@ ] }, "locked": { - "lastModified": 1722869141, - "narHash": "sha256-0KU4qhyMp441qfwbirNg3+wbm489KnEjXOz2I/RbeFs=", + "lastModified": 1724966483, + "narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "0252fd13e78e60fb0da512a212e56007515a49f7", + "rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2", "type": "github" }, "original": { @@ -511,11 +511,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1724575805, - "narHash": "sha256-OB/kEL3GAhUZmUfkbPfsPhKs0pRqJKs0EEBiLfyKZw8=", + "lastModified": 1724878143, + "narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9fc19be21f0807d6be092d70bf0b1de0c00ac895", + "rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef", "type": "github" }, "original": { @@ -559,11 +559,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1724224976, - "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", + "lastModified": 1724819573, + "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", + "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", "type": "github" }, "original": { @@ -607,11 +607,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1724479785, - "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=", + "lastModified": 1724819573, + "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be", + "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", "type": "github" }, "original": { @@ -636,11 +636,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1724820329, - "narHash": "sha256-jXaDebjRjcUgZcMNXkvA99s/tTUvZfLLJxLwf1e/qwE=", + "lastModified": 1724968633, + "narHash": "sha256-eb2NCdLwfXL1MuTAkoDncSl2lCJwyylV5/NM1Ws2P/U=", "owner": "nix-community", "repo": "nixvim", - "rev": "70e9532ec290769e4d671747b0f65b1c29a3c14e", + "rev": "2704133fe3ca616b22ed6685cc67180456eb4160", "type": "github" }, "original": { @@ -774,11 +774,11 @@ ] }, "locked": { - "lastModified": 1724818600, - "narHash": "sha256-7i8zqLTds2bXs6n/2ucSJdmKTzhajCktQ2WWFOVW3x0=", + "lastModified": 1724991403, + "narHash": "sha256-n0os3uymBUoGlikG87Yp7oisYGrkEwsm3nptS9FhdAk=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "c8050c21e2e61efe0ac2d423eac9062c62bb6633", + "rev": "0965e58aa38245b2105fec2949a9463fe34e3f05", "type": "github" }, "original": { @@ -855,11 +855,11 @@ ] }, "locked": { - "lastModified": 1724338379, - "narHash": "sha256-kKJtaiU5Ou+e/0Qs7SICXF22DLx4V/WhG1P6+k4yeOE=", + "lastModified": 1724833132, + "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "070f834771efa715f3e74cd8ab93ecc96fabc951", + "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5", "type": "github" }, "original": { diff --git a/home/system/hyprland/default.nix b/home/system/hyprland/default.nix index b935cb5..67ff645 100644 --- a/home/system/hyprland/default.nix +++ b/home/system/hyprland/default.nix @@ -31,7 +31,7 @@ enable = true; xwayland.enable = true; package = inputs.hyprland.packages."${pkgs.system}".hyprland; - plugins = [ inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo ]; + # plugins = [ inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo ]; TODO: broken settings = { "$mod" = "SUPER"; @@ -46,20 +46,20 @@ monitor = [ "eDP-2,highres,0x0,1" ",prefered,auto,1" ]; - plugin = { - hyprexpo = { - columns = 2; - gap_size = 5; - bg_col = "rgb(111111)"; - workspace_method = - "center current"; # [center/first] [workspace] e.g. first 1 or center m+1 - - enable_gesture = true; # laptop touchpad - gesture_fingers = 3; # 3 or 4 - gesture_distance = 300; # how far is the "max" - gesture_positive = true; # positive = swipe down. Negative = swipe up. - }; - }; + # plugin = { + # hyprexpo = { + # columns = 2; + # gap_size = 5; + # bg_col = "rgb(111111)"; + # workspace_method = + # "center current"; # [center/first] [workspace] e.g. first 1 or center m+1 + # + # enable_gesture = true; # laptop touchpad + # gesture_fingers = 3; # 3 or 4 + # gesture_distance = 300; # how far is the "max" + # gesture_positive = true; # positive = swipe down. Negative = swipe up. + # }; + # }; bind = [ "$mod, RETURN, exec, ${pkgs.kitty}/bin/kitty" # Kitty @@ -69,7 +69,7 @@ "$mod, L, exec, ${pkgs.hyprlock}/bin/hyprlock" # Lock "$mod, X, exec, powermenu" # Powermenu "$mod, SPACE, exec, menu" # Launcher - "$shiftMod, SPACE, hyprexpo:expo, toggle" # HyprExpo + # "$shiftMod, SPACE, hyprexpo:expo, toggle" # HyprExpo "$mod, Q, killactive," # Close window "$mod, T, togglefloating," # Toggle Floating diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index e39a4c0..394ad3d 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -16,7 +16,9 @@ ../modules/nix.nix ../modules/network-manager.nix ../modules/home-manager.nix + ../modules/power-profiles.nix ../modules/utils.nix + ../modules/gvfs.nix ./hardware-configuration.nix ./variables.nix diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index d97a3f3..b45215e 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -10,7 +10,7 @@ ../../home/programs/nextcloud ../../home/programs/nvim ../../home/programs/qutebrowser - ../../home/programs/spicetify + # ../../home/programs/spicetify TODO: broken ../../home/programs/shell ../../home/programs/fetch ../../home/programs/lf diff --git a/hosts/modules/gvfs.nix b/hosts/modules/gvfs.nix new file mode 100644 index 0000000..f0e6989 --- /dev/null +++ b/hosts/modules/gvfs.nix @@ -0,0 +1 @@ +{ services.gvfs.enable = true; } diff --git a/hosts/modules/power-profiles.nix b/hosts/modules/power-profiles.nix new file mode 100644 index 0000000..039eaf5 --- /dev/null +++ b/hosts/modules/power-profiles.nix @@ -0,0 +1 @@ +{ services.power-profiles-daemon.enable = true; }