mirror of
https://github.com/SebastianStork/nixos-config.git
synced 2026-01-21 15:11:34 +01:00
Upgrade to nixos 25.05
This commit is contained in:
parent
fce4ee95d7
commit
67b18d9c1d
16 changed files with 45 additions and 82 deletions
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
config,
|
||||
pkgs-unstable,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
|
|
@ -10,7 +9,6 @@
|
|||
config = lib.mkIf config.myConfig.deUtils.hypridle.enable {
|
||||
services.hypridle = {
|
||||
enable = true;
|
||||
package = pkgs-unstable.hypridle;
|
||||
|
||||
settings = {
|
||||
general = {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
config,
|
||||
pkgs-unstable,
|
||||
lib,
|
||||
...
|
||||
}@moduleArgs:
|
||||
|
|
@ -18,7 +17,6 @@ in
|
|||
config = lib.mkIf cfg.enable {
|
||||
programs.hyprlock = {
|
||||
enable = true;
|
||||
package = pkgs-unstable.hyprlock;
|
||||
|
||||
settings = {
|
||||
general.immediate_render = true;
|
||||
|
|
|
|||
|
|
@ -1,15 +1,10 @@
|
|||
{
|
||||
config,
|
||||
inputs,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}@moduleArgs:
|
||||
{
|
||||
# Use unstable hyprland module for nullable package
|
||||
disabledModules = [ "services/window-managers/hyprland.nix" ];
|
||||
imports = [ "${inputs.home-manager-unstable}/modules/services/window-managers/hyprland.nix" ];
|
||||
|
||||
options.myConfig.de.hyprland.enable = lib.mkEnableOption "" // {
|
||||
default = moduleArgs.osConfig.myConfig.de.hyprland.enable or false;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@
|
|||
|
||||
"special:music, gapsout:30, on-created-empty:spotify"
|
||||
"special:chat, gapsout:30, on-created-empty:discord"
|
||||
"special:flake, gapsout:30, on-created-empty:kitty --directory ${config.home.sessionVariables.FLAKE}"
|
||||
"special:flake, gapsout:30, on-created-empty:kitty --directory ${config.home.sessionVariables.NH_FLAKE}"
|
||||
"special:monitor, gapsout:30, on-created-empty:kitty btm"
|
||||
"special:files, gapsout:30, on-created-empty:nemo"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
config,
|
||||
inputs,
|
||||
pkgs,
|
||||
pkgs-unstable,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
|
|
@ -12,7 +11,6 @@
|
|||
config = lib.mkIf config.myConfig.firefox.enable {
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
package = pkgs-unstable.firefox;
|
||||
|
||||
profiles.default = {
|
||||
settings =
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
}
|
||||
];
|
||||
|
||||
initExtra = ''
|
||||
initContent = ''
|
||||
zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-Z}'
|
||||
zstyle ':completion:*' list-colors ''${(s.:.)LS_COLORS}
|
||||
zstyle ':completion:*' menu no
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
}
|
||||
];
|
||||
|
||||
initExtraFirst = ''
|
||||
initContent = lib.mkBefore ''
|
||||
(( ''${+commands[direnv]} )) && emulate zsh -c "$(direnv export zsh)"
|
||||
|
||||
if [[ -r "''${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh" ]]; then
|
||||
|
|
|
|||
|
|
@ -12,22 +12,20 @@
|
|||
config = lib.mkIf config.myConfig.vscode.enable {
|
||||
programs.vscode = {
|
||||
enable = true;
|
||||
package = pkgs-unstable.vscode-with-extensions.override {
|
||||
vscode = pkgs-unstable.vscodium;
|
||||
vscodeExtensions =
|
||||
let
|
||||
inherit (inputs.nix-vscode-extensions.extensions.${pkgs.system}) open-vsx;
|
||||
in
|
||||
[
|
||||
open-vsx.jnoortheen.nix-ide
|
||||
open-vsx.aaron-bond.better-comments
|
||||
open-vsx.llvm-vs-code-extensions.vscode-clangd
|
||||
open-vsx.nefrob.vscode-just-syntax
|
||||
package = pkgs-unstable.vscodium;
|
||||
profiles.default.extensions =
|
||||
let
|
||||
inherit (inputs.nix-vscode-extensions.extensions.${pkgs.system}) open-vsx;
|
||||
in
|
||||
[
|
||||
open-vsx.jnoortheen.nix-ide
|
||||
open-vsx.aaron-bond.better-comments
|
||||
open-vsx.llvm-vs-code-extensions.vscode-clangd
|
||||
open-vsx.nefrob.vscode-just-syntax
|
||||
|
||||
open-vsx.github.github-vscode-theme
|
||||
open-vsx.pkief.material-icon-theme
|
||||
];
|
||||
};
|
||||
open-vsx.github.github-vscode-theme
|
||||
open-vsx.pkief.material-icon-theme
|
||||
];
|
||||
};
|
||||
|
||||
systemd.user.tmpfiles.rules =
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue