artemist/nixos-config
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Split up private, clean up base

Browse source
This commit is contained in:
Artemis Tosini 2023-11-26 07:30:29 +00:00
parent c55b07e0af
commit c4a3b2a52e
Signed by: artemist
GPG key ID: EE5227935FE3FF18
6 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
flake.lock
View file

@ -201,11 +201,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1700847865, "lastModified": 1700900274,
"narHash": "sha256-uWaOIemGl9LF813MW0AEgCBpKwFo2t1Wv3BZc6e5Frw=", "narHash": "sha256-KWoKDP5I1viHR4bG3ENnJ7H1DD16tXWH4ROvS0IfXw8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "8cedd63eede4c22deb192f1721dd67e7460e1ebe", "rev": "a462e7315deaa8194b0821f726709bb7e51a850c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -250,11 +250,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1700363379, "lastModified": 1700968077,
"narHash": "sha256-fBEVPFwSZ6AmBE1s1oT7E9WVuqRghruxTnSQ8UUlMkw=", "narHash": "sha256-Lax+2g7G3Fe+ckMrHLYTl+97unbmNDmN1qS9MLBkxr4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "27920146e671a0d565aaa7452907383be14d8d82", "rev": "bd3aec0ecb0fdde863a7ed2c6caa220c47e22c07",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -280,11 +280,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1700612854, "lastModified": 1700794826,
"narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -436,11 +436,11 @@
}, },
"private": { "private": {
"locked": { "locked": {
"lastModified": 1700250258, "lastModified": 1700983091,
"narHash": "sha256-5RE41KPIh85LRSwWP0CHBv2L5Gl1Qnl42268JE9fFWI=", "narHash": "sha256-qQt4Je2KsLVKAjZ2A6I/WAFf27d3iLORmf7/h47huJ0=",
"ref": "unified", "ref": "unified",
"rev": "061bc7e341df4629220e215c6caad77684c18513", "rev": "cea5114a42b231b8e3d1dd6158ad6f1f98756135",
"revCount": 38, "revCount": 39,
"type": "git", "type": "git",
"url": "ssh://gitea@git.mildlyfunctional.gay/artemist/nixos-config-private" "url": "ssh://gitea@git.mildlyfunctional.gay/artemist/nixos-config-private"
}, },

3
flake.nix
View file

@ -41,7 +41,6 @@
nixpkgs.lib.nixosSystem (nixpkgs.lib.recursiveUpdate conf rec { nixpkgs.lib.nixosSystem (nixpkgs.lib.recursiveUpdate conf rec {
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
private.nixosModules.base
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ home-manager.extraSpecialArgs = specialArgs; } { home-manager.extraSpecialArgs = specialArgs; }
] ++ (conf.modules or [ ]); ] ++ (conf.modules or [ ]);
@ -49,7 +48,7 @@
in { in {
nixosConfigurations.starlight = makeSystem { nixosConfigurations.starlight = makeSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ ./system/starlight private.nixosModules.starlight ]; modules = [ ./system/starlight ];
}; };
nixosConfigurations.rainbowdash = makeSystem { nixosConfigurations.rainbowdash = makeSystem {

10
sets/base.nix
View file

@ -1,6 +1,8 @@
{ config, pkgs, lib, inputs, ... }: { config, pkgs, lib, inputs, ... }:
{ {
imports = [ inputs.private.nixosModules.base ];
systemd.tmpfiles.rules = lib.mapAttrsToList systemd.tmpfiles.rules = lib.mapAttrsToList
(key: value: "L+ /etc/channels/${key} - - - - ${value.outPath}") inputs; (key: value: "L+ /etc/channels/${key} - - - - ${value.outPath}") inputs;
@ -13,7 +15,7 @@
''; '';
gc = { gc = {
automatic = true; automatic = true;
dates = "00:00"; dates = "8:00";
options = "--delete-older-than 14d"; options = "--delete-older-than 14d";
}; };
settings.trusted-users = [ "artemis" ]; settings.trusted-users = [ "artemis" ];
@ -25,15 +27,9 @@
}; };
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
time.timeZone = "Etc/UTC"; time.timeZone = "Etc/UTC";
environment.shellAliases.cp = "cp --reflink=auto --sparse=always"; environment.shellAliases.cp = "cp --reflink=auto --sparse=always";
services.resolved.extraConfig = "MulticastDNS=true";
networking.firewall.enable = false; networking.firewall.enable = false;
programs.fish.enable = true; programs.fish.enable = true;
users = { users = {

4
sets/sway.nix
View file

@ -1,5 +1,5 @@
{ config, pkgs, ... }: { { pkgs, inputs, ... }: {
imports = [ ./fonts.nix ]; imports = [ ./fonts.nix inputs.private.nixosModules.sway ];
security.polkit.enable = true; security.polkit.enable = true;
services = { services = {
accounts-daemon.enable = true; accounts-daemon.enable = true;

1
sets/workstation.nix
View file

@ -11,6 +11,7 @@
./swap.nix ./swap.nix
./sway.nix ./sway.nix
inputs.nixvim.nixosModules.nixvim inputs.nixvim.nixosModules.nixvim
inputs.private.nixosModules.taskwarrior
]; ];
i18n.defaultLocale = "de_DE.UTF-8"; i18n.defaultLocale = "de_DE.UTF-8";

1
system/starlight/default.nix
View file

@ -18,6 +18,7 @@
../../sets/workstation.nix ../../sets/workstation.nix
inputs.nixos-hardware.nixosModules.common-cpu-amd inputs.nixos-hardware.nixosModules.common-cpu-amd
inputs.nixos-hardware.nixosModules.common-gpu-amd inputs.nixos-hardware.nixosModules.common-gpu-amd
inputs.private.nixosModules.starlight
]; ];
# Network # Network