hectic-lab/util.nix
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: fix nixpkgs 25.05 deprecation warnings

Browse Source
This commit is contained in:
yukkop
2026-05-01 22:26:29 +00:00
parent 35e35980b4
commit d64314d68b
7 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/module/hectic/archetype/dev.nix
View File

@@ -61,7 +61,7 @@ in {
# Adjust zsh prompt for dev archetype: show '#' instead of '%' # Adjust zsh prompt for dev archetype: show '#' instead of '%'
home-manager.sharedModules = lib.mkAfter [ home-manager.sharedModules = lib.mkAfter [
{ {
programs.zsh.initExtra = lib.mkAfter '' programs.zsh.initContent = lib.mkAfter ''
PROMPT="# %~ " PROMPT="# %~ "
''; '';
} }

8
nixos/module/hectic/user/yukkop.nix
View File

@@ -53,7 +53,7 @@ in {
services.gpg-agent = { services.gpg-agent = {
enable = true; enable = true;
pinentryPackage = pkgs.pinentry-tty; pinentry.package = pkgs.pinentry-tty;
enableZshIntegration = true; enableZshIntegration = true;
defaultCacheTtl = 60 * 60; defaultCacheTtl = 60 * 60;
maxCacheTtl = 60 * 60 * 24; maxCacheTtl = 60 * 60 * 24;
@@ -67,9 +67,9 @@ in {
programs.git = { programs.git = {
enable = true; enable = true;
lfs.enable = true; lfs.enable = true;
userName = "yukkop"; settings = {
userEmail = "hectic.yukkop@gmail.com"; user.name = "yukkop";
extraConfig = { user.email = "hectic.yukkop@gmail.com";
push.autoSetupRemote = true; push.autoSetupRemote = true;
init.defaultBranch = "master"; init.defaultBranch = "master";
}; };

2
nixos/system/hectic-lab/hectic-lab.nix
View File

@@ -35,7 +35,7 @@ in {
services.hectic-landing = { services.hectic-landing = {
enable = true; enable = true;
package = inputs.hectic-landing.packages.${pkgs.system}.hectic-landing; package = inputs.hectic-landing.packages.${pkgs.stdenv.hostPlatform.system}.hectic-landing;
domain = domain; domain = domain;
port = 3000; port = 3000;
host = "127.0.0.1"; host = "127.0.0.1";

6
nixos/system/wsl/wsl.nix
View File

@@ -40,7 +40,7 @@
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
hardware.opengl.enable = true; hardware.graphics.enable = true;
console.keyMap = "us"; console.keyMap = "us";
@@ -58,13 +58,15 @@
services.samba = { services.samba = {
enable = true; enable = true;
shares.sshfs = { settings = {
sshfs = {
path = "/home/yukkop/umbriel/vproxy"; path = "/home/yukkop/umbriel/vproxy";
browseable = true; browseable = true;
"read only" = false; "read only" = false;
"guest ok" = true; "guest ok" = true;
}; };
}; };
};
networking.firewall.allowedTCPPorts = [ 139 445 ]; networking.firewall.allowedTCPPorts = [ 139 445 ];
networking.firewall.allowedUDPPorts = [ 137 138 ]; networking.firewall.allowedUDPPorts = [ 137 138 ];

4
overlay/default.nix
View File

@@ -2,8 +2,8 @@
lib = inputs.nixpkgs.lib; lib = inputs.nixpkgs.lib;
in final: prev: ( in final: prev: (
let let
packages = self.packages.${prev.system}; packages = self.packages.${prev.stdenv.hostPlatform.system};
legacyPackages = self.legacyPackages.${prev.system}; legacyPackages = self.legacyPackages.${prev.stdenv.hostPlatform.system};
in { in {
hectic = packages // legacyPackages; hectic = packages // legacyPackages;
postgresql_17 = prev.postgresql_17 // {pkgs = prev.postgresql_17.pkgs // { postgresql_17 = prev.postgresql_17 // {pkgs = prev.postgresql_17.pkgs // {

4
package/deploy/default.nix
View File

@@ -1,4 +1,4 @@
{ inputs, symlinkJoin, dash, hectic, ssh-to-age, system }: { inputs, symlinkJoin, dash, hectic, ssh-to-age, stdenv }:
let let
shell = "${dash}/bin/dash"; shell = "${dash}/bin/dash";
bashOptions = [ bashOptions = [
@@ -11,7 +11,7 @@ let
name = "deploy"; name = "deploy";
runtimeInputs = [ runtimeInputs = [
ssh-to-age ssh-to-age
inputs.nixos-anywhere.packages.${system}.nixos-anywhere inputs.nixos-anywhere.packages.${stdenv.hostPlatform.system}.nixos-anywhere
]; ];
text = '' text = ''

4
package/py3-marzban.nix
View File

@@ -1,4 +1,4 @@
{ self,fetchPypi, python3Packages, system }: python3Packages.buildPythonPackage rec { { self,fetchPypi, python3Packages, stdenv }: python3Packages.buildPythonPackage rec {
pname = "marzban"; pname = "marzban";
version = "0.4.3"; version = "0.4.3";
@@ -22,7 +22,7 @@
pydantic pydantic
paramiko paramiko
sshtunnel sshtunnel
]) ++ (with self.packages.${system}; [ ]) ++ (with self.packages.${stdenv.hostPlatform.system}; [
py3-datetime py3-datetime
]); ]);