diff --git a/flake.lock b/flake.lock index 5717bbae..d1cb54cd 100644 --- a/flake.lock +++ b/flake.lock @@ -96,7 +96,7 @@ "type": "github" } }, - "dankMaterialShell": { + "dank-material-shell": { "inputs": { "dgop": [ "dgop" @@ -1264,7 +1264,7 @@ "quickshell": { "inputs": { "nixpkgs": [ - "dankMaterialShell", + "dank-material-shell", "nixpkgs" ] }, @@ -1306,7 +1306,7 @@ "root": { "inputs": { "caelestia": "caelestia", - "dankMaterialShell": "dankMaterialShell", + "dank-material-shell": "dank-material-shell", "devshell": "devshell", "dgop": "dgop", "disko": "disko", diff --git a/flake.nix b/flake.nix index 126e1a2e..70751a4f 100644 --- a/flake.nix +++ b/flake.nix @@ -77,9 +77,9 @@ dgop.inputs.nixpkgs.follows = "nixpkgs"; # dms-cli.url = "github:AvengeMedia/danklinux"; # dms-cli.inputs.nixpkgs.follows = "nixpkgs"; - dankMaterialShell.url = "github:AvengeMedia/DankMaterialShell"; - dankMaterialShell.inputs.nixpkgs.follows = "nixpkgs"; - dankMaterialShell.inputs.dgop.follows = "dgop"; + dank-material-shell.url = "github:AvengeMedia/DankMaterialShell"; + dank-material-shell.inputs.nixpkgs.follows = "nixpkgs"; + dank-material-shell.inputs.dgop.follows = "dgop"; # Hyprland (use flake so plugins are not built from source) hyprland.url = "github:hyprwm/Hyprland"; diff --git a/home/modules/default.nix b/home/modules/default.nix index 640d26f0..33a5ef7d 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -35,8 +35,8 @@ # inputs.niri.homeModules.niri # Imported by system module inputs.noctalia.homeModules.default inputs.caelestia.homeManagerModules.default - inputs.dankMaterialShell.homeModules.dankMaterialShell.default - inputs.dankMaterialShell.homeModules.dankMaterialShell.niri + inputs.dank-material-shell.homeModules.dank-material-shell + inputs.dank-material-shell.homeModules.niri # NOTE: Do NOT use this, use the system module (the HM module has to rely on fuse) # inputs.impermanence.homeManagerModules.impermanence diff --git a/home/modules/niri/default.nix b/home/modules/niri/default.nix index 83d601a0..350a3c1f 100644 --- a/home/modules/niri/default.nix +++ b/home/modules/niri/default.nix @@ -18,7 +18,7 @@ in { message = "Can't enable Niri config with Niri disabled!"; } { - assertion = !(programs.noctalia-shell.enable && programs.dankMaterialShell.enable); + assertion = !(programs.noctalia-shell.enable && programs.dank-material-shell.enable); message = "Can't enable Noctalia and DankMaterialShell at the same time!"; } ]; @@ -61,7 +61,7 @@ in { programs = { # TODO: Those should be modules with their own options noctalia-shell = import ./noctalia.nix {inherit color;}; - dankMaterialShell = import ./dankMaterialShell.nix {inherit color;}; + dank-material-shell = import ./dankMaterialShell.nix {inherit color;}; # TODO: Extract options niri = { @@ -386,6 +386,14 @@ in { action = show-hotkey-overlay; hotkey-overlay = {hidden = true;}; }; + # "Alt+Tab" = { + # action = "next-window"; + # hotkey-overlay = {title = "Switch to next window.";}; + # }; + # "Alt+Shift+Tab" = { + # action = "previous-window"; + # hotkey-overlay = {title = "Switch to previous window.";}; + # }; # Audio "XF86AudioRaiseVolume" = {