repomaa/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Joakim Repomaa
2025-02-08 14:35:59 +02:00
parent d32a5dc147
commit 0cf0753e5b
2 changed files with 65 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
flake.lock generated
View File

@@ -71,6 +71,24 @@
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": {
"lastModified": 1738453229,
"narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": { "locked": {
"lastModified": 1719877454, "lastModified": 1719877454,
"narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=", "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=",
@@ -85,7 +103,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_2": { "flake-parts_3": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"lanzaboote", "lanzaboote",
@@ -220,7 +238,7 @@
}, },
"gtrackmap": { "gtrackmap": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts_2",
"frontend": "frontend", "frontend": "frontend",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@@ -318,7 +336,7 @@
"inputs": { "inputs": {
"crane": "crane", "crane": "crane",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_3",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"pre-commit-hooks-nix": "pre-commit-hooks-nix", "pre-commit-hooks-nix": "pre-commit-hooks-nix",
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
@@ -410,6 +428,18 @@
} }
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": {
"lastModified": 1738452942,
"narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
}
},
"nixpkgs-lib_2": {
"locked": { "locked": {
"lastModified": 1719876945, "lastModified": 1719876945,
"narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=",
@@ -566,6 +596,7 @@
"inputs": { "inputs": {
"auto-cpufreq": "auto-cpufreq", "auto-cpufreq": "auto-cpufreq",
"commander-nvim": "commander-nvim", "commander-nvim": "commander-nvim",
"flake-parts": "flake-parts",
"gen-nvim": "gen-nvim", "gen-nvim": "gen-nvim",
"gtrackmap": "gtrackmap", "gtrackmap": "gtrackmap",
"home-manager": "home-manager", "home-manager": "home-manager",

59
flake.nix
View File

@@ -1,5 +1,6 @@
{ {
inputs = { inputs = {
flake-parts.url = "github:hercules-ci/flake-parts";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
nextcloud = { nextcloud = {
@@ -48,36 +49,38 @@
}; };
ksoloti-pr.url = "github:repomaa/nixpkgs/pkg/ksoloti"; ksoloti-pr.url = "github:repomaa/nixpkgs/pkg/ksoloti";
}; };
outputs = { nixpkgs, ... }@inputs: outputs = { flake-parts, nixpkgs, ... }@inputs:
let flake-parts.lib.mkFlake { inherit inputs; } (
bin.sshPort = 2222; let
ssh.publicKeys.yubikey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLIUkESu5NnBi1M0+ZjYrkp6/rIFuwc3aguspf98jmOydNce6l65cnS3GRzc9oWx4lu11ahi87ZuE+pYV+gaHm4="; ssh.publicKeys.yubikey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLIUkESu5NnBi1M0+ZjYrkp6/rIFuwc3aguspf98jmOydNce6l65cnS3GRzc9oWx4lu11ahi87ZuE+pYV+gaHm4=";
specialArgs = { inherit inputs bin ssh; }; specialArgs = { inherit inputs ssh; };
system = "x86_64-linux"; inherit (nixpkgs) lib;
pkgs = nixpkgs.legacyPackages.${system}; in
in {
{ systems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
devShells.${system}.default = pkgs.mkShell { perSystem = { pkgs, ... }: {
packages = with pkgs; [ devShells.default = pkgs.mkShell {
nix-output-monitor packages = with pkgs; [
]; nix-output-monitor
}; ];
nixosConfigurations = { };
freun-dev = nixpkgs.lib.nixosSystem {
inherit specialArgs;
system = "aarch64-linux";
modules = [ ./modules ./hosts/freun.dev ];
}; };
flake.nixosConfigurations = {
freun-dev = lib.nixosSystem {
inherit specialArgs;
modules = [ ./modules ./hosts/freun.dev ];
};
radish = nixpkgs.lib.nixosSystem { radish = lib.nixosSystem {
inherit system specialArgs; inherit specialArgs;
modules = [ ./modules ./hosts/radish ]; modules = [ ./modules ./hosts/radish ];
}; };
apu = nixpkgs.lib.nixosSystem { apu = nixpkgs.lib.nixosSystem {
inherit system specialArgs; inherit specialArgs;
modules = [ ./modules ./hosts/apu ]; modules = [ ./modules ./hosts/apu ];
};
}; };
}; }
}; );
} }