flake: fix deprecations

This commit is contained in:
Leonardo Eugênio 2026-02-22 13:05:48 -03:00
parent 33a73074b5
commit 2ad46d7442
6 changed files with 27 additions and 14 deletions

View file

@ -12,9 +12,17 @@ rec {
scripts = (import ../scripts);
unstable = final: prev: {
unstable = import inputs.nixpkgs-unstable { inherit (final) system config; };
pkgs-mesa-26 = import inputs.nixpkgs-mesa-26 { inherit (final) system config; };
unstable =
final: prev:
let
args = {
inherit (final) config;
system = prev.stdenv.hostPlatform.system;
};
in
{
unstable = import inputs.nixpkgs-unstable args;
pkgs-mesa-26 = import inputs.nixpkgs-mesa-26 args;
};
themes = (
@ -34,14 +42,18 @@ rec {
new-packages = (
final: prev:
let
system = prev.stdenv.hostPlatform.system;
in
packages
// {
lsfg-vk = inputs.lsfg-vk-flake.packages.${prev.system}.lsfg-vk;
lsfg-vk-ui = inputs.lsfg-vk-flake.packages.${prev.system}.lsfg-vk-ui;
dhist = inputs.dhist.packages.${prev.system}.dhist;
demoji = inputs.demoji.packages.${prev.system}.default;
tlauncher = inputs.tlauncher.packages.${prev.system}.tlauncher;
wl-crosshair = inputs.wl-crosshair.packages.${prev.system}.default;
lsfg-vk = inputs.lsfg-vk-flake.packages.${system}.lsfg-vk;
lsfg-vk-ui = inputs.lsfg-vk-flake.packages.${system}.lsfg-vk-ui;
dhist = inputs.dhist.packages.${system}.dhist;
demoji = inputs.demoji.packages.${system}.default;
tlauncher = inputs.tlauncher.packages.${system}.tlauncher;
wl-crosshair = inputs.wl-crosshair.packages.${system}.default;
dzgui = inputs.dzgui-nix.packages.${system}.default;
}
);

2
switch
View file

@ -12,7 +12,7 @@ git --no-pager diff
run() {
nixos-rebuild \
switch \
--use-remote-sudo \
--sudo \
--print-build-logs \
--flake .# \
"$@"

View file

@ -35,7 +35,7 @@
environment.systemPackages = with pkgs; [
protontricks
bottles
inputs.dzgui-nix.packages.${pkgs.system}.default
dzgui
];
programs.gamemode = {

View file

@ -48,7 +48,7 @@ in
'';
greetd_main_script = pkgs.writeShellScriptBin "main" ''
export XDG_CURRENT_DESKTOP=sway GTK_THEME="${theme.gtk_theme}" XCURSOR_THEME="${theme.cursor_theme}"
${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -c ${lib.getExe start-sway}
${pkgs.gtkgreet}/bin/gtkgreet -l -c ${lib.getExe start-sway}
swaymsg exit
'';
swayConfig = pkgs.writeText "greetd-sway-config" ''

View file

@ -12,7 +12,7 @@ in
programs.git = {
enable = true;
lfs.enable = true;
extraConfig = {
settings = {
user = {
name = username;
email = mail.personal.user;

View file

@ -2,6 +2,7 @@
config = {
programs.ssh = {
enable = true;
enableDefaultConfig = false;
matchBlocks = {
monolith = {
user = "lelgenio";