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

Upgrade to nixpkgs 25.05

Browse Source
This commit is contained in:
marc
2025-05-24 19:06:04 +02:00
parent fc548af96a
commit df6c1c9402
10 changed files with 539 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/app/alacritty.nix
View File

@@ -18,7 +18,7 @@ in
fonts.packages = with pkgs; [
iosevka
(nerdfonts.override { fonts = [ "Iosevka" ]; })
pkgs.nerd-fonts.iosevka
];
hm.xdg.configFile."alacritty/alacritty.toml".source = ../../config/alacritty/alacritty.toml;

2
modules/app/yazi.nix
View File

@@ -26,7 +26,7 @@ in
fonts.packages = with pkgs; [
iosevka
(nerdfonts.override { fonts = [ "Iosevka" ]; })
pkgs.nerd-fonts.iosevka
];

2
modules/common.nix
View File

@@ -27,7 +27,7 @@
# - Locale -------------------------------------
time.timeZone = "Europe/Madrid";
i18n.defaultLocale = "ca_ES.utf8";
i18n.defaultLocale = "ca_ES.UTF-8";
console.keyMap = "es";
services.xserver.xkb = {
layout = "es";

12
modules/desktop/tools/hyprlock.nix
View File

@@ -12,9 +12,9 @@ in
config = mkIf cfg.enable {
# environment.systemPackages = with pkgs; [
# hypridle
# ];
environment.systemPackages = with pkgs; [
hypridle
];
hm.programs.hyprlock = {
enable = true;
@@ -107,9 +107,9 @@ in
};
# - Execute on startup -----------------------
# hm.wayland.windowManager.hyprland.settings.exec-once = [
# "hypridle"
# ];
hm.wayland.windowManager.hyprland.settings.exec-once = [
"hypridle"
];
};
}

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

@@ -24,13 +24,13 @@ in {
hm.wayland.windowManager.hyprland = {
enable = true;
package = pkgs.hyprland;
package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
xwayland.enable = true;
systemd.enable = true;
plugins = [
pkgs.hyprlandPlugins.hy3
inputs.hy3.packages.${pkgs.stdenv.hostPlatform.system}.hy3
];
settings = {

2
modules/desktop/wm/i3.nix
View File

@@ -31,7 +31,7 @@ in {
fonts.packages = with pkgs; [
iosevka
(nerdfonts.override { fonts = [ "Iosevka" ]; })
pkgs.nerd-fonts.iosevka
];
services.xserver = {

45
modules/shell/zsh.nix
View File

@@ -23,27 +23,32 @@ in
enableCompletion = true;
syntaxHighlighting.enable = true;
initExtra = ''
# Source generic (bash) configuration
if [ -d $HOME/.config/shell/sh ]; then
for rc in $HOME/.config/shell/sh/*.sh; do
emulate bash -c ". $rc"
done
fi
initContent = let
zshConfigBeforeCompInit = lib.mkOrder 550 ''
# p10k instant prompt
P10K_INSTANT_PROMPT="$XDG_CACHE_HOME/p10k-instant-prompt-''${(%):-%n}.zsh"
[[ ! -r "$P10K_INSTANT_PROMPT" ]] || source "$P10K_INSTANT_PROMPT"
'';
zshConfig = lib.mkOrder 1000 ''
# Source generic (bash) configuration
if [ -d $HOME/.config/shell/sh ]; then
for rc in $HOME/.config/shell/sh/*.sh; do
emulate bash -c ". $rc"
done
fi
# Source zsh specific configuration
if [[ -d $HOME/.config/shell/zsh ]]; then
for rc in $HOME/.config/shell/zsh/*.zsh; do
source $rc
done
fi
'';
initExtraBeforeCompInit = ''
# p10k instant prompt
P10K_INSTANT_PROMPT="$XDG_CACHE_HOME/p10k-instant-prompt-''${(%):-%n}.zsh"
[[ ! -r "$P10K_INSTANT_PROMPT" ]] || source "$P10K_INSTANT_PROMPT"
'';
# Source zsh specific configuration
if [[ -d $HOME/.config/shell/zsh ]]; then
for rc in $HOME/.config/shell/zsh/*.zsh; do
source $rc
done
fi
'';
in
lib.mkMerge [
zshConfigBeforeCompInit
zshConfig
];
oh-my-zsh = {
enable = true;