marc/samfelag
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Flake upgrade

Browse Source
This commit is contained in:
marc
2026-05-09 19:26:48 +02:00
parent 2822b3413c
commit 2d57da56b2
9 changed files with 99 additions and 531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/desktop/grapheio.nix
View File

@@ -21,7 +21,7 @@ in
rose-pine-gtk-theme
rose-pine-icon-theme
# - Cursor
inputs.hyprcursor-rose-pine.packages.${pkgs.system}.default
inputs.hyprcursor-rose-pine.packages.${pkgs.stdenv.hostPlatform.system}.default
rose-pine-cursor
];

4
modules/desktop/tools/greetd.nix
View File

@@ -12,7 +12,7 @@ in {
config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs; [
greetd.gtkgreet
gtkgreet
cage
];
@@ -20,7 +20,7 @@ in {
enable = true;
settings = {
default_session = {
command = "${pkgs.cage}/bin/cage -d -s ${pkgs.greetd.gtkgreet}/bin/gtkgreet -- -c ${cfg.wm_cmd} -s /etc/greetd/greetd.css";
command = "${pkgs.cage}/bin/cage -d -s ${pkgs.gtkgreet}/bin/gtkgreet -- -c ${cfg.wm_cmd} -s /etc/greetd/greetd.css";
user = config.user.name;
};
};

22
modules/desktop/tools/rofi.nix
View File

@@ -11,12 +11,9 @@ in
enable = lib.mkEnableOption "rofi";
};
config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs;
if hyprCfg.enable then [
rofi-wayland
] else [
environment.systemPackages = with pkgs; [
rofi
];
];
hm.xdg.configFile."rofi/menus".source = ../../../config/rofi/menus;
hm.xdg.configFile."rofi/nix.png".source = nix-colors-lib.nixWallpaperFromScheme {
@@ -39,11 +36,16 @@ in
}
'';
samfelag.modules.desktop.wm.hyprland.extraKeybindings = lib.mkIf hyprCfg.enable [
"${hyprCfg.mod}, SPACE, exec, $HOME/.config/rofi/menus/launcher/launcher.sh"
"${hyprCfg.mod} SHIFT, P, exec, $HOME/.config/rofi/menus/powermenu/powermenu.sh"
"${hyprCfg.mod} SHIFT, W, exec, $HOME/.config/rofi/menus/wifi/wifi.sh"
];
samfelag.modules.desktop.wm.hyprland = lib.mkIf hyprCfg.enable {
extraKeybindings = [
"${hyprCfg.mod}, SPACE, exec, $HOME/.config/rofi/menus/launcher/launcher.sh"
"${hyprCfg.mod} SHIFT, P, exec, $HOME/.config/rofi/menus/powermenu/powermenu.sh"
"${hyprCfg.mod} SHIFT, W, exec, $HOME/.config/rofi/menus/wifi/wifi.sh"
];
extraGestures = [
"3, up, dispatcher, exec, $HOME/.config/rofi/menus/launcher/launcher.sh"
];
};
samfelag.modules.desktop.wm.i3.extraKeybindings = lib.mkIf i3Cfg.enable {
"${i3Cfg.mod}+space" = "exec $HOME/.config/rofi/menus/launcher/launcher.sh";

13
modules/desktop/wm/hyprland.nix
View File

@@ -10,6 +10,7 @@ in {
mod = my.mkOpt' types.str "Mod4" "Main modifier key for hyprland";
kb_layout = my.mkOpt' types.str "es" "Keyboard layout(s) for hyprland";
extraKeybindings = my.mkOpt (types.listOf types.str) [ ];
extraGestures = my.mkOpt (types.listOf types.str) [ ];
};
config = lib.mkIf cfg.enable {
@@ -24,13 +25,14 @@ in {
hm.wayland.windowManager.hyprland = {
enable = true;
package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
# package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
xwayland.enable = true;
systemd.enable = true;
plugins = [
inputs.hy3.packages.${pkgs.stdenv.hostPlatform.system}.hy3
# inputs.hy3.packages.${pkgs.stdenv.hostPlatform.system}.hy3
pkgs.hyprlandPlugins.hy3
];
settings = {
@@ -57,10 +59,9 @@ in {
rounding = 10;
};
gestures = {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
workspace_swipe = true;
};
gesture = [
"3, horizontal, workspace"
] ++ cfg.extraGestures;
bind = [

12
modules/dev/git.nix
View File

@@ -16,17 +16,19 @@ in
hm.programs.git = {
enable = true;
userName = cfg.userName;
userEmail = cfg.userEmail;
settings = {
user = {
name = cfg.userName;
email = cfg.userEmail;
};
init.defaultBranch = "main";
};
ignores = [
".direnv"
".project"
];
extraConfig = {
init.defaultBranch = "main";
};
};
};
}

2
modules/system/gpg.nix
View File

@@ -14,7 +14,7 @@ in
pinentryPackage = pkgs.pinentry-qt;
};
environment.systemPackages = with pkgs; [
pinentry
pinentry-gnome3
];
};
}