Nebucatnetzer
/
nixos
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rewrite inputs

This commit is contained in:
Andreas Zweili 2022-02-16 22:19:13 +01:00
parent ce42f3e0f2
commit 9081f84152
19 changed files with 86 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
flake.nix
View File

@ -12,6 +12,10 @@
url = "github:nix-community/home-manager/release-21.11";
inputs.nixpkgs.follows = "nixpkgs";
};
custom = {
system = "x86_64-linux";
username = "andreas";
};
};
outputs =
@ -20,19 +24,18 @@
, nixpkgs-unstable
, nixos-hardware
, home-manager
, custom
}:
let
system = "x86_64-linux";
username = "andreas";
overlay-unstable = final: prev: {
unstable = import nixpkgs-unstable {
system = "x86_64-linux";
system = custom.system;
config.allowUnfree = true;
};
};
pkgs = import nixpkgs {
inherit system;
inherit custom.system;
config = {
allowUnfree = true;
};
@ -41,8 +44,8 @@
];
};
mkComputer = configurationNix: homeManagerRole: extraModules: nixpkgs.lib.nixosSystem {
inherit system pkgs;
specialArgs = { inherit self nixpkgs system inputs username; };
inherit custom.system pkgs;
specialArgs = { inherit inputs username; };
modules = (
[
# System configuration for this host
@ -55,8 +58,8 @@
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.${username}.imports = [
(import homeManagerRole { inherit pkgs username; })
home-manager.users.${custom.username}.imports = [
(import homeManagerRole { inherit pkgs inputs; })
];
}
] ++ extraModules
@ -107,140 +110,140 @@
];
proxy = mkComputer
(mkVM
{ hostname = "proxy"; ip = "10.7.89.100"; inherit self; })
{ hostname = "proxy"; ip = "10.7.89.100"; inherit inputs; })
./home-manager/headless.nix
[
./modules/haproxy
];
nixos-management = mkComputer
(mkVM
{ hostname = "nixos-management"; ip = "10.7.89.150"; inherit self; })
{ hostname = "nixos-management"; ip = "10.7.89.150"; inherit inputs; })
./home-manager/headless.nix
[
./modules/code-server
./modules/docker
(import ./modules/restic-server-client {
inherit self username; time = "21:30";
inherit inputs username; time = "21:30";
})
];
heimdall = mkComputer
(mkVM
{ hostname = "heimdall"; ip = "10.7.89.121"; inherit self; })
{ hostname = "heimdall"; ip = "10.7.89.121"; inherit inputs; })
./home-manager/headless.nix
[
./modules/docker
(import ./modules/restic-server-client {
inherit self username; time = "22:00";
inherit inputs; time = "22:00";
})
];
grav = mkComputer
(mkVM
{ hostname = "grav"; ip = "10.7.89.102"; inherit self; })
{ hostname = "grav"; ip = "10.7.89.102"; inherit inputs; })
./home-manager/headless.nix
[
./modules/docker
(import ./modules/restic-server-client {
inherit self username; time = "22:30";
inherit inputs; time = "22:30";
})
];
ttrss = mkComputer
(mkVM
{ hostname = "ttrss"; ip = "10.7.89.115"; inherit self; })
{ hostname = "ttrss"; ip = "10.7.89.115"; inherit inputs; })
./home-manager/headless.nix
[
./modules/docker
(import ./modules/restic-server-client {
inherit self username; time = "23:00";
inherit inputs; time = "23:00";
})
];
rss-bridge = mkComputer
(mkVM
{ hostname = "rss-bridge"; ip = "10.7.89.111"; inherit self; })
{ hostname = "rss-bridge"; ip = "10.7.89.111"; inherit inputs; })
./home-manager/headless.nix
[
./modules/docker
(import ./modules/restic-server-client {
inherit self username; time = "23:30";
inherit inputs; time = "23:30";
})
];
git = mkComputer
(mkVM
{ hostname = "git"; ip = "10.7.89.109"; inherit self; })
{ hostname = "git"; ip = "10.7.89.109"; inherit inputs; })
./home-manager/headless.nix
[
./modules/docker
(import ./modules/restic-server-client {
inherit self username; time = "03:00";
inherit inputs; time = "03:00";
})
];
plex = mkComputer
(mkVM
{ hostname = "plex"; ip = "10.7.89.112"; inherit self; })
{ hostname = "plex"; ip = "10.7.89.112"; inherit inputs; })
./home-manager/headless.nix
[
./modules/docker
./modules/media-share
./modules/plex
(import ./modules/restic-server-client {
inherit self username; time = "03:30";
inherit inputs; time = "03:30";
})
];
nextcloud = mkComputer
(mkVM
{ hostname = "nextcloud"; ip = "10.7.89.103"; inherit self; })
{ hostname = "nextcloud"; ip = "10.7.89.103"; inherit inputs; })
./home-manager/headless.nix
[
./modules/docker
(import ./modules/restic-server-client {
inherit self username; time = "04:00";
inherit inputs; time = "04:00";
})
];
mail = mkComputer
(mkVM
{ hostname = "mail"; ip = "10.7.89.123"; inherit self; })
{ hostname = "mail"; ip = "10.7.89.123"; inherit inputs; })
./home-manager/headless.nix
[
./modules/docker
(import ./modules/restic-server-client {
inherit self username; time = "04:30";
inherit inputs; time = "04:30";
})
];
pihole = mkComputer
(mkVM
{ hostname = "pihole"; ip = "10.7.89.2"; inherit self; })
{ hostname = "pihole"; ip = "10.7.89.2"; inherit inputs; })
./home-manager/headless.nix
[
./modules/docker
./modules/pihole
(import ./modules/restic-server-client {
inherit self username; time = "05:00";
inherit inputs; time = "05:00";
})
./modules/unbound
];
restic-server = mkComputer
(mkVM
{ hostname = "restic-server"; ip = "10.7.89.30"; inherit self; })
{ hostname = "restic-server"; ip = "10.7.89.30"; inherit inputs; })
./home-manager/headless.nix
[
./modules/restic-server
];
};
homeConfigurations = {
"${username}@co-ws-con4" = home-manager.lib.homeManagerConfiguration {
"${custom.username}@co-ws-con4" = home-manager.lib.homeManagerConfiguration {
configuration = import ./home-manager/work-wsl.nix;
inherit system username;
homeDirectory = "/home/${username}";
inherit inputs;
homeDirectory = "/home/${custom.username}";
extraSpecialArgs = {
inherit self system username;
inherit inputs;
};
};
};

6
home-manager/common/default.nix
View File

@ -1,8 +1,8 @@
{ username, ... }:
{ inputs, ... }:
{
# Home Manager needs a bit of information about you and the
# paths it should manage.
home.username = username;
home.homeDirectory = "/home/${username}";
home.username = inputs.custom.username;
home.homeDirectory = "/home/${inputs.custom.username}";
programs.home-manager.enable = true;
}

4
home-manager/desktop.nix
View File

@ -1,7 +1,7 @@
{ pkgs, username, ... }:
{ inputs, pkgs, ... }:
{
imports = [
(import ./common { inherit username; })
(import ./common { inherit inputs; })
./software/work-desktop
./software/autorandr
./software/calibre

4
home-manager/headless.nix
View File

@ -1,7 +1,7 @@
{ pkgs, username, ... }:
{ inputs, pkgs, ... }:
{
imports = [
(import ./common { inherit username; })
(import ./common { inherit inputs; })
./software/git
./software/vim
];

2
home-manager/software/vagrant-wsl/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, username, ... }:
{ pkgs, ... }:
{
home.packages = with pkgs; [
vagrant

4
home-manager/work-wsl.nix
View File

@ -1,4 +1,4 @@
{ self, pkgs, username, ... }:
{ inputs, pkgs, ... }:
{
imports = [
./common
@ -14,7 +14,7 @@
enable = true;
bashrcExtra = ''
. ~/.nixos/home-manager/configs/bash/work_wsl_bashrc
. /home/${username}/.nix-profile/etc/profile.d/nix.sh
. /home/${inputs.custom.username}/.nix-profile/etc/profile.d/nix.sh
'';
};
}

6
modules/code-server/default.nix
View File

@ -1,8 +1,8 @@
{ pkgs, username, ... }:
{ inputs, pkgs, ... }:
{
services.code-server = {
enable = true;
user = username;
user = inputs.custom.username;
host = "0.0.0.0";
auth = "none";
extraPackages = with pkgs;
@ -14,7 +14,7 @@
git
];
extraEnvironment = {
HOME = "/home/${username}";
HOME = "/home/${inputs.custom.username}";
};
};
networking.firewall.allowedTCPPorts = [ 4444 ];

19
modules/common/default.nix
View File

@ -1,7 +1,7 @@
{ self, nixpkgs, pkgs, username, ... }:
{ inputs, pkgs, ... }:
{
imports = [
"${self}/modules/cli"
"${inputs.self}/modules/cli"
];
# Use the systemd-boot EFI boot loader.
@ -49,7 +49,7 @@
# Disable the root user
users.users.root.hashedPassword = "!";
# Define a user account. Don't forget to set a password with ‘passwd’.
users.users.${username} = {
users.users.${inputs.custom.username} = {
isNormalUser = true;
initialPassword = "password";
extraGroups = [
@ -67,13 +67,10 @@
nixpkgs.config.allowUnfree = true;
nix = {
nixPath = [ "nixpkgs=${nixpkgs}" ];
registry.nixpkgs = {
from = {
id = "nixpkgs";
type = "indirect";
};
flake = nixpkgs;
nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
registry = {
nixpkgs.flake = inputs.nixpkgs;
nix-config.flake = inputs.self;
};
autoOptimiseStore = true;
@ -121,7 +118,7 @@
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = import "${self}/version.nix";
system.stateVersion = import "${inputs.self}/version.nix";
}

4
modules/desktop/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, username, ... }:
{ inputs, pkgs, ... }:
{
networking = {
networkmanager.enable = true;
@ -59,7 +59,7 @@
terminator
];
environment.shellAliases = {
management-server = "mosh ${username}@10.7.89.150 tmux a";
management-server = "mosh ${inputs.custom.username}@10.7.89.150 tmux a";
};
}

4
modules/docker/default.nix
View File

@ -1,11 +1,11 @@
{ pkgs, username, ... }:
{ inputs, pkgs, ... }:
{
virtualisation.docker =
{
enable = true;
autoPrune.enable = true;
};
users.users.${username}.extraGroups = [ "docker" ];
users.users.${inputs.custom.username}.extraGroups = [ "docker" ];
environment.systemPackages = with pkgs; [
docker-compose
lazydocker

4
modules/droidcam/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, username, ... }:
{ inputs, pkgs, ... }:
{
programs.droidcam.enable = true;
# required for USB connection
@ -6,7 +6,7 @@
environment.shellAliases = {
webcam = "droidcam-cli -size=1920x1080 ios 4747";
};
home-manager.users.${username} = {
home-manager.users.${inputs.custom.username} = {
xdg.desktopEntries = {
droidcam = {
name = "Droidcam";

4
modules/eog/default.nix
View File

@ -1,10 +1,10 @@
{ pkgs, username, ... }:
{ inputs, pkgs, ... }:
{
environment.systemPackages = with pkgs; [
gnome.eog
];
home-manager.users.${username} = {
home-manager.users.${inputs.custom.username} = {
xdg.mimeApps = {
enable = true;
associations.added = {

4
modules/espanso/default.nix
View File

@ -1,7 +1,7 @@
{ pkgs, username, ... }:
{ inputs, pkgs, ... }:
{
services.espanso.enable = true;
home-manager.users.${username} = {
home-manager.users.${inputs.custom.username} = {
xdg.configFile.espanso = {
target = "espanso/default.yml";
onChange = "systemctl --user restart espanso";

4
modules/nix-direnv/default.nix
View File

@ -1,11 +1,11 @@
{ pkgs, username, ... }:
{ inputs, pkgs, ... }:
{
nix.extraOptions = ''
keep-outputs = true
keep-derivations = true
'';
home-manager.users.${username} = {
home-manager.users.${inputs.custom.username} = {
programs.direnv.enable = true;
programs.direnv.nix-direnv.enable = true;
programs.direnv.nix-direnv.enableFlakes = true;

10
modules/restic-server-client/default.nix
View File

@ -1,13 +1,13 @@
{ self, time, username, ... }:
{ inputs, time, ... }:
{
services.restic.backups.${username} = {
services.restic.backups.${inputs.custom.username} = {
user = "root";
repository = "rest:http://10.7.89.30:8000";
timerConfig.OnCalendar = time;
passwordFile = "/home/${username}/.nixos/secrets/passwords/restic.key";
paths = [ "/home/${username}/" ];
passwordFile = "/home/${inputs.custom.username}/.nixos/secrets/passwords/restic.key";
paths = [ "/home/${inputs.custom.username}/" ];
extraBackupArgs = [
"--exclude-file=${self}/modules/restic/excludes.txt"
"--exclude-file=${inputs.self}/modules/restic/excludes.txt"
];
pruneOpts = [
"--keep-hourly 24"

2
modules/restic-server/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, username, ... }:
{ inputs, pkgs, ... }:
let
repository = "/mnt/restic-server";
in

10
modules/restic/default.nix
View File

@ -1,20 +1,20 @@
{ self, pkgs, username, ... }:
{ inputs, pkgs, ... }:
{
environment.systemPackages = with pkgs; [
restic
];
services.restic.backups.${username} = {
services.restic.backups.${inputs.custom.username} = {
user = username;
repository = "rest:http://10.7.89.30:8000";
timerConfig = {
OnCalendar = "hourly";
RandomizedDelaySec = "15min";
};
passwordFile = "/home/${username}/.nixos/secrets/passwords/restic.key";
paths = [ "/home/${username}/" ];
passwordFile = "/home/${inputs.custom.username}/.nixos/secrets/passwords/restic.key";
paths = [ "/home/${inputs.custom.username}/" ];
extraBackupArgs = [
"--exclude-file=${self}/modules/restic/excludes.txt"
"--exclude-file=${inputs.self}/modules/restic/excludes.txt"
];
};
}

4
modules/steam/default.nix
View File

@ -1,4 +1,4 @@
{ username, ... }:
{ inputs, ... }:
{
programs.steam.enable = true;
hardware.steam-hardware.enable = true;
@ -6,7 +6,7 @@
allowedTCPPorts = [ 27036 ];
allowedUDPPorts = [ 27031 ];
};
home-manager.users.${username} = {
home-manager.users.${inputs.custom.username} = {
home.file.".local/share/applications/steam.desktop".source = ./steam.desktop;
};
}

6
systems/proxmox-vm/default.nix
View File

@ -1,8 +1,8 @@
{ self, hostname, ip, ... }:
{ inputs, hostname, ip, ... }:
{
imports = [
(import "${self}/modules/mk-network" { inherit hostname ip; })
(import "${self}/systems/minimal")
(import "${inputs.self}/modules/mk-network" { inherit hostname ip; })
(import "${inputs.self}/systems/minimal")
];
boot.initrd.availableKernelModules = [
"ata_piix"