chayleaf/dotfiles
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Compare commits

base: chayleaf:8ebdcb1c716f041ed77943fb7e4c5ef12263fa63
Branches Tags
chayleaf:master
chayleaf:ci
...
compare: chayleaf:31aba2a121c839b973a095b498ea61bc87d6a6ae
Branches Tags
chayleaf:master
chayleaf:ci

3 commits
8ebdcb1c71 ... 31aba2a121

Author SHA1 Message Date
chayleaf 31aba2a121 update inputs 2023-07-28 22:19:05 +07:00
chayleaf 8bd750ee5e change update script for ci branch 2023-07-28 22:19:05 +07:00
chayleaf 4d19f773df server/home/hydra: add queue runner to nix allowed users 2023-07-28 22:18:32 +07:00
8 changed files with 54 additions and 74 deletions
Show stats Expand all files Collapse all files

73
flake.lock
View file

@ -107,11 +107,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1689134369, "lastModified": 1690476848,
"narHash": "sha256-0G9dutIvhS/WUr3Awcnqw71g8EVVvvkOhVDnDDbY4Fw=", "narHash": "sha256-PSmzyuEbMxEn2uwwLYUN2l1psoJXb7jm/kfHD12Sq0k=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e42fb59768f0305085abde0dd27ab5e0cc15420c", "rev": "8d243f7da13d6ee32f722a3f1afeced150b6d4da",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -164,11 +164,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1689556975, "lastModified": 1690161011,
"narHash": "sha256-0rft9zKuYa3dDpMywFHUTUl7+fKu7P9u8lsA1esMndA=", "narHash": "sha256-nTXAryl8SKvUGDeG5tEyLByfbAar+1O0wl86AtmoOz0=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "779075ec32036efc14fbcaa9a328bba860e964c6", "rev": "600809d0f580d9476591c5cb0527c39bda5bc47c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -179,11 +179,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1689060619, "lastModified": 1690200740,
"narHash": "sha256-vODUkZLWFVCvo1KPK3dC2CbXjxa9antEn5ozwlcTr48=", "narHash": "sha256-aRkEXGmCbAGcvDcdh/HB3YN+EvoPoxmJMOaqRZmf6vM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "44bc025007e5fcc10dbc3d9f96dcbf06fc0e8c1c", "rev": "ba9650b14e83b365fb9e731f7d7c803f22d2aecf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -208,11 +208,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1689103880, "lastModified": 1689976554,
"narHash": "sha256-vHRCkcpnBbFsPqUNXliUmdPU81jqyuL9ZPzj3vJx2RE=", "narHash": "sha256-uWJq3sIhkqfzPmfB2RWd5XFVooGFfSuJH9ER/r302xQ=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "69a4b7ad67d2732ba1f86666b3d4d2d83b15200e", "rev": "c63f6e7b053c18325194ff0e274dba44e8d2271e",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -243,16 +243,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1689168768, "lastModified": 1690367991,
"narHash": "sha256-mCw3LPg2jJkapvJpkd1IZ8k0IJlSG2ECvz3vcOAu+Uo=", "narHash": "sha256-2VwOn1l8y6+cu7zjNE8MgeGJNNz1eat1HwHrINeogFA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6fd9edc94426a3c050ad589c8f033b5ca55454c7", "rev": "c9cf0708f00fbe553319258e48ca89ff9a413703",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "master", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -275,22 +275,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs2": {
"locked": {
"lastModified": 1689008574,
"narHash": "sha256-VFMgyHDiqsGDkRg73alv6OdHJAqhybryWHv77bSCGIw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4a729ce4b1fe5ec4fffc71c67c96aa5184ebb462",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"notlua": { "notlua": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -298,11 +282,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1688049338, "lastModified": 1689273444,
"narHash": "sha256-HRWFIl2UY6wVUc/xJh3kKX/Nb3kTm33e39ZO7MnY+x0=", "narHash": "sha256-tRT6o8Y6J5Qd1ZM7To0syjp7c/bFG5Pg+OPeJfYdCqY=",
"owner": "chayleaf", "owner": "chayleaf",
"repo": "notlua", "repo": "notlua",
"rev": "1582e95567c13d5bf103e035a7cd18ce901b5186", "rev": "d9ee5cfc40cf7c8f266ef22ac420586f54d0bb01",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -318,11 +302,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1689165382, "lastModified": 1689260608,
"narHash": "sha256-sBaEdI+lVJ6bcn287g3z8uc4wCRz9E+S5m67MWi/t6I=", "narHash": "sha256-GHnXziKo8EzGnvMzKEExA5/H3N1Hp3GtRy84E2z4YN8=",
"owner": "chayleaf", "owner": "chayleaf",
"repo": "notnft", "repo": "notnft",
"rev": "2ad8d7f831e05e0e646d345350f59b7030cb1cd6", "rev": "98ff79679cfdc31f49abaeb513cb6d36905dd32e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -333,11 +317,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1689162346, "lastModified": 1690526191,
"narHash": "sha256-/Aaygnbta0Dd5cyKZVk3AVA/MEmcWjEasYzUQa/tkJc=", "narHash": "sha256-CETEzL37Fptq7HBepjT18ZjxF3x+oNSyIgQwJvbWWRM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "b1a645e8e9fee78ad8e1f32575a29d1af8de9cf8", "rev": "c905da94cc744f6f10e965ad4c1ea0b4d7121afb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -357,7 +341,6 @@
"nixos-mailserver": "nixos-mailserver", "nixos-mailserver": "nixos-mailserver",
"nixos-router": "nixos-router", "nixos-router": "nixos-router",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs2": "nixpkgs2",
"notlua": "notlua", "notlua": "notlua",
"notnft": "notnft", "notnft": "notnft",
"nur": "nur", "nur": "nur",
@ -372,11 +355,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1689129196, "lastModified": 1690510705,
"narHash": "sha256-/z/Al4sFcIh5oPQWA9MclQmJR9g3RO8UDiHGaj/T9R8=", "narHash": "sha256-6mjs3Gl9/xrseFh9iNcNq1u5yJ/MIoAmjoaG7SXZDIE=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "db8d909c9526d4406579ee7343bf2d7de3d15eac", "rev": "851ae4c128905a62834d53ce7704ebc1ba481bea",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
flake.nix
View file

@ -2,8 +2,7 @@
description = "NixOS + Home Manager configuration of chayleaf"; description = "NixOS + Home Manager configuration of chayleaf";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/master"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs2.url = "github:nixos/nixpkgs/nixos-unstable";
nixos-hardware.url = "github:NixOS/nixos-hardware"; nixos-hardware.url = "github:NixOS/nixos-hardware";
impermanence.url = "github:nix-community/impermanence"; impermanence.url = "github:nix-community/impermanence";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
@ -49,7 +48,7 @@
}; };
}; };
outputs = inputs@{ self, nixpkgs, nixpkgs2, nixos-hardware, impermanence, home-manager, nur, nix-gaming, notlua, notnft, nixos-mailserver, nixos-router, maubot, ... }: outputs = inputs@{ self, nixpkgs, nixos-hardware, impermanence, home-manager, nur, nix-gaming, notlua, notnft, nixos-mailserver, nixos-router, maubot, ... }:
let let
# --impure required for developing # --impure required for developing
# it takes the paths for modules from filesystem as opposed to flake inputs # it takes the paths for modules from filesystem as opposed to flake inputs
@ -103,7 +102,6 @@
specialArgs.server-config = nixosConfigurations.nixserver.config; specialArgs.server-config = nixosConfigurations.nixserver.config;
modules = [ modules = [
{ {
_module.args.pkgs2 = import nixpkgs2 { inherit system; overlays = [ overlay ]; };
_module.args.notnft = if devNft then (import /${devPath}/notnft { inherit (nixpkgs) lib; }).config.notnft else notnft.lib.${system}; _module.args.notnft = if devNft then (import /${devPath}/notnft { inherit (nixpkgs) lib; }).config.notnft else notnft.lib.${system};
} }
(if devNixRt then import /${devPath}/nixos-router else nixos-router.nixosModules.default) (if devNixRt then import /${devPath}/nixos-router else nixos-router.nixosModules.default)

14
pkgs/_sources/generated.json
View file

@ -37,24 +37,24 @@
"pinned": false, "pinned": false,
"src": { "src": {
"name": null, "name": null,
"sha256": "sha256-0ePO6ZzsZpAb9iM++k4fYDwKzJpuZNgfPKwZePAUc0Y=", "sha256": "sha256-yZn4vrG9FCX2Wvpz3aKPaqBK4ttNupZmrmX13QBDZFo=",
"type": "url", "type": "url",
"url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-6/GE-Proton8-6.tar.gz" "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-9/GE-Proton8-9.tar.gz"
}, },
"version": "GE-Proton8-6" "version": "GE-Proton8-9"
}, },
"searxng": { "searxng": {
"cargoLocks": null, "cargoLocks": null,
"date": "2023-07-07", "date": "2023-07-22",
"extract": null, "extract": null,
"name": "searxng", "name": "searxng",
"passthru": null, "passthru": null,
"pinned": false, "pinned": false,
"src": { "src": {
"sha256": "sha256-eOq4vZ8690H1lCRu8LXgUJvc/4lY+VqvVOqRyEURreI=", "sha256": "sha256-Edv0SDcWG+c78iZwVnf2MBNDQFOABOZghnmfXGRaSeo=",
"type": "tarball", "type": "tarball",
"url": "https://github.com/searxng/searxng/archive/cada89ee3648de6ca5b458aeacafe6c10d5230a2.tar.gz" "url": "https://github.com/searxng/searxng/archive/65d8b1a3106800304e9ed31b6c3f26e5b3ee5fcd.tar.gz"
}, },
"version": "cada89ee3648de6ca5b458aeacafe6c10d5230a2" "version": "65d8b1a3106800304e9ed31b6c3f26e5b3ee5fcd"
} }
} }

14
pkgs/_sources/generated.nix
View file

@ -20,19 +20,19 @@
}; };
proton-ge = { proton-ge = {
pname = "proton-ge"; pname = "proton-ge";
version = "GE-Proton8-6"; version = "GE-Proton8-9";
src = fetchurl { src = fetchurl {
url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-6/GE-Proton8-6.tar.gz"; url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-9/GE-Proton8-9.tar.gz";
sha256 = "sha256-0ePO6ZzsZpAb9iM++k4fYDwKzJpuZNgfPKwZePAUc0Y="; sha256 = "sha256-yZn4vrG9FCX2Wvpz3aKPaqBK4ttNupZmrmX13QBDZFo=";
}; };
}; };
searxng = { searxng = {
pname = "searxng"; pname = "searxng";
version = "cada89ee3648de6ca5b458aeacafe6c10d5230a2"; version = "65d8b1a3106800304e9ed31b6c3f26e5b3ee5fcd";
src = fetchTarball { src = fetchTarball {
url = "https://github.com/searxng/searxng/archive/cada89ee3648de6ca5b458aeacafe6c10d5230a2.tar.gz"; url = "https://github.com/searxng/searxng/archive/65d8b1a3106800304e9ed31b6c3f26e5b3ee5fcd.tar.gz";
sha256 = "sha256-eOq4vZ8690H1lCRu8LXgUJvc/4lY+VqvVOqRyEURreI="; sha256 = "sha256-Edv0SDcWG+c78iZwVnf2MBNDQFOABOZghnmfXGRaSeo=";
}; };
date = "2023-07-07"; date = "2023-07-22";
}; };
} }

3
system/hardware/bpi-r3/default.nix
View file

@ -1,5 +1,4 @@
{ pkgs { pkgs
, pkgs2
, config , config
, ... }: , ... }:
@ -10,7 +9,7 @@
}; };
# boot.kernelPackages = pkgs.linuxPackages_testing; # boot.kernelPackages = pkgs.linuxPackages_testing;
boot.kernelPackages = pkgs2.linuxPackages_bpiR3; boot.kernelPackages = pkgs.linuxPackages_bpiR3;
hardware.deviceTree.enable = true; hardware.deviceTree.enable = true;
hardware.deviceTree.filter = "mt7986a-bananapi-bpi-r3.dtb"; hardware.deviceTree.filter = "mt7986a-bananapi-bpi-r3.dtb";

4
system/hardware/bpi-r3/pkgs.nix
View file

@ -265,8 +265,8 @@ in rec {
COMMON_CLK_MEDIATEK_FHCTL = yes; COMMON_CLK_MEDIATEK_FHCTL = yes;
COMMON_CLK_MT7986 = yes; COMMON_CLK_MT7986 = yes;
COMMON_CLK_MT7986_ETHSYS = yes; COMMON_CLK_MT7986_ETHSYS = yes;
# CPU_THERMAL = yes; CPU_THERMAL = yes;
# THERMAL_OF = yes; THERMAL_OF = yes;
EINT_MTK = yes; EINT_MTK = yes;
MEDIATEK_GE_PHY = yes; MEDIATEK_GE_PHY = yes;
MEDIATEK_WATCHDOG = yes; MEDIATEK_WATCHDOG = yes;

2
system/hosts/nixserver/home.nix
View file

@ -81,7 +81,7 @@ in {
bindAddress = "127.0.0.1"; bindAddress = "127.0.0.1";
secretKeyFile = "/secrets/cache-priv-key.pem"; secretKeyFile = "/secrets/cache-priv-key.pem";
}; };
nix.settings.allowed-users = [ "nix-serve" "hydra" ]; nix.settings.allowed-users = [ "nix-serve" "hydra" "hydra-queue-runner" ];
# only hydra has access to this file anyway # only hydra has access to this file anyway
nix.settings.extra-builtins-file = "/etc/nixos/private/extra-builtins.nix"; nix.settings.extra-builtins-file = "/etc/nixos/private/extra-builtins.nix";
impermanence.directories = [ impermanence.directories = [

12
update.sh
View file

@ -7,9 +7,9 @@ mozilla-addons-to-nix \
./pkgs/firefox-addons/addons.json \ ./pkgs/firefox-addons/addons.json \
./pkgs/firefox-addons/generated.nix || echo "failed to update firefox addons" ./pkgs/firefox-addons/generated.nix || echo "failed to update firefox addons"
nix flake update nix flake update
if [ -z ${SUDO_ASKPASS+x} ]; then #if [ -z ${SUDO_ASKPASS+x} ]; then
sudo nixos-rebuild switch --flake . --option extra-builtins-file "$(pwd)/extra-builtins.nix" # sudo nixos-rebuild switch --flake . --option extra-builtins-file "$(pwd)/extra-builtins.nix"
else #else
sudo -A nixos-rebuild switch --flake . --option extra-builtins-file "$(pwd)/extra-builtins.nix" # sudo -A nixos-rebuild switch --flake . --option extra-builtins-file "$(pwd)/extra-builtins.nix"
fi #fi
home-manager switch --flake . --option extra-builtins-file "$(pwd)/extra-builtins.nix" #home-manager switch --flake . --option extra-builtins-file "$(pwd)/extra-builtins.nix"