diff --git a/flake.lock b/flake.lock index eef1498..e993a46 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1761420899, - "narHash": "sha256-kxGCip6GNbcbNWKu4J2iKbNYfFTS8Zbjg9CWp0zmFoM=", + "lastModified": 1762356719, + "narHash": "sha256-qwd/xdoOya1m8FENle+4hWnydCtlXUWLAW/Auk6WL7s=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "62479232aae42c1ef09c2c027c8cfd91df060897", + "rev": "6d0b3567584691bf9d8fedb5d0093309e2f979c7", "type": "github" }, "original": { @@ -104,19 +104,16 @@ "dankMaterialShell": { "inputs": { "dgop": "dgop", - "dms-cli": [ - "dms-cli" - ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1762403774, - "narHash": "sha256-CXgW0EEW+WV4jJ/5mxNluQeTgS6wyuuUlUcsZF84bKU=", + "lastModified": 1763522195, + "narHash": "sha256-QW/SKfUN5nT8J1EIvtpNaGf886+BBp2vCvs/ZuMo0VE=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "c9ee856f916023563d9446483024a8aec2dce870", + "rev": "dfdaa82245302d40ac1aa4c0d60728b4397dde61", "type": "github" }, "original": { @@ -133,11 +130,11 @@ ] }, "locked": { - "lastModified": 1760238269, - "narHash": "sha256-7CeGZM/Z/5Qt3AYByCRohGYGR1MRuXYzTTbkV/JxyAs=", + "lastModified": 1762435535, + "narHash": "sha256-QhzRn7pYN35IFpKjjxJAj3GPJECuC+VLhoGem3ezycc=", "owner": "AvengeMedia", "repo": "dgop", - "rev": "95acdfce2d323e28fa8f5a4f345160962034f2b5", + "rev": "6cf638dde818f9f8a2e26d0243179c43cb3458d7", "type": "github" }, "original": { @@ -153,11 +150,11 @@ ] }, "locked": { - "lastModified": 1762404200, - "narHash": "sha256-/GhnVY1AwcgxOVhSXdrejVQNbi27kXRNMD93C2nH5ho=", + "lastModified": 1763078370, + "narHash": "sha256-wsYqJlLdRSlJpRE0tIuuPMU6aOyhMdV237rEG/enUxY=", "owner": "AvengeMedia", "repo": "danklinux", - "rev": "b94cc56f44e7fb987d293e4880871fa0845da8ed", + "rev": "7a083a0d6d087d41d0bc5077d03e662e1417ce3c", "type": "github" }, "original": { @@ -260,18 +257,20 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1748186689, - "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=", + "host": "gitlab.gnome.org", + "lastModified": 1762869044, + "narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0", - "type": "github" + "rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad", + "type": "gitlab" }, "original": { + "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "48.2", + "ref": "gnome-49", "repo": "gnome-shell", - "type": "github" + "type": "gitlab" } }, "home-manager": { @@ -281,11 +280,11 @@ ] }, "locked": { - "lastModified": 1762367206, - "narHash": "sha256-c/164YOPkV09BH8KIUdvVvJs3VF2LNIbE2piKGgXPxk=", + "lastModified": 1763416652, + "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=", "owner": "nix-community", "repo": "home-manager", - "rev": "af119feb17cb242398e0fb97f92b867d25882522", + "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312", "type": "github" }, "original": { @@ -302,11 +301,11 @@ ] }, "locked": { - "lastModified": 1762351818, - "narHash": "sha256-0ptUDbYwxv1kk/uzEX4+NJjY2e16MaAhtzAOJ6K0TG0=", + "lastModified": 1762964643, + "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=", "owner": "nix-community", "repo": "home-manager", - "rev": "b959c67241cae17fc9e4ee7eaf13dfa8512477ea", + "rev": "827f2a23373a774a8805f84ca5344654c31f354b", "type": "github" }, "original": { @@ -360,11 +359,11 @@ ] }, "locked": { - "lastModified": 1760445448, - "narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=", + "lastModified": 1762462052, + "narHash": "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "50fb9f069219f338a11cf0bcccb9e58357d67757", + "rev": "ffc999d980c7b3bca85d3ebd0a9fbadf984a8162", "type": "github" }, "original": { @@ -378,8 +377,8 @@ "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", "hyprgraphics": "hyprgraphics", + "hyprland-guiutils": "hyprland-guiutils", "hyprland-protocols": "hyprland-protocols", - "hyprland-qtutils": "hyprland-qtutils", "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", @@ -389,11 +388,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1762387591, - "narHash": "sha256-dbxpwgat8W/+P/cYnLXzoj5Gi8WKdtMgvqHuEzIU8fs=", + "lastModified": 1763540034, + "narHash": "sha256-TogNk567BTZib1XiYheW04ELxNB2bhee6G4SgphRqmA=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "c757fd375cce299e3da922190ddf1a0622ce807c", + "rev": "fbb31503f1b69402eeda81ba75a547c862c88bf2", "type": "github" }, "original": { @@ -402,6 +401,52 @@ "type": "github" } }, + "hyprland-guiutils": { + "inputs": { + "aquamarine": [ + "hyprland", + "aquamarine" + ], + "hyprgraphics": [ + "hyprland", + "hyprgraphics" + ], + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "hyprtoolkit": "hyprtoolkit", + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1762755186, + "narHash": "sha256-ZjjETUHtoEhVN7JI1Cbt3p/KcXpK8ZQaPHx7UkG1OgA=", + "owner": "hyprwm", + "repo": "hyprland-guiutils", + "rev": "66356e20a8ed348aa49c1b9ceace786e224225b3", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-guiutils", + "type": "github" + } + }, "hyprland-protocols": { "inputs": { "nixpkgs": [ @@ -427,74 +472,6 @@ "type": "github" } }, - "hyprland-qt-support": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprland-qtutils", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "hyprland-qtutils", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland-qtutils", - "systems" - ] - }, - "locked": { - "lastModified": 1749154592, - "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=", - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "type": "github" - } - }, - "hyprland-qtutils": { - "inputs": { - "hyprland-qt-support": "hyprland-qt-support", - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprland-qtutils", - "hyprlang", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1759080228, - "narHash": "sha256-RgDoAja0T1hnF0pTc56xPfLfFOO8Utol2iITwYbUhTk=", - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "type": "github" - } - }, "hyprlang": { "inputs": { "hyprutils": [ @@ -511,11 +488,11 @@ ] }, "locked": { - "lastModified": 1758927902, - "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=", + "lastModified": 1763254292, + "narHash": "sha256-JNgz3Fz2KMzkT7aR72wsgu/xNeJB//LSmdilh8Z/Zao=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da", + "rev": "deea98d5b61d066bdc7a68163edd2c4bd28d3a6b", "type": "github" }, "original": { @@ -524,6 +501,58 @@ "type": "github" } }, + "hyprtoolkit": { + "inputs": { + "aquamarine": [ + "hyprland", + "hyprland-guiutils", + "aquamarine" + ], + "hyprgraphics": [ + "hyprland", + "hyprland-guiutils", + "hyprgraphics" + ], + "hyprlang": [ + "hyprland", + "hyprland-guiutils", + "hyprlang" + ], + "hyprutils": [ + "hyprland", + "hyprland-guiutils", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprland-guiutils", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "hyprland-guiutils", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-guiutils", + "systems" + ] + }, + "locked": { + "lastModified": 1762463729, + "narHash": "sha256-2fYkU/mdz8WKY3dkDPlE/j6hTxIwqultsx4gMMsMns0=", + "owner": "hyprwm", + "repo": "hyprtoolkit", + "rev": "88483bdee5329ec985f0c8f834c519cd18cfe532", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprtoolkit", + "type": "github" + } + }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -536,11 +565,11 @@ ] }, "locked": { - "lastModified": 1762208756, - "narHash": "sha256-hC1jb4tdjFfEuU18KQiMgz5XPAO+d5SfbjAUS7haLl4=", + "lastModified": 1763323331, + "narHash": "sha256-+Z0OfCo1MS8/aIutSAW5aJR9zTae1wz9kcJYMgpwN6M=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "164a30b3d8b3174a32ac7326782476f1188e6118", + "rev": "0c6411851cc779d551edc89b83966696201611aa", "type": "github" }, "original": { @@ -597,11 +626,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1762394598, - "narHash": "sha256-AbDS8JL8mXAP0gVAXQA1RIUwnH6rUHueCTPf/hxAooE=", + "lastModified": 1763517711, + "narHash": "sha256-uY0Vr7ene4VlHyeZRHRNvT4WRwakAr8JShwmNEg7JB0=", "owner": "nix-community", "repo": "nix4vscode", - "rev": "4c90ca996c860583f8fc77fa8abd24610439f850", + "rev": "ce4507078be02de77c001ca498657436ec815a35", "type": "github" }, "original": { @@ -612,11 +641,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762111121, - "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "lastModified": 1763283776, + "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a", "type": "github" }, "original": { @@ -628,11 +657,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1762111121, - "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "lastModified": 1763421233, + "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", "type": "github" }, "original": { @@ -644,11 +673,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1762111121, - "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "lastModified": 1763421233, + "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", "type": "github" }, "original": { @@ -693,11 +722,11 @@ ] }, "locked": { - "lastModified": 1760663237, - "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", + "lastModified": 1763319842, + "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", + "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761", "type": "github" }, "original": { @@ -729,11 +758,11 @@ ] }, "locked": { - "lastModified": 1760998189, - "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=", + "lastModified": 1763509310, + "narHash": "sha256-s2WzTAD3vJtPACBCZXezNUMTG/wC6SFsU9DxazB9wDI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3", + "rev": "3ee33c0ed7c5aa61b4e10484d2ebdbdc98afb03e", "type": "github" }, "original": { @@ -763,11 +792,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1762264356, - "narHash": "sha256-QVfC53Ri+8n3e7Ujx9kq6all3+TLBRRPRnc6No5qY5w=", + "lastModified": 1763497248, + "narHash": "sha256-OGP6MYc+lVkLVQOTS6ORszDcCnZm7kDOGpFBdDoLd0k=", "owner": "nix-community", "repo": "stylix", - "rev": "647bb8dd96a206a1b79c4fd714affc88b409e10b", + "rev": "f19ac46f6aa26188b2020ed40066a5b832be9c53", "type": "github" }, "original": { @@ -973,11 +1002,11 @@ ] }, "locked": { - "lastModified": 1762403216, - "narHash": "sha256-BPv/dC0S54hqsurgmxGxUbXb3kJMpK3KNKQDrdO4NRE=", + "lastModified": 1763521945, + "narHash": "sha256-Zcrafbe4niRJMbzaVOwg7+iedJhwBFttre2DpyCC6qA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "a3a22c5ad43f46f8ddad7eed8aa7f82ec649765f", + "rev": "24d7381b9231c23daceec5d372cc28e877f7785d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d0be1b0..fae387a 100644 --- a/flake.nix +++ b/flake.nix @@ -27,12 +27,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - # power management - watt = { - url = "github:NotAShelf/watt/?ref=v0.3.2"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - # secrets sops-nix = { url = "github:Mic92/sops-nix"; diff --git a/hosts/yoga-7-pro/configuration.nix b/hosts/yoga-7-pro/configuration.nix index 93cc364..57c5fa2 100644 --- a/hosts/yoga-7-pro/configuration.nix +++ b/hosts/yoga-7-pro/configuration.nix @@ -16,7 +16,7 @@ HandlePowerKey = "ignore"; # handled by the dm instead - HandleLidSwitch = "ignore"; + # HandleLidSwitch = "ignore"; # needs to be set because it is not passed to other events HandleLidSwitchDocked = "ignore"; }; diff --git a/modules/home-manager/code.nix b/modules/home-manager/code.nix index 2dfcca2..7731d61 100644 --- a/modules/home-manager/code.nix +++ b/modules/home-manager/code.nix @@ -4,14 +4,13 @@ let # QOL "mhutchie.git-graph" "redhat.vscode-yaml" - "github.copilot" - "github.copilot-chat" # Nix environment selector "arrterian.nix-env-selector" # continue.continue + "github.copilot" + "github.copilot-chat" ]; - baseSettings = { # visual "window.titleBarStyle" = "native"; diff --git a/modules/home-manager/fish.nix b/modules/home-manager/fish.nix index 7499e58..ed59217 100644 --- a/modules/home-manager/fish.nix +++ b/modules/home-manager/fish.nix @@ -13,18 +13,12 @@ programs.fish = { enable = true; - # enableCompletion = true; + generateCompletions = true; + plugins = [ - { - name = "fzf-fish"; - src = pkgs.fetchFromGitHub { - owner = "PatrickF1"; - repo = "fzf.fish"; - rev = "v10.3"; - sha256 = "sha256-T8KYLA/r/gOKvAivKRoeqIwE2pINlxFQtZJHpOy9GMM="; - }; - } - # add others here + { name = "fzf"; src = pkgs.fishPlugins.fzf-fish.src; } + { name = "z"; src = pkgs.fishPlugins.z.src; } + { name = "pure"; src = pkgs.fishPlugins.pure.src; } ]; functions = { @@ -47,4 +41,5 @@ fi ''; }; + } diff --git a/modules/home-manager/fusuma.nix b/modules/home-manager/fusuma.nix deleted file mode 100644 index 6e9e455..0000000 --- a/modules/home-manager/fusuma.nix +++ /dev/null @@ -1,47 +0,0 @@ -{pkgs, config, lib, ...}: -let - hyprctl = "${pkgs.hyprland}/bin/hyprctl"; -in -{ - config = { - services.fusuma = { - enable = true; - settings = { - swipe = { - "3" = { - up = { - command = "exec ${hyprctl} dispatch fullscreen 1"; - }; - - down = { - command = "exec ${lib.getExe config.nix-config.launcher}"; - }; - }; - }; - - pinch = { - "4" = { - "in" = { - command = "exec ${hyprctl} dispatch togglespecialworkspace magic"; - }; - "out" = { - command = "exec ${hyprctl} dispatch togglespecialworkspace magic"; - }; - }; - }; - - - hold = { - "5" = { - command = "exec ${lib.getExe config.nix-config.launcher}"; - threshold = 0.1; - }; - }; - - threshold = { - pinch = 0.1; - }; - }; - }; - }; -} diff --git a/modules/home-manager/hypr/hyprland/default.nix b/modules/home-manager/hypr/hyprland/default.nix index 6524ed2..3b9caf4 100644 --- a/modules/home-manager/hypr/hyprland/default.nix +++ b/modules/home-manager/hypr/hyprland/default.nix @@ -2,6 +2,7 @@ imports = [ ./autostart.nix ./general.nix + ./gestures.nix ./keybinds.nix ./layouts.nix ./packages.nix diff --git a/modules/home-manager/hypr/hyprland/general.nix b/modules/home-manager/hypr/hyprland/general.nix index c81cc51..17c9209 100644 --- a/modules/home-manager/hypr/hyprland/general.nix +++ b/modules/home-manager/hypr/hyprland/general.nix @@ -56,12 +56,6 @@ in sensitivity = 0.5; }; - gestures = { - workspace_swipe = true; - workspace_swipe_fingers = 4; - workspace_swipe_touch = true; - }; - decoration = { rounding = 10; inactive_opacity = 0.9; diff --git a/modules/home-manager/hypr/hyprland/gestures.nix b/modules/home-manager/hypr/hyprland/gestures.nix new file mode 100644 index 0000000..8ddd3ac --- /dev/null +++ b/modules/home-manager/hypr/hyprland/gestures.nix @@ -0,0 +1,21 @@ +{inputs, pkgs, lib, config, ...}: +let + cfg = config.nix-config.hypr; +in +{ + config = { + wayland.windowManager.hyprland = { + settings = { + gesture = [ + # 4 finger swipe to switch workspace + "4, horizontal, workspace" + + "3, up, fullscreen" + "3, down, float" + + "4, vertical, scale: 0.5, special, magic" + ]; + }; + }; + }; +} diff --git a/modules/home-manager/hypr/hyprland/keybinds.nix b/modules/home-manager/hypr/hyprland/keybinds.nix index b49323b..0fe32f5 100644 --- a/modules/home-manager/hypr/hyprland/keybinds.nix +++ b/modules/home-manager/hypr/hyprland/keybinds.nix @@ -1,3 +1,4 @@ +# Note that some keybindings are delegated to other components, e.g. the quickshell module {inputs, pkgs, lib, config, ...}: let cfg = config.nix-config.hypr; @@ -5,8 +6,6 @@ in { config = { wayland.windowManager.hyprland = { - enable = true; - systemd.enable = true; settings = { "$mod" = "SUPER"; @@ -22,9 +21,6 @@ in # Lock screen "$mod, l, exec, loginctl lock-session" - # Clipboard management - "$mod, V, exec, cliphist list | ${lib.getExe config.nix-config.launcher} --dmenu | cliphist decode | wl-copy" - # Close window "$mod, Q, killactive," # Force close window @@ -54,10 +50,10 @@ in "$mod+Ctrl, right, movetoworkspace, +1" # Switch workspace - "$mod, left, workspace, prev" - "$mod, right, workspace, next" - "$mod, mouse_down, workspace, prev" - "$mod, mouse_up, workspace, next" + "$mod, left, workspace, e-1" + "$mod, right, workspace, e+1" + "$mod, mouse_down, workspace, e-1" + "$mod, mouse_up, workspace, e+1" # move to scratch workspace @@ -79,9 +75,6 @@ in ", XF86Cut, exec, hyprshot -m region -o ~/Pictures/Screenshots" "Shift, XF86Cut, exec, hyprshot -m window -o ~/Pictures/Screenshots" - # Power menu - ", XF86PowerOff, exec, ${lib.getExe config.nix-config.powerMenu}" - # Other pickers using the same launcher "$mod+Ctrl, space, exec, ${lib.getExe config.nix-config.filePicker}" "$mod, period, exec, ${lib.getExe config.nix-config.emojiPicker}" @@ -89,13 +82,6 @@ in # repeatable bindings binde = [ - # Fn keys - ", XF86MonBrightnessDown, exec, brightnessctl set 5%-" - ", XF86MonBrightnessUp, exec, brightnessctl set +5%" - ", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+" - ", XF86AudioLowerVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%-" - ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" - # Reshape the window in focus "$mod, MINUS, resizeactive, -2% -2%" "$mod, KP_Subtract, resizeactive, -2% -2%" @@ -133,20 +119,17 @@ in "$mod, mouse:273, resizewindow" ]; - - }; - extraConfig = '' - bind= , XF86AudioMicMute, submap, player_submap - - submap=player_submap - bind=, XF86AudioRaiseVolume, exec, notify-send previous; hyprctl dispatch submap reset - bind=, XF86AudioLowerVolume, exec, notify-send next; hyprctl dispatch submap reset - bind=, XF86AudioMicMute, exec, notify-send pause; hyprctl dispatch submap reset - submap=reset - ''; + # extraConfig = '' + # bind= , XF86AudioMicMute, submap, player_submap + # submap=player_submap + # bind=, XF86AudioRaiseVolume, exec, notify-send previous; hyprctl dispatch submap reset + # bind=, XF86AudioLowerVolume, exec, notify-send next; hyprctl dispatch submap reset + # bind=, XF86AudioMicMute, exec, notify-send pause; hyprctl dispatch submap reset + # submap=reset + # ''; }; }; } diff --git a/modules/home-manager/kubectl.nix b/modules/home-manager/kubectl.nix index fb53a44..ba276b1 100644 --- a/modules/home-manager/kubectl.nix +++ b/modules/home-manager/kubectl.nix @@ -1,13 +1,25 @@ {pkgs, ...}: { home.packages = [ - pkgs.kubie pkgs.kubectl ]; + # Add the shell alias programs.fish.shellAliases = { k = "kubectl"; }; + # set the kubectl autocompletions for fish + # the fish functions are generated by kubectl itself, we do this at compile time and write them a single time to avoid generating them at each shell start + # the command is kubectl completion fish + # which becomes + programs.fish.completions."kubectl" = builtins.readFile "${pkgs.runCommand "kubectl-completion" {} '' + ${pkgs.kubectl}/bin/kubectl completion fish > $out + ''}"; + + programs.kubeswitch = { + enable = true; + enableFishIntegration = true; + }; } diff --git a/modules/home-manager/quickshell/default.nix b/modules/home-manager/quickshell/default.nix index f25af40..b1138d0 100644 --- a/modules/home-manager/quickshell/default.nix +++ b/modules/home-manager/quickshell/default.nix @@ -25,4 +25,35 @@ # plugins = {}; }; + + wayland.windowManager.hyprland = { + settings = { + binde = [ + # Brightness + ", XF86MonBrightnessDown, exec, dms ipc call brightness decrement 5 \"\"" + ", XF86MonBrightnessUp, exec, dms ipc call brightness increment 5 \"\"" + + # Audio volume + playback + ", XF86AudioMute, exec, dms ipc call audio mute" + ", XF86AudioLowerVolume, exec, dms ipc call audio decrement 5" + ", XF86AudioRaiseVolume, exec, dms ipc call audio increment 5" + + "$mod, XF86AudioMute, exec, dms ipc call mpris playPause" + "$mod, XF86AudioLowerVolume, exec, dms ipc call mpris previous" + "$mod, XF86AudioRaiseVolume, exec, dms ipc call mpris next" + # also allow the dedicated media keys to control playback + ", XF86AudioPlay, exec, dms ipc call mpris playPause" + ", XF86AudioPrev, exec, dms ipc call mpris previous" + ", XF86AudioNext, exec, dms ipc call mpris next" + + ]; + + bind = [ + ", XF86PowerOff, exec, dms ipc call powermenu toggle" + # used to be ", XF86PowerOff, exec, ${lib.getExe config.nix-config.powerMenu}" + "$mod, V, exec, dms ipc call clipboard toggle" + # used to be "$mod, V, exec, cliphist list | ${lib.getExe config.nix-config.launcher} --dmenu | cliphist decode | wl-copy" + ]; + }; + }; } diff --git a/modules/nixos/power.nix b/modules/nixos/power.nix index d8d1a4a..dc824b4 100644 --- a/modules/nixos/power.nix +++ b/modules/nixos/power.nix @@ -22,43 +22,47 @@ config = { + # environment.systemPackages = [ + # pkgs.power-profiles-daemon + # ]; + services.power-profiles-daemon.enable = true; - services.tlp = { - enable = true; - settings = { - # processor chooses frequencies itself but respects the limits set by the user - CPU_DRIVER_OPMODE_ON_AC = "guided"; - CPU_DRIVER_OPMODE_ON_BAT = "guided"; + # services.tlp = { + # enable = true; + # settings = { + # # # processor chooses frequencies itself but respects the limits set by the user + # # CPU_DRIVER_OPMODE_ON_AC = "guided"; + # # CPU_DRIVER_OPMODE_ON_BAT = "guided"; - # governor dictates global behavior of the CPU - CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; - CPU_SCALING_GOVERNOR_ON_AC = "performance"; + # # # governor dictates global behavior of the CPU + # # CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; + # # CPU_SCALING_GOVERNOR_ON_AC = "performance"; - # energy performance policy (EPP) sets the energy/performance balance - CPU_ENERGY_PERF_POLICY_ON_BAT = "balance_power"; - CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; + # # # energy performance policy (EPP) sets the energy/performance balance + # # CPU_ENERGY_PERF_POLICY_ON_BAT = "balance_power"; + # # CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; - # clock speeds reported by `sudo tlp-stat` - # 623377 [kHz] and 5090910 [kHz] - CPU_SCALING_MIN_FREQ_ON_AC = 623377; - CPU_SCALING_MAX_FREQ_ON_AC = 5090910; - CPU_SCALING_MIN_FREQ_ON_BAT = 0; - # reduce max frequency on battery to save power - CPU_SCALING_MAX_FREQ_ON_BAT = 3000000; + # # # clock speeds reported by `sudo tlp-stat` + # # # 623377 [kHz] and 5090910 [kHz] + # # CPU_SCALING_MIN_FREQ_ON_AC = 623377; + # # CPU_SCALING_MAX_FREQ_ON_AC = 5090910; + # # CPU_SCALING_MIN_FREQ_ON_BAT = 0; + # # # reduce max frequency on battery to save power + # # CPU_SCALING_MAX_FREQ_ON_BAT = 3000000; - # Allow the CPU to boost - CPU_BOOST_ON_AC = 1; - CPU_BOOST_ON_BAT = 1; + # # # Allow the CPU to boost + # # CPU_BOOST_ON_AC = 1; + # # CPU_BOOST_ON_BAT = 1; - RADEON_DPM_PERF_LEVEL_ON_AC = "high"; - # WIFI_PWR_ON_BAT = "off"; + # # RADEON_DPM_PERF_LEVEL_ON_AC = "high"; + # # # WIFI_PWR_ON_BAT = "off"; - # enable battery charge thresholds on the default battery - STOP_CHARGE_THRESH_BAT0 = 1; - }; - }; + # # enable battery charge thresholds on the default battery + # STOP_CHARGE_THRESH_BAT0 = 1; + # }; + # }; diff --git a/users/remy_yoga/default.nix b/users/remy_yoga/default.nix index 5eecacd..708f65a 100644 --- a/users/remy_yoga/default.nix +++ b/users/remy_yoga/default.nix @@ -25,7 +25,6 @@ with lib.hm.gvariant; ../../modules/home-manager/documents.nix ../../modules/home-manager/fish.nix ../../modules/home-manager/flatpaks.nix - ../../modules/home-manager/fusuma.nix ../../modules/home-manager/hypr ../../modules/home-manager/keepassxc.nix ../../modules/home-manager/kitty.nix