Remove the last references to custom
This commit is contained in:
parent
a14178fe84
commit
abc28dcee9
|
|
@ -1,3 +0,0 @@
|
|||
{ inputs }: {
|
||||
inputs = inputs;
|
||||
}
|
||||
39
flake.nix
39
flake.nix
|
|
@ -28,9 +28,8 @@
|
|||
, home-manager
|
||||
}:
|
||||
let
|
||||
custom = import ./custom { inherit inputs; };
|
||||
mkComputer = import "${custom.inputs.self}/lib/mk_computer.nix";
|
||||
mkRaspi = import "${custom.inputs.self}/lib/mk_raspi.nix";
|
||||
mkComputer = import "${inputs.self}/lib/mk_computer.nix";
|
||||
mkRaspi = import "${inputs.self}/lib/mk_raspi.nix";
|
||||
mksdImage = host: (self.nixosConfigurations.${host}.extendModules {
|
||||
modules = [ "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" ];
|
||||
}).config.system.build.sdImage;
|
||||
|
|
@ -53,79 +52,79 @@
|
|||
gwyn = mkComputer {
|
||||
hostname = "gwyn";
|
||||
home-module = "desktop";
|
||||
inherit custom inputs;
|
||||
inherit inputs;
|
||||
};
|
||||
desktop-vm = mkComputer {
|
||||
hostname = "desktop-vm";
|
||||
home-module = "desktop";
|
||||
inherit custom inputs;
|
||||
inherit inputs;
|
||||
};
|
||||
staubfinger = mkComputer {
|
||||
hostname = "staubfinger";
|
||||
home-module = "desktop";
|
||||
inherit custom inputs;
|
||||
inherit inputs;
|
||||
};
|
||||
# Servers
|
||||
git = mkRaspi {
|
||||
hostname = "git";
|
||||
inherit custom inputs;
|
||||
inherit inputs;
|
||||
};
|
||||
loki-test = mkRaspi {
|
||||
hostname = "loki-test";
|
||||
inherit custom inputs;
|
||||
inherit inputs;
|
||||
};
|
||||
mail = mkRaspi {
|
||||
hostname = "mail";
|
||||
inherit custom inputs;
|
||||
inherit inputs;
|
||||
};
|
||||
nextcloud = mkRaspi {
|
||||
hostname = "nextcloud";
|
||||
inherit custom inputs;
|
||||
inherit inputs;
|
||||
};
|
||||
plex = mkRaspi {
|
||||
hostname = "plex";
|
||||
inherit custom inputs;
|
||||
inherit inputs;
|
||||
};
|
||||
proxy = mkRaspi {
|
||||
hostname = "proxy";
|
||||
inherit custom inputs;
|
||||
inherit inputs;
|
||||
};
|
||||
management = mkRaspi {
|
||||
hostname = "management";
|
||||
home-module = "management";
|
||||
inherit custom inputs;
|
||||
inherit inputs;
|
||||
};
|
||||
mobile = mkRaspi {
|
||||
hostname = "mobile";
|
||||
home-module = "management";
|
||||
inherit custom inputs;
|
||||
inherit inputs;
|
||||
};
|
||||
restic-server = mkRaspi {
|
||||
hostname = "restic-server";
|
||||
inherit custom inputs;
|
||||
inherit inputs;
|
||||
};
|
||||
test-raspi = mkRaspi {
|
||||
hostname = "test-raspi";
|
||||
inherit custom inputs;
|
||||
inherit inputs;
|
||||
};
|
||||
ttrss = mkRaspi {
|
||||
hostname = "ttrss";
|
||||
inherit custom inputs;
|
||||
inherit inputs;
|
||||
};
|
||||
};
|
||||
homeConfigurations = {
|
||||
"zweili@co-ws-con4" = home-manager.lib.homeManagerConfiguration {
|
||||
pkgs = import custom.inputs.nixpkgs {
|
||||
pkgs = import inputs.nixpkgs {
|
||||
system = "x86_64-linux";
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
};
|
||||
};
|
||||
modules = [
|
||||
"${custom.inputs.self}/home-manager/work-wsl.nix"
|
||||
"${inputs.self}/home-manager/work-wsl.nix"
|
||||
];
|
||||
extraSpecialArgs = {
|
||||
inherit custom inputs;
|
||||
inherit inputs;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,34 +1,34 @@
|
|||
{ custom, system }: { config, nixosConfig, pkgs, ... }:
|
||||
{ config, inputs, nixosConfig, pkgs, system, ... }:
|
||||
let
|
||||
unstable = import custom.inputs.nixpkgs-unstable { inherit system; };
|
||||
unstable = import inputs.nixpkgs-unstable { inherit system; };
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
"${custom.inputs.self}/home-manager/common"
|
||||
"${custom.inputs.self}/home-manager/software/alacritty"
|
||||
"${custom.inputs.self}/home-manager/software/ansible"
|
||||
"${custom.inputs.self}/home-manager/software/calibre"
|
||||
"${custom.inputs.self}/home-manager/software/czkawka"
|
||||
(import "${custom.inputs.self}/home-manager/software/emacs" { inherit unstable; })
|
||||
"${custom.inputs.self}/home-manager/software/espanso"
|
||||
"${custom.inputs.self}/home-manager/software/dunst"
|
||||
"${custom.inputs.self}/home-manager/software/evince"
|
||||
"${custom.inputs.self}/home-manager/software/fzf"
|
||||
"${custom.inputs.self}/home-manager/software/git"
|
||||
"${custom.inputs.self}/home-manager/software/grobi"
|
||||
"${custom.inputs.self}/home-manager/software/keeweb"
|
||||
"${custom.inputs.self}/home-manager/software/mime-apps"
|
||||
"${custom.inputs.self}/home-manager/software/mpv"
|
||||
"${custom.inputs.self}/home-manager/software/nitrogen"
|
||||
"${custom.inputs.self}/home-manager/software/obsidian"
|
||||
(import "${custom.inputs.self}/home-manager/software/rapid-photo-downloader" { inherit unstable; })
|
||||
"${custom.inputs.self}/home-manager/software/signal"
|
||||
"${custom.inputs.self}/home-manager/software/ssh"
|
||||
"${custom.inputs.self}/home-manager/software/starship"
|
||||
"${custom.inputs.self}/home-manager/software/telegram"
|
||||
"${custom.inputs.self}/home-manager/software/vim"
|
||||
"${custom.inputs.self}/home-manager/software/work-desktop"
|
||||
"${custom.inputs.self}/home-manager/software/yt-dlp"
|
||||
"${inputs.self}/home-manager/common"
|
||||
"${inputs.self}/home-manager/software/alacritty"
|
||||
"${inputs.self}/home-manager/software/ansible"
|
||||
"${inputs.self}/home-manager/software/calibre"
|
||||
"${inputs.self}/home-manager/software/czkawka"
|
||||
(import "${inputs.self}/home-manager/software/emacs" { inherit unstable; })
|
||||
"${inputs.self}/home-manager/software/espanso"
|
||||
"${inputs.self}/home-manager/software/dunst"
|
||||
"${inputs.self}/home-manager/software/evince"
|
||||
"${inputs.self}/home-manager/software/fzf"
|
||||
"${inputs.self}/home-manager/software/git"
|
||||
"${inputs.self}/home-manager/software/grobi"
|
||||
"${inputs.self}/home-manager/software/keeweb"
|
||||
"${inputs.self}/home-manager/software/mime-apps"
|
||||
"${inputs.self}/home-manager/software/mpv"
|
||||
"${inputs.self}/home-manager/software/nitrogen"
|
||||
"${inputs.self}/home-manager/software/obsidian"
|
||||
(import "${inputs.self}/home-manager/software/rapid-photo-downloader" { inherit unstable; })
|
||||
"${inputs.self}/home-manager/software/signal"
|
||||
"${inputs.self}/home-manager/software/ssh"
|
||||
"${inputs.self}/home-manager/software/starship"
|
||||
"${inputs.self}/home-manager/software/telegram"
|
||||
"${inputs.self}/home-manager/software/vim"
|
||||
"${inputs.self}/home-manager/software/work-desktop"
|
||||
"${inputs.self}/home-manager/software/yt-dlp"
|
||||
];
|
||||
home = {
|
||||
username = nixosConfig.az-username;
|
||||
|
|
@ -53,9 +53,9 @@ in
|
|||
programs.git.userEmail = "andreas@zweili.ch";
|
||||
|
||||
# raw config files
|
||||
home.file.".config/qtile/config.py".source = "${custom.inputs.self}/home-manager/configs/qtile/config.py";
|
||||
home.file.".config/qtile/autostart.sh".source = "${custom.inputs.self}/home-manager/configs/qtile/autostart.sh";
|
||||
home.file.".config/qtile/autostart.d/xdg-portal-add-path.sh".source = "${custom.inputs.self}/home-manager/configs/flatpak/xdg-portal-add-path.sh";
|
||||
home.file.".config/qtile/config.py".source = "${inputs.self}/home-manager/configs/qtile/config.py";
|
||||
home.file.".config/qtile/autostart.sh".source = "${inputs.self}/home-manager/configs/qtile/autostart.sh";
|
||||
home.file.".config/qtile/autostart.d/xdg-portal-add-path.sh".source = "${inputs.self}/home-manager/configs/flatpak/xdg-portal-add-path.sh";
|
||||
|
||||
programs.bash = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ custom, system }: { config, nixosConfig, ... }:
|
||||
{ inputs, nixosConfig, ... }:
|
||||
{
|
||||
imports = [
|
||||
"${custom.inputs.self}/home-manager/common"
|
||||
"${custom.inputs.self}/home-manager/software/fzf"
|
||||
"${custom.inputs.self}/home-manager/software/git"
|
||||
"${custom.inputs.self}/home-manager/software/vim"
|
||||
"${custom.inputs.self}/home-manager/software/starship"
|
||||
"${inputs.self}/home-manager/common"
|
||||
"${inputs.self}/home-manager/software/fzf"
|
||||
"${inputs.self}/home-manager/software/git"
|
||||
"${inputs.self}/home-manager/software/vim"
|
||||
"${inputs.self}/home-manager/software/starship"
|
||||
];
|
||||
|
||||
home.username = nixosConfig.az-username;
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
{ custom, system }: { config, nixosConfig, pkgs, ... }:
|
||||
{ inputs, nixosConfig, pkgs, system, ... }:
|
||||
let
|
||||
unstable = import custom.inputs.nixpkgs-unstable { inherit system; };
|
||||
unstable = import inputs.nixpkgs-unstable { inherit system; };
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
"${custom.inputs.self}/home-manager/common"
|
||||
(import "${custom.inputs.self}/home-manager/software/emacs" { inherit unstable; })
|
||||
"${custom.inputs.self}/home-manager/software/fzf"
|
||||
"${custom.inputs.self}/home-manager/software/git"
|
||||
"${custom.inputs.self}/home-manager/software/ssh"
|
||||
"${custom.inputs.self}/home-manager/software/starship"
|
||||
"${custom.inputs.self}/home-manager/software/vim"
|
||||
"${inputs.self}/home-manager/common"
|
||||
(import "${inputs.self}/home-manager/software/emacs" { inherit unstable; })
|
||||
"${inputs.self}/home-manager/software/fzf"
|
||||
"${inputs.self}/home-manager/software/git"
|
||||
"${inputs.self}/home-manager/software/ssh"
|
||||
"${inputs.self}/home-manager/software/starship"
|
||||
"${inputs.self}/home-manager/software/vim"
|
||||
];
|
||||
|
||||
home.username = nixosConfig.az-username;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ custom, inputs }: { config, nixosConfig, ... }:
|
||||
{ inputs, nixosConfig, ... }:
|
||||
{
|
||||
imports = [
|
||||
"${custom.inputs.self}/home-manager/common"
|
||||
"${custom.inputs.self}/home-manager/software/git"
|
||||
"${inputs.self}/home-manager/common"
|
||||
"${inputs.self}/home-manager/software/git"
|
||||
];
|
||||
|
||||
home.username = nixosConfig.az-username;
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
{ custom, pkgs, ... }:
|
||||
{ inputs, pkgs, ... }:
|
||||
let
|
||||
unstable = import custom.inputs.nixpkgs-unstable { system = "x86_64-linux"; };
|
||||
unstable = import inputs.nixpkgs-unstable { system = "x86_64-linux"; };
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
"${custom.inputs.self}/home-manager/common"
|
||||
"${custom.inputs.self}/home-manager/software/ansible"
|
||||
(import "${custom.inputs.self}/home-manager/software/emacs" { inherit unstable; })
|
||||
"${custom.inputs.self}/home-manager/software/fzf"
|
||||
"${custom.inputs.self}/home-manager/software/git"
|
||||
"${custom.inputs.self}/home-manager/software/starship"
|
||||
(import "${custom.inputs.self}/home-manager/software/vagrant-wsl" { inherit unstable; })
|
||||
"${custom.inputs.self}/home-manager/software/vim"
|
||||
"${inputs.self}/home-manager/common"
|
||||
"${inputs.self}/home-manager/software/ansible"
|
||||
(import "${inputs.self}/home-manager/software/emacs" { inherit unstable; })
|
||||
"${inputs.self}/home-manager/software/fzf"
|
||||
"${inputs.self}/home-manager/software/git"
|
||||
"${inputs.self}/home-manager/software/starship"
|
||||
(import "${inputs.self}/home-manager/software/vagrant-wsl" { inherit unstable; })
|
||||
"${inputs.self}/home-manager/software/vim"
|
||||
];
|
||||
|
||||
programs.git.userEmail = "zweili@contria.com";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ custom, hostname, inputs, system ? "x86_64-linux", home-module ? "headless", username ? "andreas" }:
|
||||
{ hostname, inputs, system ? "x86_64-linux", home-module ? "headless", username ? "andreas" }:
|
||||
let
|
||||
overlay-unstable = final: prev: {
|
||||
unstable = import inputs.nixpkgs-unstable {
|
||||
|
|
@ -52,8 +52,9 @@ inputs.nixpkgs.lib.nixosSystem
|
|||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = { inherit inputs system; };
|
||||
home-manager.users.andreas.imports = [
|
||||
(import "${inputs.self}/home-manager/${home-module}.nix" { inherit custom system; })
|
||||
"${inputs.self}/home-manager/${home-module}.nix"
|
||||
];
|
||||
}
|
||||
]);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ custom, hostname, inputs, system ? "aarch64-linux", home-module ? "headless", username ? "andreas" }:
|
||||
{ hostname, inputs, system ? "aarch64-linux", home-module ? "headless", username ? "andreas" }:
|
||||
let
|
||||
overlay-unstable = final: prev: {
|
||||
unstable = import inputs.nixpkgs-unstable {
|
||||
|
|
@ -47,8 +47,9 @@ inputs.nixpkgs.lib.nixosSystem {
|
|||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = { inherit inputs system; };
|
||||
home-manager.users.${username}.imports = [
|
||||
(import "${inputs.self}/home-manager/${home-module}.nix" { inherit custom system; })
|
||||
"${inputs.self}/home-manager/${home-module}.nix"
|
||||
];
|
||||
}
|
||||
]);
|
||||
|
|
|
|||
Loading…
Reference in New Issue