1
0
mirror of https://github.com/kmein/niveum synced 2026-03-22 12:51:08 +01:00

8 Commits

Author SHA1 Message Date
github-actions[bot]
bd1bdce121 flake.lock: Update
Flake lock file updates:

• Updated input 'flake-utils':
    'github:numtide/flake-utils/bee6a7250dd1b01844a2de7e02e4df7d8a0a206c' (2022-06-24)
  → 'github:numtide/flake-utils/7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249' (2022-07-04)
• Updated input 'home-manager':
    'github:nix-community/home-manager/3bf16c0fd141c28312be52945d1543f9ce557bb1' (2022-06-27)
  → 'github:nix-community/home-manager/c645cc9f82c7753450d1fa4d1bc73b64960a9d7a' (2022-07-09)
• Updated input 'nixos-stable':
    'github:NixOS/nixpkgs/915f5a5b3cc4f8ba206afd0b70e52ba4c6a2796b' (2022-07-01)
  → 'github:NixOS/nixpkgs/71d7a4c037dc4f3e98d5c4a81b941933cf5bf675' (2022-07-08)
• Updated input 'nixos-unstable':
    'github:NixOS/nixpkgs/0ea7a8f1b939d74e5df8af9a8f7342097cdf69eb' (2022-07-02)
  → 'github:NixOS/nixpkgs/b39924fc7764c08ae3b51beef9a3518c414cdb7d' (2022-07-08)
2022-07-10 01:02:03 +00:00
cfaeb824a6 feat(ci): add ful 2022-07-09 07:13:33 +02:00
github-actions[bot]
9afb27e526 flake.lock: Update
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/1dbac84b846e4bfa21a08e31e95e11f0965ed042' (2022-06-25)
  → 'github:nix-community/home-manager/3bf16c0fd141c28312be52945d1543f9ce557bb1' (2022-06-27)
• Removed input 'home-manager/flake-compat'
• Removed input 'home-manager/nmd'
• Removed input 'home-manager/nmt'
• Updated input 'nixos-stable':
    'github:NixOS/nixpkgs/ccf8bdf72624521358be6bb7d9b524c4cbcf7aff' (2022-06-23)
  → 'github:NixOS/nixpkgs/915f5a5b3cc4f8ba206afd0b70e52ba4c6a2796b' (2022-07-01)
• Updated input 'nixos-unstable':
    'github:NixOS/nixpkgs/6141b8932a5cf376fe18fcd368cecd9ad946cb68' (2022-06-23)
  → 'github:NixOS/nixpkgs/0ea7a8f1b939d74e5df8af9a8f7342097cdf69eb' (2022-07-02)
• Updated input 'retiolum':
    'github:krebs/retiolum/8c41abaeed7f862b02dddd31eae204e262799c4b' (2022-06-06)
  → 'github:krebs/retiolum/0371a65100b68d46e1811ec1e3efd8281bc741df' (2022-06-28)
• Updated input 'stockholm':
    'git+https://cgit.lassul.us/stockholm?ref=refs%2fheads%2fmaster&rev=4ef26cd0f67d77dbb1a35b5b43ed2272c17e64b8' (2022-06-21)
  → 'git+https://cgit.lassul.us/stockholm?ref=refs%2fheads%2fmaster&rev=64dbf31d70497d6a66f89fdd86ac1884e28f7bc8' (2022-06-28)
2022-07-09 07:12:02 +02:00
75c825dc25 feat(ssh): fysi machines 2022-07-06 15:10:47 +02:00
85f5c71313 feat(weechat): bye bye useless channels 2022-07-05 19:12:01 +02:00
ddd4bd5720 fix(tahina) 2022-07-05 19:11:45 +02:00
e15cc88467 feat(home-manager): set stateVersion 2022-06-28 15:27:36 +02:00
20ba241063 fix(hedgedoc) 2022-06-28 15:27:08 +02:00
8 changed files with 38 additions and 75 deletions

View File

@@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
system: [makanek,manakish,kabsa,zaatar]
system: [makanek,manakish,kabsa,zaatar,ful]
steps:
- uses: actions/checkout@v2
- uses: cachix/install-nix-action@v16

2
ci.nix
View File

@@ -62,7 +62,7 @@
kabsa = ensureFiles basic;
manakish = ensureFiles basic;
tahina = ensureFiles basic;
ful = ensureFiles basic;
ful = ensureFiles (["root.password"] ++ basic);
makanek = ensureFiles ([
"irc/retiolum"
"irc/hackint"

View File

@@ -208,6 +208,9 @@ in {
})
localAddresses;
}
{
home-manager.users.me.home.stateVersion = "22.05";
}
./alacritty.nix
./backup.nix
./bash.nix

View File

@@ -6,6 +6,7 @@
}: let
inherit (import <niveum/lib>) sshPort kieran;
externalNetwork = import <niveum/lib/external-network.nix>;
sshIdentity = name: "${config.users.users.me.home}/.ssh/${name}";
in {
services.xserver.displayManager.sessionCommands = "${pkgs.openssh}/bin/ssh-add";
@@ -58,6 +59,16 @@ in {
hostname = "135.181.85.233";
user = "root";
};
"fysi-dev1" = {
hostname = "94.130.229.139";
user = "root";
identityFile = sshIdentity "fysiweb";
};
"fysi-shared0" = {
hostname = "49.12.205.235";
user = "root";
identityFile = sshIdentity "fysiweb";
};
};
};
}

89
flake.lock generated
View File

@@ -1,28 +1,12 @@
{
"nodes": {
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1650374568,
"narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "b4a34015c698c7793d592d66adbab377907a2be8",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": {
"locked": {
"lastModified": 1656065134,
"narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=",
"lastModified": 1656928814,
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c",
"rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
"type": "github"
},
"original": {
@@ -33,20 +17,17 @@
},
"home-manager": {
"inputs": {
"flake-compat": "flake-compat",
"nixpkgs": [
"nixos-unstable"
],
"nmd": "nmd",
"nmt": "nmt",
"utils": "utils"
},
"locked": {
"lastModified": 1656199469,
"narHash": "sha256-17t4qc016C1p6oNSKOrYbOCErWhQI4dr4nzJKrGO8VE=",
"lastModified": 1657396086,
"narHash": "sha256-4cQ6hEuewWoFkTBlu211JGxPQQ1Zyli8oEq1cu7cVeA=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "1dbac84b846e4bfa21a08e31e95e11f0965ed042",
"rev": "c645cc9f82c7753450d1fa4d1bc73b64960a9d7a",
"type": "github"
},
"original": {
@@ -129,11 +110,11 @@
},
"nixos-stable": {
"locked": {
"lastModified": 1656007306,
"narHash": "sha256-MsC44YZ6wuBwn5Bu8T+RVoQWlp2l5BR6hhmNoAAHIEw=",
"lastModified": 1657296039,
"narHash": "sha256-Ghh39+aS+pw5sTP/ZO8VIKE6sBhMadDaQZtf+3yu4Vc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ccf8bdf72624521358be6bb7d9b524c4cbcf7aff",
"rev": "71d7a4c037dc4f3e98d5c4a81b941933cf5bf675",
"type": "github"
},
"original": {
@@ -145,11 +126,11 @@
},
"nixos-unstable": {
"locked": {
"lastModified": 1655983783,
"narHash": "sha256-0h1FzkYWei24IdKNpCX93onkF/FMiXQG8SdEbTc0r8A=",
"lastModified": 1657265485,
"narHash": "sha256-PUQ9C7mfi0/BnaAUX2R/PIkoNCb/Jtx9EpnhMBNrO/o=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6141b8932a5cf376fe18fcd368cecd9ad946cb68",
"rev": "b39924fc7764c08ae3b51beef9a3518c414cdb7d",
"type": "github"
},
"original": {
@@ -159,38 +140,6 @@
"type": "github"
}
},
"nmd": {
"flake": false,
"locked": {
"lastModified": 1653339422,
"narHash": "sha256-RNLq09vfj21TyYuUCeD6BNTNC6Ew8bLhQULZytN4Xx8=",
"owner": "rycee",
"repo": "nmd",
"rev": "91dee681dd1c478d6040a00835d73c0f4a4c5c29",
"type": "gitlab"
},
"original": {
"owner": "rycee",
"repo": "nmd",
"type": "gitlab"
}
},
"nmt": {
"flake": false,
"locked": {
"lastModified": 1648075362,
"narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=",
"owner": "rycee",
"repo": "nmt",
"rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae",
"type": "gitlab"
},
"original": {
"owner": "rycee",
"repo": "nmt",
"type": "gitlab"
}
},
"recht": {
"flake": false,
"locked": {
@@ -210,11 +159,11 @@
"retiolum": {
"flake": false,
"locked": {
"lastModified": 1654544575,
"narHash": "sha256-6ZrUcFhiCeOwS2qjFEhj/TA5Hx2D7mZ4fojzdAz5p4c=",
"lastModified": 1656449345,
"narHash": "sha256-J6vftINxT6Sm4TjMEtUhpVz2vnGB5Fg5Dt4095t9eIU=",
"owner": "krebs",
"repo": "retiolum",
"rev": "8c41abaeed7f862b02dddd31eae204e262799c4b",
"rev": "0371a65100b68d46e1811ec1e3efd8281bc741df",
"type": "github"
},
"original": {
@@ -262,11 +211,11 @@
"stockholm": {
"flake": false,
"locked": {
"lastModified": 1655847573,
"narHash": "sha256-5QGMtXjlaw1C9cOyllGbgilUrA6Or4oDOlDqCfdEXH8=",
"lastModified": 1656449028,
"narHash": "sha256-9a41If9iQrWjzFwB2G/O9ZoLRPT/O/wm3PD9nZsjmO8=",
"ref": "refs/heads/master",
"rev": "4ef26cd0f67d77dbb1a35b5b43ed2272c17e64b8",
"revCount": 10681,
"rev": "64dbf31d70497d6a66f89fdd86ac1884e28f7bc8",
"revCount": 10685,
"type": "git",
"url": "https://cgit.lassul.us/stockholm"
},

View File

@@ -142,6 +142,7 @@
++ {
zaatar = ["traadfri"];
ful = [];
tahina = [];
kabsa = ["traadfri" "nixos-unstable" "home-manager" "menstruation-backend" "recht"];
manakish = ["traadfri" "nixos-unstable" "home-manager" "menstruation-backend" "recht"];
makanek = ["nixos-unstable" "menstruation-telegram" "menstruation-backend" "scripts" "telebots" "tinc-graph"];

View File

@@ -67,7 +67,7 @@ in {
autoconnect = true;
addresses = "irc.libera.chat/6697";
ssl = true;
autojoin = ["#flipdot" "#haskell" "#nixos" "#fysi" "#binaergewitter" "#neovim" "#lojban" "#vim" "#newsboat"];
autojoin = ["#flipdot" "#haskell" "#nixos" "#fysi" "#binaergewitter" "#vim" "#newsboat"];
sasl_mechanism = "plain";
sasl_username = nick;
sasl_password = lib.strings.fileContents <system-secrets/irc/libera>;
@@ -86,7 +86,7 @@ in {
retiolum = {
autoconnect = true;
addresses = "irc.r";
autojoin = ["#xxx" "#brockman" "#flix" "#mukke"];
autojoin = ["#xxx" "#brockman" "#flix"];
command = lib.concatStringsSep "\\;" [
"/oper admin aidsballs"
"/msg nickserv always-on true"

View File

@@ -7,7 +7,6 @@
in {
imports = [
./hardware-configuration.nix
<niveum/configs/battery.nix>
<niveum/configs/spacetime.nix>
<niveum/modules/retiolum.nix>
<niveum/configs/sshd.nix>