flake: fix deprecations
This commit is contained in:
parent
33a73074b5
commit
2ad46d7442
6 changed files with 27 additions and 14 deletions
|
|
@ -12,9 +12,17 @@ rec {
|
||||||
|
|
||||||
scripts = (import ../scripts);
|
scripts = (import ../scripts);
|
||||||
|
|
||||||
unstable = final: prev: {
|
unstable =
|
||||||
unstable = import inputs.nixpkgs-unstable { inherit (final) system config; };
|
final: prev:
|
||||||
pkgs-mesa-26 = import inputs.nixpkgs-mesa-26 { inherit (final) system config; };
|
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 = (
|
themes = (
|
||||||
|
|
@ -34,14 +42,18 @@ rec {
|
||||||
|
|
||||||
new-packages = (
|
new-packages = (
|
||||||
final: prev:
|
final: prev:
|
||||||
|
let
|
||||||
|
system = prev.stdenv.hostPlatform.system;
|
||||||
|
in
|
||||||
packages
|
packages
|
||||||
// {
|
// {
|
||||||
lsfg-vk = inputs.lsfg-vk-flake.packages.${prev.system}.lsfg-vk;
|
lsfg-vk = inputs.lsfg-vk-flake.packages.${system}.lsfg-vk;
|
||||||
lsfg-vk-ui = inputs.lsfg-vk-flake.packages.${prev.system}.lsfg-vk-ui;
|
lsfg-vk-ui = inputs.lsfg-vk-flake.packages.${system}.lsfg-vk-ui;
|
||||||
dhist = inputs.dhist.packages.${prev.system}.dhist;
|
dhist = inputs.dhist.packages.${system}.dhist;
|
||||||
demoji = inputs.demoji.packages.${prev.system}.default;
|
demoji = inputs.demoji.packages.${system}.default;
|
||||||
tlauncher = inputs.tlauncher.packages.${prev.system}.tlauncher;
|
tlauncher = inputs.tlauncher.packages.${system}.tlauncher;
|
||||||
wl-crosshair = inputs.wl-crosshair.packages.${prev.system}.default;
|
wl-crosshair = inputs.wl-crosshair.packages.${system}.default;
|
||||||
|
dzgui = inputs.dzgui-nix.packages.${system}.default;
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
||||||
2
switch
2
switch
|
|
@ -12,7 +12,7 @@ git --no-pager diff
|
||||||
run() {
|
run() {
|
||||||
nixos-rebuild \
|
nixos-rebuild \
|
||||||
switch \
|
switch \
|
||||||
--use-remote-sudo \
|
--sudo \
|
||||||
--print-build-logs \
|
--print-build-logs \
|
||||||
--flake .# \
|
--flake .# \
|
||||||
"$@"
|
"$@"
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
protontricks
|
protontricks
|
||||||
bottles
|
bottles
|
||||||
inputs.dzgui-nix.packages.${pkgs.system}.default
|
dzgui
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.gamemode = {
|
programs.gamemode = {
|
||||||
|
|
|
||||||
|
|
@ -48,7 +48,7 @@ in
|
||||||
'';
|
'';
|
||||||
greetd_main_script = pkgs.writeShellScriptBin "main" ''
|
greetd_main_script = pkgs.writeShellScriptBin "main" ''
|
||||||
export XDG_CURRENT_DESKTOP=sway GTK_THEME="${theme.gtk_theme}" XCURSOR_THEME="${theme.cursor_theme}"
|
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
|
swaymsg exit
|
||||||
'';
|
'';
|
||||||
swayConfig = pkgs.writeText "greetd-sway-config" ''
|
swayConfig = pkgs.writeText "greetd-sway-config" ''
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ in
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
lfs.enable = true;
|
lfs.enable = true;
|
||||||
extraConfig = {
|
settings = {
|
||||||
user = {
|
user = {
|
||||||
name = username;
|
name = username;
|
||||||
email = mail.personal.user;
|
email = mail.personal.user;
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
config = {
|
config = {
|
||||||
programs.ssh = {
|
programs.ssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
enableDefaultConfig = false;
|
||||||
matchBlocks = {
|
matchBlocks = {
|
||||||
monolith = {
|
monolith = {
|
||||||
user = "lelgenio";
|
user = "lelgenio";
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue