chore: fix nixpkgs 25.05 deprecation warnings
This commit is contained in:
@@ -61,7 +61,7 @@ in {
|
||||
# Adjust zsh prompt for dev archetype: show '#' instead of '%'
|
||||
home-manager.sharedModules = lib.mkAfter [
|
||||
{
|
||||
programs.zsh.initExtra = lib.mkAfter ''
|
||||
programs.zsh.initContent = lib.mkAfter ''
|
||||
PROMPT="# %~ "
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -53,7 +53,7 @@ in {
|
||||
|
||||
services.gpg-agent = {
|
||||
enable = true;
|
||||
pinentryPackage = pkgs.pinentry-tty;
|
||||
pinentry.package = pkgs.pinentry-tty;
|
||||
enableZshIntegration = true;
|
||||
defaultCacheTtl = 60 * 60;
|
||||
maxCacheTtl = 60 * 60 * 24;
|
||||
@@ -67,9 +67,9 @@ in {
|
||||
programs.git = {
|
||||
enable = true;
|
||||
lfs.enable = true;
|
||||
userName = "yukkop";
|
||||
userEmail = "hectic.yukkop@gmail.com";
|
||||
extraConfig = {
|
||||
settings = {
|
||||
user.name = "yukkop";
|
||||
user.email = "hectic.yukkop@gmail.com";
|
||||
push.autoSetupRemote = true;
|
||||
init.defaultBranch = "master";
|
||||
};
|
||||
|
||||
@@ -35,7 +35,7 @@ in {
|
||||
|
||||
services.hectic-landing = {
|
||||
enable = true;
|
||||
package = inputs.hectic-landing.packages.${pkgs.system}.hectic-landing;
|
||||
package = inputs.hectic-landing.packages.${pkgs.stdenv.hostPlatform.system}.hectic-landing;
|
||||
domain = domain;
|
||||
port = 3000;
|
||||
host = "127.0.0.1";
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
|
||||
virtualisation.docker.enable = true;
|
||||
|
||||
hardware.opengl.enable = true;
|
||||
hardware.graphics.enable = true;
|
||||
|
||||
console.keyMap = "us";
|
||||
|
||||
@@ -58,11 +58,13 @@
|
||||
|
||||
services.samba = {
|
||||
enable = true;
|
||||
shares.sshfs = {
|
||||
path = "/home/yukkop/umbriel/vproxy";
|
||||
browseable = true;
|
||||
"read only" = false;
|
||||
"guest ok" = true;
|
||||
settings = {
|
||||
sshfs = {
|
||||
path = "/home/yukkop/umbriel/vproxy";
|
||||
browseable = true;
|
||||
"read only" = false;
|
||||
"guest ok" = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
lib = inputs.nixpkgs.lib;
|
||||
in final: prev: (
|
||||
let
|
||||
packages = self.packages.${prev.system};
|
||||
legacyPackages = self.legacyPackages.${prev.system};
|
||||
packages = self.packages.${prev.stdenv.hostPlatform.system};
|
||||
legacyPackages = self.legacyPackages.${prev.stdenv.hostPlatform.system};
|
||||
in {
|
||||
hectic = packages // legacyPackages;
|
||||
postgresql_17 = prev.postgresql_17 // {pkgs = prev.postgresql_17.pkgs // {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ inputs, symlinkJoin, dash, hectic, ssh-to-age, system }:
|
||||
{ inputs, symlinkJoin, dash, hectic, ssh-to-age, stdenv }:
|
||||
let
|
||||
shell = "${dash}/bin/dash";
|
||||
bashOptions = [
|
||||
@@ -11,7 +11,7 @@ let
|
||||
name = "deploy";
|
||||
runtimeInputs = [
|
||||
ssh-to-age
|
||||
inputs.nixos-anywhere.packages.${system}.nixos-anywhere
|
||||
inputs.nixos-anywhere.packages.${stdenv.hostPlatform.system}.nixos-anywhere
|
||||
];
|
||||
|
||||
text = ''
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ self,fetchPypi, python3Packages, system }: python3Packages.buildPythonPackage rec {
|
||||
{ self,fetchPypi, python3Packages, stdenv }: python3Packages.buildPythonPackage rec {
|
||||
pname = "marzban";
|
||||
version = "0.4.3";
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
pydantic
|
||||
paramiko
|
||||
sshtunnel
|
||||
]) ++ (with self.packages.${system}; [
|
||||
]) ++ (with self.packages.${stdenv.hostPlatform.system}; [
|
||||
py3-datetime
|
||||
]);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user