daniel/dotfiles
1
0
Fork 0
Code Activity Actions

flake: less nixpkgs
All checks were successful
Build / build-amd64-linux (push) Successful in 27s
Details
Build / build-arm64-linux (push) Successful in 9m29s
Details

Browse source
This commit is contained in:
Daniel Kempkens 2024-07-14 23:05:41 +02:00
parent e5c2b52a25
commit 7a6d3dca53
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM
5 changed files with 33 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
flake.lock
View file

@ -9,7 +9,7 @@
"home-manager" "home-manager"
], ],
"nixpkgs": [ "nixpkgs": [
"nixos-unstable" "nixpkgs"
], ],
"systems": "systems" "systems": "systems"
}, },
@ -75,7 +75,7 @@
"disko": { "disko": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixos-unstable" "nixpkgs"
] ]
}, },
"locked": { "locked": {
@ -307,7 +307,7 @@
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixos-unstable" "nixpkgs"
] ]
}, },
"locked": { "locked": {
@ -506,13 +506,13 @@
"type": "github" "type": "github"
} }
}, },
"nixos-unstable": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1720890539, "lastModified": 1720933452,
"narHash": "sha256-1K32XHPcQBo8XdLDQNybfLQc9I8hqSZdjA/Ur3zW/io=", "narHash": "sha256-HJhBuKZcmZSrAXukaIus9SsXahIVuo4/zdAhxSJrSQ4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "19116ccf234e32acf133863d430506da68008550", "rev": "3e7eb6610f8b7003416b2bffdd8865b85326db18",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -522,22 +522,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs": {
"locked": {
"lastModified": 1720875497,
"narHash": "sha256-1Al1qDC8Q/s4viPq4ln8jfHWZxYl+Nb49dNFISFpqBY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "b729601a9e6c459fd8884dea513af143111bed54",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1719876945, "lastModified": 1719876945,
@ -644,7 +628,6 @@
"nifoc-overlay": "nifoc-overlay", "nifoc-overlay": "nifoc-overlay",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixos-unstable": "nixos-unstable",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"pre-commit-hooks-nix": "pre-commit-hooks-nix", "pre-commit-hooks-nix": "pre-commit-hooks-nix",
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"

29
flake.nix
View file

@ -1,7 +1,6 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small";
nixos-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small";
# nixpkgs-master.url = "github:nixos/nixpkgs/master"; # nixpkgs-master.url = "github:nixos/nixpkgs/master";
# Lix # Lix
@ -31,7 +30,7 @@
disko = { disko = {
url = "github:nix-community/disko?ref=refs/tags/v1.3.0"; url = "github:nix-community/disko?ref=refs/tags/v1.3.0";
inputs.nixpkgs.follows = "nixos-unstable"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-darwin = { nix-darwin = {
@ -41,7 +40,7 @@
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixos-unstable"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
@ -49,7 +48,7 @@
agenix = { agenix = {
url = "github:ryantm/agenix"; url = "github:ryantm/agenix";
inputs = { inputs = {
nixpkgs.follows = "nixos-unstable"; nixpkgs.follows = "nixpkgs";
darwin.follows = "nix-darwin"; darwin.follows = "nix-darwin";
home-manager.follows = "home-manager"; home-manager.follows = "home-manager";
}; };
@ -93,37 +92,27 @@
}; };
tanker = import ./system/flakes/tanker.nix { tanker = import ./system/flakes/tanker.nix {
nixpkgs = inputs.nixos-unstable; inherit (inputs) nixpkgs disko home-manager agenix attic;
inherit (inputs) disko home-manager agenix attic;
inherit inputs; inherit inputs;
}; };
mediaserver = import ./system/flakes/mediaserver.nix { mediaserver = import ./system/flakes/mediaserver.nix {
nixpkgs = inputs.nixos-unstable; inherit (inputs) nixpkgs home-manager agenix;
inherit (inputs) home-manager agenix;
inherit inputs; inherit inputs;
}; };
argon = import ./system/flakes/argon.nix { argon = import ./system/flakes/argon.nix {
nixpkgs = inputs.nixos-unstable; inherit (inputs) nixpkgs nixos-hardware home-manager agenix;
inherit (inputs) nixos-hardware home-manager agenix;
inherit inputs; inherit inputs;
}; };
neon = import ./system/flakes/neon.nix { neon = import ./system/flakes/neon.nix {
nixpkgs = inputs.nixos-unstable; inherit (inputs) nixpkgs nixos-hardware home-manager agenix;
inherit (inputs) nixos-hardware home-manager agenix;
inherit inputs; inherit inputs;
}; };
adsb-antenna = import ./system/flakes/adsb-antenna.nix { adsb-antenna = import ./system/flakes/adsb-antenna.nix {
nixpkgs = inputs.nixos-unstable; inherit (inputs) nixpkgs nixos-hardware home-manager;
inherit (inputs) nixos-hardware home-manager;
inherit inputs; inherit inputs;
}; };
in in

31
system/flakes/tanker.nix
View file

@ -15,10 +15,6 @@ let
config = { config = {
allowUnfree = true; allowUnfree = true;
allowBroken = true; allowBroken = true;
permittedInsecurePackages = [
"openssl-1.1.1t"
];
}; };
}; };
in in
@ -26,27 +22,30 @@ rec {
system = nixpkgs.lib.nixosSystem { system = nixpkgs.lib.nixosSystem {
system = default-system; system = default-system;
modules = [ modules = [
disko.nixosModules.disko
../hosts/tanker.nix
home-manager.nixosModules.home-manager
agenix.nixosModules.default
attic.nixosModules.atticd
{ {
nixpkgs = nixpkgsConfig; nixpkgs = nixpkgsConfig;
nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; nix = {
nix.registry.nixpkgs.flake = nixpkgs; registry.nixpkgs.to = { type = "path"; path = nixpkgs.outPath; };
nixPath = nixpkgs.lib.mkForce [ "nixpkgs=flake:nixpkgs" ];
};
}
disko.nixosModules.disko
home-manager.nixosModules.home-manager
{
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
users.daniel = import ../../home/hosts/tanker.nix; users.daniel = import ../../home/hosts/tanker.nix;
}; };
} }
agenix.nixosModules.default
attic.nixosModules.atticd
../hosts/tanker.nix
]; ];
}; };

2
system/hosts/Styx.nix
View file

@ -16,8 +16,6 @@ in
]; ];
nix = { nix = {
# package = pkgs.nixVersions.stable;
settings = { settings = {
experimental-features = [ "nix-command" "flakes" ]; experimental-features = [ "nix-command" "flakes" ];
extra-platforms = [ "x86_64-darwin" ]; extra-platforms = [ "x86_64-darwin" ];

3
system/hosts/tanker.nix
View file

@ -79,6 +79,7 @@ in
"https://attic.cache.daniel.sx/nifoc-ci?priority=35" "https://attic.cache.daniel.sx/nifoc-ci?priority=35"
"https://nix-community.cachix.org?priority=50" "https://nix-community.cachix.org?priority=50"
"https://cache.garnix.io?priority=60" "https://cache.garnix.io?priority=60"
"https://cache.lix.systems?priority=70"
]; ];
extra-trusted-public-keys = [ extra-trusted-public-keys = [
@ -86,6 +87,7 @@ in
"nifoc-ci:JpD9zqVQi8JuS7B8htPDOQZh08rhInMnGFS9RVhiuwk=" "nifoc-ci:JpD9zqVQi8JuS7B8htPDOQZh08rhInMnGFS9RVhiuwk="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
"cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
]; ];
connect-timeout = 5; connect-timeout = 5;
@ -175,7 +177,6 @@ in
}; };
fonts.fontconfig.enable = false; fonts.fontconfig.enable = false;
sound.enable = false;
programs.fish.enable = true; programs.fish.enable = true;
programs.htop.enable = true; programs.htop.enable = true;