aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinnea Gräf <nea@nea.moe>2025-04-15 23:50:00 +0200
committerLinnea Gräf <nea@nea.moe>2025-04-15 23:50:00 +0200
commit04e73191d7a1b0bdf06fc107a034f0184410e345 (patch)
treec9ad9b716fa3111459fcbaa7647ea18df3d03388
parent38316484320a722cdacde91bc7f721fe20e1389b (diff)
downloadnix-infra-04e73191d7a1b0bdf06fc107a034f0184410e345.tar.gz
nix-infra-04e73191d7a1b0bdf06fc107a034f0184410e345.tar.bz2
nix-infra-04e73191d7a1b0bdf06fc107a034f0184410e345.zip
snapshot: Di 15. Apr 23:50:00 CEST 2025
-rw-r--r--flake.lock57
-rw-r--r--flake.nix13
-rw-r--r--srv/hadante/configuration.nix71
3 files changed, 108 insertions, 33 deletions
diff --git a/flake.lock b/flake.lock
index ff5ee5f..57b7828 100644
--- a/flake.lock
+++ b/flake.lock
@@ -15,6 +15,27 @@
"type": "github"
}
},
+ "customss": {
+ "inputs": {
+ "flake-utils": "flake-utils",
+ "nixpkgs": [
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1744753545,
+ "narHash": "sha256-cjG9J1XVgDG4f1U1MqvWH5y+8wTGw5VPuHeyqfDos2U=",
+ "owner": "nea89o",
+ "repo": "customss",
+ "rev": "ebf49c4be97b469a80d260e9aeed9f1c4f1a64a6",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nea89o",
+ "repo": "customss",
+ "type": "github"
+ }
+ },
"disko": {
"inputs": {
"nixpkgs": [
@@ -90,6 +111,24 @@
"type": "github"
}
},
+ "flake-utils_2": {
+ "inputs": {
+ "systems": "systems_2"
+ },
+ "locked": {
+ "lastModified": 1731533236,
+ "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
"gitignore": {
"inputs": {
"nixpkgs": [
@@ -219,8 +258,9 @@
},
"root": {
"inputs": {
+ "customss": "customss",
"disko": "disko",
- "flake-utils": "flake-utils",
+ "flake-utils": "flake-utils_2",
"lanzaboote": "lanzaboote",
"nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs"
@@ -261,6 +301,21 @@
"repo": "default",
"type": "github"
}
+ },
+ "systems_2": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
}
},
"root": "root",
diff --git a/flake.nix b/flake.nix
index a8329ae..6a5b5a9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,6 +17,11 @@
inputs.nixpkgs.follows = "nixpkgs";
};
+ customss = {
+ url = "github:nea89o/customss";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
+
nix-index-database = {
url = "github:nix-community/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs";
@@ -31,14 +36,20 @@
nix-index-database,
lanzaboote,
flake-utils,
+ customss,
...
}:
let
osConfig = {
nixosConfigurations = {
- hadante = nixpkgs.lib.nixosSystem {
+ hadante = nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux";
modules = [
+ (inputs: {
+ nixpkgs.overlays = [
+ customss.overlays.default
+ ];
+ })
./srv/hadante/configuration.nix
lanzaboote.nixosModules.lanzaboote
nix-index-database.nixosModules.nix-index
diff --git a/srv/hadante/configuration.nix b/srv/hadante/configuration.nix
index 948efd2..5d77826 100644
--- a/srv/hadante/configuration.nix
+++ b/srv/hadante/configuration.nix
@@ -2,7 +2,12 @@
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’).
-{ config, pkgs, ... }:
+inputs@{
+ config,
+ pkgs,
+ customss,
+ ...
+}:
{
imports = [
@@ -138,44 +143,48 @@
];
- environment.systemPackages = with pkgs; [
- neovim
- atuin
- git
- zsh
- yadm
- openssl
- xxd
- pinentry-qt
- emacs
- atuin
+ environment.systemPackages = (
+ with pkgs;
+ [
+ neovim
+ atuin
+ git
+ zsh
+ yadm
+ openssl
+ xxd
+ pinentry-qt
+ emacs
+ atuin
- thunderbird
- sway
- webp-pixbuf-loader
- delta
- rofi
+ thunderbird
+ sway
+ webp-pixbuf-loader
+ delta
+ rofi
- wezterm
+ wezterm
- vesktop
- ripgrep
+ vesktop
+ ripgrep
- prismlauncher
- jdk8
- jdk17
- jdk21
- jdk23
+ prismlauncher
+ jdk8
+ jdk17
+ jdk21
+ jdk23
- sbctl
+ sbctl
- wl-clipboard
+ wl-clipboard
- jetbrains.idea-ultimate
+ jetbrains.idea-ultimate
- calibre
+ calibre
- electrum
+ electrum
- ];
+ myss
+ ]
+ );
}