Compare commits

..

No commits in common. "739e1940410477a251d246012872e3623426efb9" and "89858ee30aaa5bb20d0a17f70d684c903ca41f31" have entirely different histories.

6 changed files with 7 additions and 20 deletions

6
flake.lock generated
View file

@ -265,11 +265,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1742069588, "lastModified": 1741851582,
"narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -9,7 +9,6 @@ let
inherit (lib) mapAttrsToList mkIf hasAttr; inherit (lib) mapAttrsToList mkIf hasAttr;
inherit (lib.my) getExe getExe'; inherit (lib.my) getExe getExe';
roles = osConfig.modules.system.roles;
desktop = osConfig.modules.system.roles.desktop; desktop = osConfig.modules.system.roles.desktop;
in in
mkIf osConfig.programs.hyprland.enable { mkIf osConfig.programs.hyprland.enable {
@ -75,7 +74,7 @@ mkIf osConfig.programs.hyprland.enable {
inactive_opacity = 1.0; inactive_opacity = 1.0;
shadow = { shadow = {
enabled = roles.portable.enable; enabled = true;
range = 4; range = 4;
render_power = 3; render_power = 3;
color = "rgba(1a1a1aee)"; color = "rgba(1a1a1aee)";
@ -83,7 +82,7 @@ mkIf osConfig.programs.hyprland.enable {
# https://wiki.hyprland.org/Configuring/Variables/#blur # https://wiki.hyprland.org/Configuring/Variables/#blur
blur = { blur = {
enabled = roles.portable.enable; enabled = true;
size = 3; size = 3;
passes = 1; passes = 1;
@ -152,7 +151,6 @@ mkIf osConfig.programs.hyprland.enable {
key_press_enables_dpms = true; key_press_enables_dpms = true;
mouse_move_enables_dpms = true; mouse_move_enables_dpms = true;
disable_autoreload = true; disable_autoreload = true;
vfr = true;
}; };
bindm = [ "$mod,mouse:272,movewindow" ]; bindm = [ "$mod,mouse:272,movewindow" ];

View file

@ -24,7 +24,6 @@ in
system = { system = {
roles = { roles = {
desktop.enable = true; desktop.enable = true;
portable.enable = true;
}; };
outputs = { outputs = {

View file

@ -7,10 +7,10 @@
lib.mkIf config.xdg.portal.enable { lib.mkIf config.xdg.portal.enable {
xdg.portal = { xdg.portal = {
config = { config = {
common = { sway = {
default = "*";
"org.freedesktop.impl.portal.Screenshot.PickColor" = [ "${pkgs.hyprpicker}/bin/hyprpicker" ]; "org.freedesktop.impl.portal.Screenshot.PickColor" = [ "${pkgs.hyprpicker}/bin/hyprpicker" ];
}; };
common.default = "*";
}; };
# gtk portal needed to make gtk apps happy # gtk portal needed to make gtk apps happy

View file

@ -3,6 +3,5 @@
./terminal.nix ./terminal.nix
./desktop.nix ./desktop.nix
./gaming.nix ./gaming.nix
./portable.nix
]; ];
} }

View file

@ -1,9 +0,0 @@
{ lib, ... }:
let
inherit (lib) mkEnableOption;
in
{
options.modules.system.roles.portable = {
enable = mkEnableOption "Laptop/Portable tweaks";
};
}