all: cleanup dead code
This commit is contained in:
parent
4100ba4a66
commit
7d6022024f
2
bin/fmt
2
bin/fmt
@ -5,7 +5,7 @@ set -e
|
|||||||
find . -name \*.nix -exec nix fmt {} \+
|
find . -name \*.nix -exec nix fmt {} \+
|
||||||
find . -name \*.sh -exec shfmt -w {} \+
|
find . -name \*.sh -exec shfmt -w {} \+
|
||||||
|
|
||||||
deadnix -f -l -L .
|
deadnix -f .
|
||||||
shfmt -w bin/deploy
|
shfmt -w bin/deploy
|
||||||
shfmt -w bin/mkboot
|
shfmt -w bin/mkboot
|
||||||
statix check .
|
statix check .
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ pkgs, lib, isUnstable, ... }:
|
{ pkgs, isUnstable, ... }:
|
||||||
let
|
let
|
||||||
gosignify = pkgs.callPackage ../pkgs/gosignify.nix { inherit isUnstable; };
|
gosignify = pkgs.callPackage ../pkgs/gosignify.nix { inherit isUnstable; };
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, inputs, xinlib, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
let
|
let
|
||||||
cfg = config.services.xinCA;
|
cfg = config.services.xinCA;
|
||||||
stepKmsPlugin = pkgs.callPackage ../pkgs/step-kms-plugin.nix { };
|
stepKmsPlugin = pkgs.callPackage ../pkgs/step-kms-plugin.nix { };
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ inputs, ... }: {
|
{ ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
./ca.nix
|
./ca.nix
|
||||||
./ci.nix
|
./ci.nix
|
||||||
@ -6,7 +6,6 @@
|
|||||||
./develop.nix
|
./develop.nix
|
||||||
./dns.nix
|
./dns.nix
|
||||||
./doas.nix
|
./doas.nix
|
||||||
./gitmux.nix
|
|
||||||
./git.nix
|
./git.nix
|
||||||
./neovim.nix
|
./neovim.nix
|
||||||
./peerix.nix
|
./peerix.nix
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, isUnstable, ... }:
|
{ config, isUnstable, ... }:
|
||||||
let
|
let
|
||||||
rewriteGitHub = if config.networking.hostName != "stan" then {
|
rewriteGitHub = if config.networking.hostName != "stan" then {
|
||||||
url = { "ssh://git@github.com/" = { insteadOf = "https://github.com/"; }; };
|
url = { "ssh://git@github.com/" = { insteadOf = "https://github.com/"; }; };
|
||||||
|
@ -1,35 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }: {
|
|
||||||
#environment.systemPackages = with pkgs; [ gitmux ];
|
|
||||||
environment.etc."gitmux.conf" = {
|
|
||||||
text = ''
|
|
||||||
tmux:
|
|
||||||
symbols:
|
|
||||||
branch: '⎇ '
|
|
||||||
hashprefix: ':'
|
|
||||||
ahead: ↑·
|
|
||||||
behind: ↓·
|
|
||||||
staged: '● '
|
|
||||||
conflict: '✖ '
|
|
||||||
modified: '✚ '
|
|
||||||
untracked: '… '
|
|
||||||
stashed: '⚑ '
|
|
||||||
clean: ✔
|
|
||||||
styles:
|
|
||||||
clear: '#[fg=default]'
|
|
||||||
state: '#[fg=default]'
|
|
||||||
branch: '#[fg=default]'
|
|
||||||
remote: '#[fg=default]'
|
|
||||||
staged: '#[fg=default]'
|
|
||||||
conflict: '#[fg=default]'
|
|
||||||
modified: '#[fg=default]'
|
|
||||||
untracked: '#[fg=default]'
|
|
||||||
stashed: '#[fg=default]'
|
|
||||||
clean: '#[fg=default]'
|
|
||||||
divergence: '#[fg=default]'
|
|
||||||
layout: [branch, .., remote-branch, divergence, ' - ', flags]
|
|
||||||
options:
|
|
||||||
branch_max_len: 0
|
|
||||||
branch_trim: right
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, ... }: {
|
{ pkgs, ... }: {
|
||||||
environment.systemPackages = with pkgs; [ neomutt urlview ];
|
environment.systemPackages = with pkgs; [ neomutt urlview ];
|
||||||
environment.etc."neomuttrc" = {
|
environment.etc."neomuttrc" = {
|
||||||
text = ''
|
text = ''
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
with pkgs;
|
with pkgs;
|
||||||
let
|
let
|
||||||
parchment = pkgs.vimUtils.buildVimPluginFrom2Nix rec {
|
parchment = pkgs.vimUtils.buildVimPluginFrom2Nix rec {
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ config, lib, ... }:
|
{ ... }: {
|
||||||
with lib; {
|
|
||||||
programs.tmux = {
|
programs.tmux = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, ... }: {
|
{ ... }: {
|
||||||
config = {
|
config = {
|
||||||
programs.zsh.interactiveShellInit = ''
|
programs.zsh.interactiveShellInit = ''
|
||||||
export NO_COLOR=1
|
export NO_COLOR=1
|
||||||
|
@ -1,4 +1 @@
|
|||||||
{ config, lib, ... }:
|
{ ... }: { imports = [ ./build-consumer.nix ./build-server.nix ]; }
|
||||||
with lib; {
|
|
||||||
imports = [ ./build-consumer.nix ./build-server.nix ];
|
|
||||||
}
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, options, pkgs, isUnstable, xinlib, ... }:
|
{ config, lib, options, pkgs, isUnstable, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
caPubKeys = builtins.concatStringsSep "\n" [
|
caPubKeys = builtins.concatStringsSep "\n" [
|
||||||
|
@ -88,8 +88,8 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, unstable, unstableSmall, stable, oldStable, nixos-hardware
|
outputs = { self, unstable, unstableSmall, stable, oldStable, nixos-hardware
|
||||||
, reform, microca, gostart, xintray, tsvnstat, pots, po, tsRevProx, taskobs
|
, reform, gostart, xintray, tsvnstat, pots, po, tsRevProx, darwin
|
||||||
, mcchunkie, gqrss, darwin, xin-secrets, talon, peerix, ... }@inputs:
|
, xin-secrets, talon, peerix, ... }@inputs:
|
||||||
let
|
let
|
||||||
xinlib = import ./lib;
|
xinlib = import ./lib;
|
||||||
supportedSystems = [ "x86_64-linux" ];
|
supportedSystems = [ "x86_64-linux" ];
|
||||||
@ -305,7 +305,7 @@
|
|||||||
foldl' recursiveUpdate { } (mapAttrsToList (name: system: {
|
foldl' recursiveUpdate { } (mapAttrsToList (name: system: {
|
||||||
"${system.pkgs.stdenv.hostPlatform.system}"."${name}" =
|
"${system.pkgs.stdenv.hostPlatform.system}"."${name}" =
|
||||||
system.config.system.build.toplevel;
|
system.config.system.build.toplevel;
|
||||||
}) (filterAttrs (n: v: (builtins.elem n buildList))
|
}) (filterAttrs (n: _: (builtins.elem n buildList))
|
||||||
self.nixosConfigurations));
|
self.nixosConfigurations));
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ inputs, lib, config, pkgs, isUnstable, ... }:
|
{ inputs, config, pkgs, isUnstable, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
#photoPrismTag = "220901-bullseye";
|
#photoPrismTag = "220901-bullseye";
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
boot.initrd.availableKernelModules =
|
boot.initrd.availableKernelModules =
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, lib, modulesPath, inputs, xinlib, ... }:
|
{ config, pkgs, lib, xinlib, ... }:
|
||||||
let
|
let
|
||||||
myEmacs = pkgs.callPackage ../../configs/emacs.nix { };
|
myEmacs = pkgs.callPackage ../../configs/emacs.nix { };
|
||||||
peerixUser = if builtins.hasAttr "peerix" config.users.users then
|
peerixUser = if builtins.hasAttr "peerix" config.users.users then
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, modulesPath, ... }:
|
{ config, lib, modulesPath, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, ... }:
|
{ config, ... }:
|
||||||
let
|
let
|
||||||
pubKeys = [
|
pubKeys = [
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIPMaAm4rDxyU975Z54YiNw3itC2fGc3SaE2VaS1fai8 root@box"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIPMaAm4rDxyU975Z54YiNw3itC2fGc3SaE2VaS1fai8 root@box"
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
{ config, lib, modulesPath, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, lib, isUnstable, inputs, ... }:
|
{ config, pkgs, isUnstable, ... }:
|
||||||
with pkgs;
|
with pkgs;
|
||||||
let
|
let
|
||||||
restic = pkgs.writeScriptBin "restic"
|
restic = pkgs.writeScriptBin "restic"
|
||||||
@ -68,9 +68,9 @@ in {
|
|||||||
tailscale.sshOnly = true;
|
tailscale.sshOnly = true;
|
||||||
|
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
(self: super: {
|
(_: super: {
|
||||||
weechat = super.weechat.override {
|
weechat = super.weechat.override {
|
||||||
configure = { availablePlugins, ... }: {
|
configure = { }: {
|
||||||
scripts = with super.weechatScripts; [ highmon weepushover ];
|
scripts = with super.weechatScripts; [ highmon weepushover ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
{ config, lib, modulesPath, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
|
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, ... }:
|
{ ... }:
|
||||||
let
|
let
|
||||||
pubKeys = [
|
pubKeys = [
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIPMaAm4rDxyU975Z54YiNw3itC2fGc3SaE2VaS1fai8 root@box"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIPMaAm4rDxyU975Z54YiNw3itC2fGc3SaE2VaS1fai8 root@box"
|
||||||
@ -19,7 +19,7 @@ in {
|
|||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
networking.firewall.allowedTCPPorts = [ 22 ];
|
networking.firewall.allowedTCPPorts = [ 22 ];
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [ ];
|
environment.systemPackages = [ ];
|
||||||
|
|
||||||
users.users.root = userBase;
|
users.users.root = userBase;
|
||||||
users.users.qbit = userBase;
|
users.users.qbit = userBase;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, modulesPath, ... }:
|
{ config, lib, modulesPath, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, emacs, isUnstable, ... }:
|
{ pkgs, isUnstable, ... }:
|
||||||
let
|
let
|
||||||
secretAgent =
|
secretAgent =
|
||||||
"Contents/Library/LoginItems/SecretAgent.app/Contents/MacOS/SecretAgent";
|
"Contents/Library/LoginItems/SecretAgent.app/Contents/MacOS/SecretAgent";
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, lib, xinlib, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
myEmacs = pkgs.callPackage ../../configs/emacs.nix { };
|
myEmacs = pkgs.callPackage ../../configs/emacs.nix { };
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
{ config, lib, modulesPath, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, lib, inputs, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
let
|
let
|
||||||
inherit (builtins)
|
inherit (builtins)
|
||||||
head concatStringsSep attrValues mapAttrs attrNames; # hasAttr;
|
head concatStringsSep attrValues mapAttrs attrNames; # hasAttr;
|
||||||
@ -338,7 +338,7 @@ in {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
interfaces = filterAttrsRecursive (n: v: n != "info") interfaces;
|
interfaces = filterAttrsRecursive (n: _: n != "info") interfaces;
|
||||||
|
|
||||||
nftables = {
|
nftables = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@ -474,10 +474,10 @@ in {
|
|||||||
'') val.info.dhcp.staticIPs)
|
'') val.info.dhcp.staticIPs)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
'') (filterAttrsRecursive (n: v: n != "${wan}") interfaces)))}
|
'') (filterAttrsRecursive (n: _: n != "${wan}") interfaces)))}
|
||||||
'';
|
'';
|
||||||
interfaces = attrNames (filterAttrs (n: v: v.info.dhcp.enable)
|
interfaces = attrNames (filterAttrs (_: v: v.info.dhcp.enable)
|
||||||
(filterAttrsRecursive (n: v: n != "${wan}") interfaces));
|
(filterAttrsRecursive (n: _: n != "${wan}") interfaces));
|
||||||
# TODO: Probably a better way to pre-filter the interfaces set
|
# TODO: Probably a better way to pre-filter the interfaces set
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
{ config, lib, modulesPath, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
{ config, lib, modulesPath, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
fileSystems = {
|
fileSystems = {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
pubKeys = [
|
pubKeys = [
|
||||||
@ -40,7 +40,7 @@ in {
|
|||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
description = "Aaron Bieber";
|
description = "Aaron Bieber";
|
||||||
extraGroups = [ "networkmanager" "wheel" ];
|
extraGroups = [ "networkmanager" "wheel" ];
|
||||||
packages = with pkgs; [ ];
|
packages = [ ];
|
||||||
};
|
};
|
||||||
|
|
||||||
# neovim will overwrite my neovim!!
|
# neovim will overwrite my neovim!!
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
{ config, lib, pkgs, ... }: { imports = [ ./ssh-fido-agent.nix ]; }
|
{ ... }: { imports = [ ./ssh-fido-agent.nix ]; }
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, inputs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
with pkgs;
|
with pkgs;
|
||||||
let
|
let
|
||||||
cfg = config.services.golink;
|
cfg = config.services.golink;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, prettyJSON, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
with pkgs;
|
with pkgs;
|
||||||
let
|
let
|
||||||
cfg = config.services.gotosocial;
|
cfg = config.services.gotosocial;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ lib, config, pkgs, inputs, ... }:
|
{ lib, config, pkgs, ... }:
|
||||||
let cfg = config.services.sliding-sync;
|
let cfg = config.services.sliding-sync;
|
||||||
in {
|
in {
|
||||||
options = with lib; {
|
options = with lib; {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ lib, config, pkgs, inputs, ... }:
|
{ lib, config, pkgs, ... }:
|
||||||
let cfg = config.services.tsrevprox;
|
let cfg = config.services.tsrevprox;
|
||||||
in {
|
in {
|
||||||
options = with lib; {
|
options = with lib; {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, prettyJSON, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
with pkgs;
|
with pkgs;
|
||||||
let
|
let
|
||||||
cfg = config.services.yarr;
|
cfg = config.services.yarr;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ pkgs, lib, isUnstable, ... }:
|
{ pkgs, isUnstable, ... }:
|
||||||
let
|
let
|
||||||
openssh = import ./openssh.nix;
|
openssh = import ./openssh.nix;
|
||||||
tailscale = import ./tailscale.nix;
|
tailscale = import ./tailscale.nix;
|
||||||
@ -9,8 +9,8 @@ in {
|
|||||||
openssh
|
openssh
|
||||||
tailscale
|
tailscale
|
||||||
|
|
||||||
(self: super: {
|
(_: super: {
|
||||||
rex = super.rex.overrideAttrs (old: {
|
rex = super.rex.overrideAttrs (_: {
|
||||||
patches = [
|
patches = [
|
||||||
(pkgs.fetchurl {
|
(pkgs.fetchurl {
|
||||||
url = "https://deftly.net/rex-git.diff";
|
url = "https://deftly.net/rex-git.diff";
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
let
|
let
|
||||||
matrix-synapse = self: super: {
|
matrix-synapse = _: super: {
|
||||||
matrix-synapse = super.matrix-synapse.overrideAttrs (old: rec {
|
matrix-synapse = super.matrix-synapse.overrideAttrs (_: rec {
|
||||||
version = "1.79.0";
|
version = "1.79.0";
|
||||||
pname = "matrix-synapse";
|
pname = "matrix-synapse";
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
let
|
let
|
||||||
openssh = self: super: {
|
openssh = _: super: {
|
||||||
openssh = super.openssh.overrideAttrs (old: rec {
|
openssh = super.openssh.overrideAttrs (_: rec {
|
||||||
version = "9.3p1";
|
version = "9.3p1";
|
||||||
src = super.fetchurl {
|
src = super.fetchurl {
|
||||||
url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz";
|
url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz";
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
let
|
let
|
||||||
tailscale = self: super: {
|
tailscale = _: super: {
|
||||||
tailscale = super.callPackage "${super.path}/pkgs/servers/tailscale" {
|
tailscale = super.callPackage "${super.path}/pkgs/servers/tailscale" {
|
||||||
buildGoModule = args:
|
buildGoModule = args:
|
||||||
super.buildGo120Module (args // rec {
|
super.buildGo120Module (args // rec {
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ lib, fetchurl, appimageTools, makeDesktopItem, isUnstable, desktop-file-utils
|
{ fetchurl, appimageTools, desktop-file-utils, ... }:
|
||||||
, ... }:
|
|
||||||
|
|
||||||
let
|
let
|
||||||
name = "cinny-desktop";
|
name = "cinny-desktop";
|
||||||
|
@ -1,10 +1,9 @@
|
|||||||
{ config, lib, pkgs, isUnstable, ... }:
|
{ ... }:
|
||||||
|
|
||||||
with pkgs; {
|
{
|
||||||
environment.systemPackages = with pkgs;
|
environment.systemPackages = [
|
||||||
[
|
#(callPackage ./cinny-desktop.nix { inherit isUnstable; })
|
||||||
#(callPackage ./cinny-desktop.nix { inherit isUnstable; })
|
#(callPackage ./mudita-center.nix { inherit isUnstable; })
|
||||||
#(callPackage ./mudita-center.nix { inherit isUnstable; })
|
#(callPackage ./govulncheck.nix { inherit isUnstable; })
|
||||||
#(callPackage ./govulncheck.nix { inherit isUnstable; })
|
];
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ pkgs, buildPythonPackage, setuptools-scm, fetchFromGitHub, PyGithub, pytz, ...
|
{ buildPythonPackage, setuptools-scm, fetchFromGitHub, PyGithub, pytz, ... }:
|
||||||
}:
|
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "ghexport";
|
pname = "ghexport";
|
||||||
|
@ -1,35 +0,0 @@
|
|||||||
{ lib, buildGoModule, fetchFromGitHub, isUnstable, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
vendorHash = if isUnstable then
|
|
||||||
"sha256-lUVngyYnLwCmNXFBMEDO7ecFZNkSi9GGDNTIG4Mk1Zw="
|
|
||||||
else
|
|
||||||
"sha256-oBZaMS7O6MvvznVn9kQ7h0srWvD3VvxerXgghj0CIzM=";
|
|
||||||
|
|
||||||
in with lib;
|
|
||||||
buildGoModule rec {
|
|
||||||
pname = "gitmux";
|
|
||||||
version = "0.7.9";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "arl";
|
|
||||||
repo = pname;
|
|
||||||
rev = "v${version}";
|
|
||||||
sha256 = "sha256-tB/HPOJQEgs3/rHFn7ezi6R9C3HceASLU3WjjKDii9o=";
|
|
||||||
};
|
|
||||||
|
|
||||||
vendorSha256 = vendorHash;
|
|
||||||
|
|
||||||
ldflags = [ "-X main.version=${version}" ];
|
|
||||||
|
|
||||||
proxyVendor = true;
|
|
||||||
|
|
||||||
doCheck = false;
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "Gitmux shows git status in your tmux status bar";
|
|
||||||
homepage = "https://github.com/arl/gitmux";
|
|
||||||
license = licenses.mit;
|
|
||||||
maintainers = with maintainers; [ qbit ];
|
|
||||||
};
|
|
||||||
}
|
|
@ -1,5 +1,4 @@
|
|||||||
{ stdenv, lib, buildGo119Module, fetchFromGitHub, makeWrapper, go, git, ffmpeg
|
{ lib, buildGo119Module, fetchFromGitHub, go, ffmpeg, ... }:
|
||||||
, ... }:
|
|
||||||
let
|
let
|
||||||
gotosocialVersion = "0.7.1";
|
gotosocialVersion = "0.7.1";
|
||||||
gtswaHash = "sha256:0k0i3qw89fq6w2akdbrbg4s3amp5hznr2b5z5dzz2jragvb8a6yx";
|
gtswaHash = "sha256:0k0i3qw89fq6w2akdbrbg4s3amp5hznr2b5z5dzz2jragvb8a6yx";
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ lib, buildGoModule, fetchFromGitHub, isUnstable, ... }:
|
{ lib, buildGoModule, fetchFromGitHub, ... }:
|
||||||
|
|
||||||
let vendorHash = "sha256-1zBZREClt8jy0TUXJ1FuBEAJEPQoUcl4DZZ6U2LtRzg=";
|
let vendorHash = "sha256-1zBZREClt8jy0TUXJ1FuBEAJEPQoUcl4DZZ6U2LtRzg=";
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ lib, fetchurl, stdenv, unzip, isUnstable }:
|
{ lib, fetchurl, stdenv, unzip }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "hammerspoon";
|
pname = "hammerspoon";
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ lib, rustPlatform, fetchFromGitHub, stdenv }:
|
{ lib, rustPlatform, fetchFromGitHub }:
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "iamb";
|
pname = "iamb";
|
||||||
version = "2023-03-09";
|
version = "2023-03-09";
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
{ lib, stdenv, fetchpatch, fetchurl, pkgs, ... }:
|
{ lib, stdenv, fetchurl, pkgs, ... }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "icbirc";
|
pname = "icbirc";
|
||||||
version = "2.1";
|
version = "2.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://www.benzedrine.ch/icbirc-2.1.tar.gz";
|
url = "http://www.benzedrine.ch/icbirc-${version}.tar.gz";
|
||||||
sha256 = "sha256-aDk0TZPABNqX7Gu12AWh234Kee/DhwRFeIBDYnFiu7E=";
|
sha256 = "sha256-aDk0TZPABNqX7Gu12AWh234Kee/DhwRFeIBDYnFiu7E=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
{ lib, fetchurl, appimageTools, makeDesktopItem, isUnstable, desktop-file-utils
|
{ fetchurl, appimageTools, desktop-file-utils, ... }:
|
||||||
, ... }:
|
|
||||||
|
|
||||||
let
|
let
|
||||||
name = "mudita-center";
|
name = "mudita-center";
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ lib, fetchurl, stdenv, undmg, isUnstable }:
|
{ lib, fetchurl, stdenv, undmg }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "nheko";
|
pname = "nheko";
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ pkgs, buildPythonPackage, setuptools-scm, pytest, fetchPypi, ... }:
|
{ buildPythonPackage, setuptools-scm, pytest, fetchPypi, ... }:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "orgparse";
|
pname = "orgparse";
|
||||||
|
@ -1,8 +1,7 @@
|
|||||||
{ lib, buildPythonPackage, fetchFromGitHub, beautifulsoup4, fastapi, httptools
|
{ lib, buildPythonPackage, fetchFromGitHub, beautifulsoup4, fastapi, httptools
|
||||||
, pytest, logzero, lxml, mistletoe, more-itertools, mypy, pytz, setuptools
|
, logzero, lxml, mistletoe, more-itertools, mypy, pytz, setuptools, tzlocal
|
||||||
, appdirs, sqlalchemy, tzlocal, urlextract, uvicorn, uvloop, watchfiles
|
, urlextract, uvicorn, uvloop, watchfiles, websockets, setuptools-scm, pkgs, ...
|
||||||
, websockets, orjson, pandas, simplejson, setuptools-scm, decorator, geopy, pkgs
|
}:
|
||||||
, ... }:
|
|
||||||
with pkgs;
|
with pkgs;
|
||||||
let
|
let
|
||||||
hpi = pkgs.python3Packages.callPackage ./hpi.nix { inherit pkgs; };
|
hpi = pkgs.python3Packages.callPackage ./hpi.nix { inherit pkgs; };
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{ pkgs, lib, stdenv, cargo, fetchFromGitHub, rustPlatform, pkg-config
|
{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl_1_1, llvmPackages
|
||||||
, openssl_1_1, llvmPackages, libevdev, linuxHeaders }:
|
, libevdev, linuxHeaders }:
|
||||||
|
|
||||||
rustPlatform.buildRustPackage {
|
rustPlatform.buildRustPackage {
|
||||||
pname = "rkvm";
|
pname = "rkvm";
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ lib, fetchurl, stdenv, unzip, isUnstable }:
|
{ lib, fetchurl, stdenv, unzip }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "secretive";
|
pname = "secretive";
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ pkgs, buildPythonPackage, setuptools-scm, sqlcipher, fetchPypi, ... }:
|
{ buildPythonPackage, setuptools-scm, sqlcipher, fetchPypi, ... }:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "sqlcipher3";
|
pname = "sqlcipher3";
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{ lib, buildGoModule, fetchFromGitHub, pkg-config, pcsclite, softhsm, opensc
|
{ lib, buildGoModule, fetchFromGitHub, pkg-config, pcsclite, softhsm, opensc
|
||||||
, yubihsm-shell, writeScriptBin }:
|
, yubihsm-shell }:
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "step-kms-plugin";
|
pname = "step-kms-plugin";
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ pkgs, buildPythonPackage, lib, stdenv, fetchurl, python, weechat }:
|
{ buildPythonPackage, lib, fetchurl, python, weechat }:
|
||||||
|
|
||||||
buildPythonPackage {
|
buildPythonPackage {
|
||||||
pname = "weepushover";
|
pname = "weepushover";
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ lib, stdenv, fetchpatch, fetchFromGitHub, pkgs, go-font, ... }:
|
{ lib, stdenv, fetchFromGitHub, pkgs, go-font, ... }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "zutty";
|
pname = "zutty";
|
||||||
|
@ -1 +1 @@
|
|||||||
{ config, lib, pkgs, ... }: with lib; { imports = [ ./config-manager.nix ]; }
|
{ lib, ... }: with lib; { imports = [ ./config-manager.nix ]; }
|
||||||
|
3
statix.toml
Normal file
3
statix.toml
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
disabled = [
|
||||||
|
"empty_pattern"
|
||||||
|
]
|
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, lib, isUnstable, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
nixOptions = {
|
nixOptions = {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, isUnstable, ... }:
|
{ config, lib, ... }:
|
||||||
with lib; {
|
with lib; {
|
||||||
options = {
|
options = {
|
||||||
nixLockdown = {
|
nixLockdown = {
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
|
forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
|
||||||
nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; });
|
nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; });
|
||||||
in {
|
in {
|
||||||
overlay = final: prev: { inherit (self.packages.${prev.system}) thing; };
|
overlay = _: prev: { inherit (self.packages.${prev.system}) thing; };
|
||||||
|
|
||||||
packages = forAllSystems (system:
|
packages = forAllSystems (system:
|
||||||
let pkgs = nixpkgsFor.${system};
|
let pkgs = nixpkgsFor.${system};
|
||||||
|
Loading…
Reference in New Issue
Block a user