Merge remote-tracking branch 'origin/main' into thinkpad
This commit is contained in:
@ -7,6 +7,7 @@ in
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
"$mainMod" = "SUPER";
|
||||
"$shiftMod" = "$mainMod SHIFT";
|
||||
"$ctrlMod" = "$mainMod CTRL";
|
||||
"$menu" = "rofi -show drun";
|
||||
|
||||
bind = [
|
||||
@ -29,6 +30,12 @@ in
|
||||
"$mainMod, up, movefocus, u"
|
||||
"$mainMod, down, movefocus, d"
|
||||
|
||||
# Move window with ctrl + mainMod + arrow keys
|
||||
"$ctrlMod, left, movewindow, l"
|
||||
"$ctrlMod, right, movewindow, r"
|
||||
"$ctrlMod, up, movewindow, u"
|
||||
"$ctrlMod, down, movewindow, d"
|
||||
|
||||
# Switch workspaces with mainMod + [0-9]
|
||||
"$mainMod, 1, workspace, 1"
|
||||
"$mainMod, 2, workspace, 2"
|
||||
|
@ -1,7 +1,13 @@
|
||||
{ pkgs, inputs, ... }:
|
||||
{
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
common = import ../../../common.nix;
|
||||
theme = import ../../../theme.nix;
|
||||
loader = import ../../secretsLoader.nix lib;
|
||||
in
|
||||
{
|
||||
imports = [ inputs.hyprpanel.homeManagerModules.hyprpanel ];
|
||||
@ -75,7 +81,8 @@ in
|
||||
};
|
||||
weather = {
|
||||
unit = "metric";
|
||||
location = "Bergen, Norway"; # TODO not working
|
||||
location = "Bergen, Norway";
|
||||
key = loader.loadSecret ../../secrets/weather-api-key;
|
||||
};
|
||||
};
|
||||
|
||||
@ -110,7 +117,7 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
wallpaper.enable = true;
|
||||
wallpaper.enable = false;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
Reference in New Issue
Block a user