This commit is contained in:
parent
83a672b3a9
commit
eb591d4b9c
6 changed files with 17 additions and 9 deletions
6
flake.lock
generated
6
flake.lock
generated
|
@ -186,11 +186,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1740334274,
|
"lastModified": 1740423947,
|
||||||
"narHash": "sha256-7WePvSVCZFoq10tf0LF6MsYbS/JPl/eQjE6zsfz5RpE=",
|
"narHash": "sha256-TLUC9rkFZBvKSnNtrdkHY0NsnKmW6XYRIdje6Yt2b3w=",
|
||||||
"owner": "nydragon",
|
"owner": "nydragon",
|
||||||
"repo": "hjem-rum",
|
"repo": "hjem-rum",
|
||||||
"rev": "20b1173bc9fee5ef26a11578934f01992b84e5a2",
|
"rev": "de016de0f8e602529f88c0dbd840e4091b566f3f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inherit (lib) mapAttrsToList mkIf hasAttr;
|
inherit (lib) mapAttrsToList mkIf hasAttr;
|
||||||
|
inherit (lib.my) getExe;
|
||||||
in
|
in
|
||||||
mkIf osConfig.programs.hyprland.enable {
|
mkIf osConfig.programs.hyprland.enable {
|
||||||
home.sessionVariables.ELECTRON_OZONE_PLATFORM_HINT = "auto";
|
home.sessionVariables.ELECTRON_OZONE_PLATFORM_HINT = "auto";
|
||||||
|
@ -148,13 +149,13 @@ mkIf osConfig.programs.hyprland.enable {
|
||||||
bindm = [ "$mod,mouse:272,movewindow" ];
|
bindm = [ "$mod,mouse:272,movewindow" ];
|
||||||
|
|
||||||
bind = [
|
bind = [
|
||||||
"$mod, D, exec, ${pkgs.fuzzel}/bin/fuzzel"
|
"$mod, D, exec, ${getExe osConfig.modules.system.roles.desktop.runner.package}"
|
||||||
"$mod, E, exec, ${lib.my.getExe osConfig.modules.system.roles.desktop.filemanager}"
|
"$mod, E, exec, ${getExe osConfig.modules.system.roles.desktop.filemanager}"
|
||||||
"$mod, Return, exec, ${lib.my.getExe osConfig.modules.system.roles.desktop.terminal}"
|
"$mod, Return, exec, ${getExe osConfig.modules.system.roles.desktop.terminal}"
|
||||||
"$mod SHIFT, Q, killactive,"
|
"$mod SHIFT, Q, killactive,"
|
||||||
"$mod, V, togglefloating"
|
"$mod, V, togglefloating"
|
||||||
"$mod SHIFT, P, exec, ${config.programs.rofi.package}/bin/rofi -show p -modi p:${pkgs.rofi-power-menu}/bin/rofi-power-menu"
|
"$mod SHIFT, P, exec, ${config.programs.rofi.package}/bin/rofi -show p -modi p:${pkgs.rofi-power-menu}/bin/rofi-power-menu"
|
||||||
"$mod, P, exec, ${pkgs.cliphist}/bin/cliphist wipe & ${pkgs.hyprlock}/bin/hyprlock"
|
"$mod, P, exec, ${getExe pkgs.cliphist} wipe & ${getExe pkgs.hyprlock}"
|
||||||
"$mod SHIFT, C, exec, hyprctl reload"
|
"$mod SHIFT, C, exec, hyprctl reload"
|
||||||
"$mod SHIFT, space, togglefloating"
|
"$mod SHIFT, space, togglefloating"
|
||||||
"$mod, left, movefocus, l"
|
"$mod, left, movefocus, l"
|
||||||
|
|
|
@ -18,6 +18,8 @@ in
|
||||||
extraModules = [
|
extraModules = [
|
||||||
inputs.disko.nixosModules.disko
|
inputs.disko.nixosModules.disko
|
||||||
inputs.agenix.nixosModules.default
|
inputs.agenix.nixosModules.default
|
||||||
|
inputs.hjem.nixosModules.default
|
||||||
|
inputs.hjem-rum.nixosModules.default
|
||||||
];
|
];
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
./home.nix
|
./home.nix
|
||||||
./ny.nix
|
./ny.nix
|
||||||
|
../../users/ny
|
||||||
];
|
];
|
||||||
|
|
||||||
time.timeZone = "Europe/Paris";
|
time.timeZone = "Europe/Paris";
|
||||||
|
|
|
@ -1,9 +1,13 @@
|
||||||
|
{ lib, ... }:
|
||||||
{
|
{
|
||||||
hjem = {
|
hjem = {
|
||||||
users.ny = {
|
users.ny = {
|
||||||
enable = true;
|
enable = true;
|
||||||
imports = [ ./programs ];
|
imports = [ ./programs ];
|
||||||
};
|
};
|
||||||
|
specialArgs = {
|
||||||
|
libmy = lib.my;
|
||||||
|
};
|
||||||
clobberByDefault = true;
|
clobberByDefault = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, osConfig, ... }:
|
{ libmy, osConfig, ... }:
|
||||||
let
|
let
|
||||||
inherit (osConfig.modules.system.roles) desktop;
|
inherit (osConfig.modules.system.roles) desktop;
|
||||||
in
|
in
|
||||||
|
@ -12,7 +12,7 @@ in
|
||||||
font = "Hack:weight=bold";
|
font = "Hack:weight=bold";
|
||||||
line-height = 30;
|
line-height = 30;
|
||||||
fields = "name,generic,comment";
|
fields = "name,generic,comment";
|
||||||
terminal = lib.my.getExe desktop.terminal;
|
terminal = libmy.getExe desktop.terminal;
|
||||||
prompt = ''"❯ "'';
|
prompt = ''"❯ "'';
|
||||||
layer = "overlay";
|
layer = "overlay";
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Reference in a new issue