mirror of
https://github.com/Feliix42/dotfiles.git
synced 2024-11-22 14:06:30 +00:00
Add hydra jobs, make flake pure
This commit is contained in:
parent
ad266e7ff2
commit
360067b244
4 changed files with 45 additions and 15 deletions
|
@ -2,14 +2,14 @@
|
||||||
# your system. Help is available in the configuration.nix(5) man page
|
# your system. Help is available in the configuration.nix(5) man page
|
||||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||||
|
|
||||||
{ config, pkgs, ... }:
|
{ config, pkgs, unstable, ... }:
|
||||||
|
|
||||||
let
|
#let
|
||||||
# use unstable nixpkgs for some specific packages that are still in-dev:
|
# use unstable nixpkgs for some specific packages that are still in-dev:
|
||||||
# sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable
|
# sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable
|
||||||
# sudo nix-channel --update
|
# sudo nix-channel --update
|
||||||
unstable = import <nixos-unstable> { config = config.nixpkgs.config; };
|
#unstable = import <nixos-unstable> { config = config.nixpkgs.config; };
|
||||||
in
|
#in
|
||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
[
|
[
|
||||||
|
@ -50,6 +50,11 @@ in
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
||||||
|
boot.plymouth = {
|
||||||
|
enable = true;
|
||||||
|
theme = "breeze";
|
||||||
|
};
|
||||||
|
|
||||||
# ------------ kernel -------------------------------------------------------
|
# ------------ kernel -------------------------------------------------------
|
||||||
boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_1;
|
boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_1;
|
||||||
|
|
||||||
|
|
|
@ -23,11 +23,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1680070330,
|
"lastModified": 1680876084,
|
||||||
"narHash": "sha256-aoT2YZCd9LEtiEULFLIF0ykKydgE72X8gw/k9/pRS5I=",
|
"narHash": "sha256-eP9yxP0wc7XuVaODugh+ajgbFGaile2O1ihxiLxOuvU=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "a6aa8174fa61e55bd7e62d35464d3092aefe0421",
|
"rev": "3006d2860a6ed5e01b0c3e7ffb730e9b293116e2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -39,11 +39,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1679966490,
|
"lastModified": 1681269223,
|
||||||
"narHash": "sha256-k0jV+y1jawE6w4ZvKgXDNg4+O9NNtcaWwzw8gufv0b4=",
|
"narHash": "sha256-i6OeI2f7qGvmLfD07l1Az5iBL+bFeP0RHixisWtpUGo=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5b7cd5c39befee629be284970415b6eb3b0ff000",
|
"rev": "87edbd74246ccdfa64503f334ed86fa04010bab9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -56,7 +56,23 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"mlir": "mlir",
|
"mlir": "mlir",
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs",
|
||||||
|
"unstable": "unstable"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"unstable": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681303793,
|
||||||
|
"narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "fe2ecaf706a5907b5e54d979fbde4924d84b65fc",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"id": "nixpkgs",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "nixpkgs/nixos-22.11";
|
nixpkgs.url = "nixpkgs/nixos-22.11";
|
||||||
|
unstable.url = "nixpkgs/nixos-unstable";
|
||||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||||
#home-manager = {
|
#home-manager = {
|
||||||
#url = "github:nix-community/home-manager";
|
#url = "github:nix-community/home-manager";
|
||||||
|
@ -18,9 +19,9 @@
|
||||||
# TODO: define nixos-unstable and nixos-hardware as dependencies here
|
# TODO: define nixos-unstable and nixos-hardware as dependencies here
|
||||||
|
|
||||||
# outputs = inputs@{ nixpkgs, nixos-hardware, home-manager, mlir, ... }: {
|
# outputs = inputs@{ nixpkgs, nixos-hardware, home-manager, mlir, ... }: {
|
||||||
outputs = inputs@{ nixpkgs, nixos-hardware, mlir, ... }: {
|
outputs = inputs@{ self, nixpkgs, unstable, nixos-hardware, mlir, ... }: {
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
entropy = nixpkgs.lib.nixosSystem {
|
entropy = nixpkgs.lib.nixosSystem rec {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
modules = [
|
modules = [
|
||||||
./configuration.nix
|
./configuration.nix
|
||||||
|
@ -34,11 +35,19 @@
|
||||||
## Optionally, use home-manager.extraSpecialArgs to pass
|
## Optionally, use home-manager.extraSpecialArgs to pass
|
||||||
## arguments to home.nix
|
## arguments to home.nix
|
||||||
#}
|
#}
|
||||||
(_: {
|
({ config, ... }: {
|
||||||
nixpkgs.overlays = [ mlir.overlay ];
|
nixpkgs.overlays = [ mlir.overlay ];
|
||||||
|
_module.args = {
|
||||||
|
unstable = import inputs.unstable {
|
||||||
|
inherit (config.nixpkgs) config;
|
||||||
|
inherit system;
|
||||||
|
};
|
||||||
|
};
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
hydraJobs.entropy."x86_64-linux" = self.nixosConfigurations.entropy.config.system.build.toplevel;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
user = "s6525655@vpn-cfaed-cpb-ma";
|
user = "s6525655@vpn-cfaed-cpb-ma";
|
||||||
protocol = "anyconnect";
|
protocol = "anyconnect";
|
||||||
gateway = "vpn2.zih.tu-dresden.de";
|
gateway = "vpn2.zih.tu-dresden.de";
|
||||||
passwordFile = /home/felix/.config/vpn/openconnect.txt;
|
passwordFile = "/home/felix/.config/vpn/openconnect.txt";
|
||||||
extraOptions = {
|
extraOptions = {
|
||||||
authgroup = "A-Tunnel-TU-Networks";
|
authgroup = "A-Tunnel-TU-Networks";
|
||||||
compression = "stateless";
|
compression = "stateless";
|
||||||
|
|
Loading…
Reference in a new issue