aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2023-09-13 09:53:51 +0200
committerKarel Kočí <cynerd@email.cz>2023-09-13 09:53:51 +0200
commitbfdd9ca1dfa45a9fae3b1db09fa87f26ee30442f (patch)
tree3015614b4a728998edd32dcc33f07f39db6146ad
parentaeb76ef4125f621cad11acf3e5d6b97cfac9d28a (diff)
downloadnixos-personal-bfdd9ca1dfa45a9fae3b1db09fa87f26ee30442f.tar.gz
nixos-personal-bfdd9ca1dfa45a9fae3b1db09fa87f26ee30442f.tar.bz2
nixos-personal-bfdd9ca1dfa45a9fae3b1db09fa87f26ee30442f.zip
nixos: add flatline for development purposes
-rw-r--r--flake.lock196
-rw-r--r--flake.nix1
-rw-r--r--nixos/configurations.nix1
-rw-r--r--nixos/modules/develop.nix1
4 files changed, 135 insertions, 64 deletions
diff --git a/flake.lock b/flake.lock
index a4755d0..061cac5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -81,11 +81,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1689068808,
- "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+ "lastModified": 1694529238,
+ "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+ "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
@@ -94,12 +94,15 @@
}
},
"flake-utils_2": {
+ "inputs": {
+ "systems": "systems_2"
+ },
"locked": {
- "lastModified": 1678901627,
- "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
+ "lastModified": 1692799911,
+ "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
+ "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
"type": "github"
},
"original": {
@@ -136,8 +139,22 @@
}
},
"flake-utils_5": {
+ "locked": {
+ "lastModified": 1678901627,
+ "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
+ "type": "github"
+ },
+ "original": {
+ "id": "flake-utils",
+ "type": "indirect"
+ }
+ },
+ "flake-utils_6": {
"inputs": {
- "systems": "systems_2"
+ "systems": "systems_3"
},
"locked": {
"lastModified": 1681202837,
@@ -152,7 +169,7 @@
"type": "indirect"
}
},
- "flake-utils_6": {
+ "flake-utils_7": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@@ -166,6 +183,27 @@
"type": "indirect"
}
},
+ "flatline": {
+ "inputs": {
+ "flake-utils": "flake-utils_2",
+ "nixpkgs": "nixpkgs_2"
+ },
+ "locked": {
+ "lastModified": 1694525358,
+ "narHash": "sha256-O7JKm2bblHb0FHy2mnrTefXa6kSulhGYrQfb/HER788=",
+ "ref": "refs/heads/master",
+ "rev": "3ad7a4b486405539f9ea07e0ae69ec7419849cb3",
+ "revCount": 3106,
+ "submodules": true,
+ "type": "git",
+ "url": "http://jessie.elektroline.cz/elektroline/flatlineng.git"
+ },
+ "original": {
+ "submodules": true,
+ "type": "git",
+ "url": "http://jessie.elektroline.cz/elektroline/flatlineng.git"
+ }
+ },
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -207,15 +245,15 @@
"inputs": {
"flake-compat": "flake-compat",
"lowdown-src": "lowdown-src",
- "nixpkgs": "nixpkgs_2",
+ "nixpkgs": "nixpkgs_3",
"nixpkgs-regression": "nixpkgs-regression"
},
"locked": {
- "lastModified": 1692380821,
- "narHash": "sha256-/0hnxYuwCMUg7OyVQxCiAsHWBElQt8+ywE3mhXFJIRs=",
+ "lastModified": 1694531736,
+ "narHash": "sha256-7MiBL4mz2WCybxXGt6MnFeQCK8nGwsuYYtriS2KBZq0=",
"owner": "NixOS",
"repo": "nix",
- "rev": "665ad4f7c506d3274db564d6c3c20526dca218e0",
+ "rev": "21783cff1649f236cb31f27f788e3934802c42c9",
"type": "github"
},
"original": {
@@ -225,8 +263,8 @@
},
"nixbigclown": {
"inputs": {
- "flake-utils": "flake-utils_2",
- "nixpkgs": "nixpkgs_3"
+ "flake-utils": "flake-utils_3",
+ "nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1680946769,
@@ -245,14 +283,14 @@
"nixd": {
"inputs": {
"flake-parts": "flake-parts",
- "nixpkgs": "nixpkgs_4"
+ "nixpkgs": "nixpkgs_5"
},
"locked": {
- "lastModified": 1692066861,
- "narHash": "sha256-UTA2HZsFDaIR3NkIobH6dpQlGgGsEw1kL1uQhM6bO2g=",
+ "lastModified": 1694400214,
+ "narHash": "sha256-QHESodq9FQpjWshfxmdYePnEAPaNPsYEd3iBe/JYjqk=",
"owner": "nix-community",
"repo": "nixd",
- "rev": "d1704af3bc2fffa1cbe70e29d96a1522040aaee5",
+ "rev": "69b533e8d643c5dcbda7962d4dff808d72165783",
"type": "github"
},
"original": {
@@ -263,11 +301,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1692373088,
- "narHash": "sha256-EPgCecdc9I8aTdmDNoO1l7R72r2WPhZRcesV4nzxBj8=",
+ "lastModified": 1694591211,
+ "narHash": "sha256-NPP7XGZH+Q5ey7nE2zGLrBrzKmLYPhj8YgsTSdhH0D4=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "7f1836531b126cfcf584e7d7d71bf8758bb58969",
+ "rev": "3ccd87fcdae4732fe33773cefa4375c641a057e7",
"type": "github"
},
"original": {
@@ -325,8 +363,36 @@
"type": "github"
}
},
+ "nixpkgs_10": {
+ "locked": {
+ "lastModified": 1664847737,
+ "narHash": "sha256-Wxl0CtRH3Vo8+qEZ/PbCcx+9D8wEEi56tJPmROum2ss=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "de80d1d04ee691279e1302a1128c082bbda3ab01",
+ "type": "github"
+ },
+ "original": {
+ "id": "nixpkgs",
+ "type": "indirect"
+ }
+ },
"nixpkgs_2": {
"locked": {
+ "lastModified": 1694032533,
+ "narHash": "sha256-I8cfCV/4JNJJ8KHOTxTU1EphKT8ARSb4s9pq99prYV0=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "efd23a1c9ae8c574e2ca923c2b2dc336797f4cc4",
+ "type": "github"
+ },
+ "original": {
+ "id": "nixpkgs",
+ "type": "indirect"
+ }
+ },
+ "nixpkgs_3": {
+ "locked": {
"lastModified": 1670461440,
"narHash": "sha256-jy1LB8HOMKGJEGXgzFRLDU1CBGL0/LlkolgnqIsF0D8=",
"owner": "NixOS",
@@ -341,7 +407,7 @@
"type": "github"
}
},
- "nixpkgs_3": {
+ "nixpkgs_4": {
"locked": {
"lastModified": 1679319606,
"narHash": "sha256-wyEMIZB6BnsmJWInEgDZu66hXVMGJEZFl5uDsn27f9M=",
@@ -355,7 +421,7 @@
"type": "indirect"
}
},
- "nixpkgs_4": {
+ "nixpkgs_5": {
"locked": {
"lastModified": 1686398752,
"narHash": "sha256-nGWNQVhSw4VSL+S0D0cbrNR9vs9Bq7rlYR+1K5f5j6w=",
@@ -371,13 +437,13 @@
"type": "github"
}
},
- "nixpkgs_5": {
+ "nixpkgs_6": {
"locked": {
- "lastModified": 1692408586,
- "narHash": "sha256-OeL3DabI+U3z/lEmKNnWsfawq3AxNYLeVSyhay9M0nQ=",
+ "lastModified": 1694565417,
+ "narHash": "sha256-51a7dGQ8Q5kJ23nM2R7iiWbsU/r16osqu4W1s8v1C2w=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "25cdc712eae9721530c38a8e81d44fd4346490dd",
+ "rev": "0be5bebfd4a6cecba668ae410b368f0b91d0af08",
"type": "github"
},
"original": {
@@ -387,7 +453,7 @@
"type": "github"
}
},
- "nixpkgs_6": {
+ "nixpkgs_7": {
"locked": {
"lastModified": 1678875422,
"narHash": "sha256-T3o6NcQPwXjxJMn2shz86Chch4ljXgZn746c2caGxd8=",
@@ -401,7 +467,7 @@
"type": "indirect"
}
},
- "nixpkgs_7": {
+ "nixpkgs_8": {
"locked": {
"lastModified": 1682109806,
"narHash": "sha256-d9g7RKNShMLboTWwukM+RObDWWpHKaqTYXB48clBWXI=",
@@ -415,7 +481,7 @@
"type": "indirect"
}
},
- "nixpkgs_8": {
+ "nixpkgs_9": {
"locked": {
"lastModified": 1637875414,
"narHash": "sha256-Ica++SXFuLyxX9Q7YxhfZulUif6/gwM8AEQYlUxqSgE=",
@@ -430,23 +496,9 @@
"type": "indirect"
}
},
- "nixpkgs_9": {
- "locked": {
- "lastModified": 1664847737,
- "narHash": "sha256-Wxl0CtRH3Vo8+qEZ/PbCcx+9D8wEEi56tJPmROum2ss=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "de80d1d04ee691279e1302a1128c082bbda3ab01",
- "type": "github"
- },
- "original": {
- "id": "nixpkgs",
- "type": "indirect"
- }
- },
"nixturris": {
"inputs": {
- "flake-utils": "flake-utils_3",
+ "flake-utils": "flake-utils_4",
"nixpkgs": [
"nixpkgs"
]
@@ -467,11 +519,11 @@
},
"personal-secret": {
"locked": {
- "lastModified": 1692172938,
- "narHash": "sha256-o5fcozS/w4tRdyvRBDHFfo2bjaGlETBLiI7osi7aXmI=",
+ "lastModified": 1694075868,
+ "narHash": "sha256-jJCQUukLJdqU+VeL1vRGgvl8LvF94PE18Owxi2iFZB0=",
"ref": "refs/heads/master",
- "rev": "c6d5f6fd947d3d7c953ba572cd0d713825dbdbbe",
- "revCount": 77,
+ "rev": "bf3b1eeb72636d4a6fed9b461375795c3d17cb65",
+ "revCount": 78,
"type": "git",
"url": "ssh://git@cynerd.cz/nixos-personal-secret"
},
@@ -484,11 +536,12 @@
"inputs": {
"agenix": "agenix",
"flake-utils": "flake-utils",
+ "flatline": "flatline",
"nix": "nix",
"nixbigclown": "nixbigclown",
"nixd": "nixd",
"nixos-hardware": "nixos-hardware",
- "nixpkgs": "nixpkgs_5",
+ "nixpkgs": "nixpkgs_6",
"nixturris": "nixturris",
"personal-secret": "personal-secret",
"shellrc": "shellrc",
@@ -500,8 +553,8 @@
},
"shellrc": {
"inputs": {
- "flake-utils": "flake-utils_4",
- "nixpkgs": "nixpkgs_6"
+ "flake-utils": "flake-utils_5",
+ "nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1679654704,
@@ -519,15 +572,15 @@
},
"shvspy": {
"inputs": {
- "flake-utils": "flake-utils_5",
- "nixpkgs": "nixpkgs_7"
+ "flake-utils": "flake-utils_6",
+ "nixpkgs": "nixpkgs_8"
},
"locked": {
- "lastModified": 1687541101,
- "narHash": "sha256-cQaXay3t6VtJ8FxJU4XaOheItPwlhfnWd2wWU071YYA=",
+ "lastModified": 1694008428,
+ "narHash": "sha256-DPsR6Qae0O23EULtRtx9CV1WoaUtbeAhr0lyvJsBOv8=",
"ref": "refs/heads/master",
- "rev": "21b175ad34d9adb98247e74cab8b46b8e590abf1",
- "revCount": 392,
+ "rev": "1f0a080495b2558789c03b1420ffa783afe806d8",
+ "revCount": 394,
"submodules": true,
"type": "git",
"url": "https://github.com/silicon-heaven/shvspy.git"
@@ -540,7 +593,7 @@
},
"sterm": {
"inputs": {
- "nixpkgs": "nixpkgs_8"
+ "nixpkgs": "nixpkgs_9"
},
"locked": {
"lastModified": 1661025608,
@@ -586,10 +639,25 @@
"type": "github"
}
},
+ "systems_3": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
+ },
"usbkey": {
"inputs": {
- "flake-utils": "flake-utils_6",
- "nixpkgs": "nixpkgs_9"
+ "flake-utils": "flake-utils_7",
+ "nixpkgs": "nixpkgs_10"
},
"locked": {
"lastModified": 1665754388,
@@ -608,11 +676,11 @@
},
"vpsadminos": {
"locked": {
- "lastModified": 1692292359,
- "narHash": "sha256-+IFqoJDVtMKhJqfzTFiV1PEnuK/hPYeaVtlCqIxJxxY=",
+ "lastModified": 1694391382,
+ "narHash": "sha256-RkoLHGH32YMhkJ8OOdyEsK23szi2g59CHUUS6qzKB6w=",
"owner": "vpsfreecz",
"repo": "vpsadminos",
- "rev": "600083b6fc5ef21633eee4be5503e6ae7d3ad38e",
+ "rev": "36853321b676f19ed167a4749457f2bf945127a3",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 80f8dc2..add7080 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,6 +8,7 @@
agenix.url = "github:ryantm/agenix";
nixd.url = "github:nix-community/nixd";
shvspy.url = "git+https://github.com/silicon-heaven/shvspy.git?submodules=1";
+ flatline.url = "git+http://jessie.elektroline.cz/elektroline/flatlineng.git?submodules=1";
nixturris = {
url = "github:cynerd/nixturris";
diff --git a/nixos/configurations.nix b/nixos/configurations.nix
index 08a0fef..a4c6895 100644
--- a/nixos/configurations.nix
+++ b/nixos/configurations.nix
@@ -16,6 +16,7 @@ with nixpkgs.lib; let
agenix.overlays.default
nixd.overlays.default
shvspy.overlays.default
+ flatline.overlays.default
sterm.overlay
];
system.configurationRevision = self.rev or "dirty";
diff --git a/nixos/modules/develop.nix b/nixos/modules/develop.nix
index ad5acc1..96900d2 100644
--- a/nixos/modules/develop.nix
+++ b/nixos/modules/develop.nix
@@ -118,6 +118,7 @@ with lib; {
# SHV
shvspy
+ flatline
# Images
imagemagick