add tdesktop to home; change private config format
This commit is contained in:
parent
51f5b422ec
commit
c40456f06e
|
@ -11,9 +11,11 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs@{ self, nixpkgs, home-manager, nur }:
|
outputs = { self, nixpkgs, home-manager, nur }:
|
||||||
let
|
let
|
||||||
priv = import ./private.nix inputs;
|
# IRL-related private config
|
||||||
|
priv = if builtins.pathExists ./private.nix then (import ./private.nix) else {};
|
||||||
|
getPriv = (hostname: with builtins; if hasAttr hostname priv then (getAttr hostname priv) else {});
|
||||||
in {
|
in {
|
||||||
homeConfigurations = {
|
homeConfigurations = {
|
||||||
"user@nixmsi" = home-manager.lib.homeManagerConfiguration {
|
"user@nixmsi" = home-manager.lib.homeManagerConfiguration {
|
||||||
|
@ -21,8 +23,7 @@
|
||||||
modules = [
|
modules = [
|
||||||
nur.nixosModules.nur
|
nur.nixosModules.nur
|
||||||
./hosts/nixmsi.nix
|
./hosts/nixmsi.nix
|
||||||
# IRL-related private config
|
(getPriv "nixmsi")
|
||||||
priv.nixmsi
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
protontricks proton-caller
|
protontricks proton-caller
|
||||||
bottles
|
bottles
|
||||||
gimp krita blender
|
gimp krita blender
|
||||||
|
tdesktop
|
||||||
# waiting until the PR gets merged
|
# waiting until the PR gets merged
|
||||||
(looking-glass-client.overrideAttrs (old: {
|
(looking-glass-client.overrideAttrs (old: {
|
||||||
version = "B6";
|
version = "B6";
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
{ ... }:
|
|
||||||
{
|
|
||||||
nixmsi = {
|
|
||||||
# insert config here
|
|
||||||
};
|
|
||||||
}
|
|
5
home/private.nix.sample
Normal file
5
home/private.nix.sample
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
nixmsi = { pkgs, ... }: {
|
||||||
|
# insert private config here
|
||||||
|
};
|
||||||
|
}
|
|
@ -11,7 +11,8 @@
|
||||||
let
|
let
|
||||||
hw = nixos-hardware.nixosModules;
|
hw = nixos-hardware.nixosModules;
|
||||||
# IRL-related stuff I'd rather not put into git
|
# IRL-related stuff I'd rather not put into git
|
||||||
priv = import ./private.nix inputs;
|
priv = if builtins.fileExists ./private.nix then (import ./private.nix inputs) else {};
|
||||||
|
getPriv = (hostname: with builtins; if hasAttr hostname priv then getAttr hostname priv else {});
|
||||||
in utils.lib.mkFlake {
|
in utils.lib.mkFlake {
|
||||||
inherit self inputs;
|
inherit self inputs;
|
||||||
hostDefaults.modules = [
|
hostDefaults.modules = [
|
||||||
|
@ -29,13 +30,13 @@
|
||||||
nixmsi = {
|
nixmsi = {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
modules = [
|
modules = [
|
||||||
priv.nixmsi
|
|
||||||
./hosts/nixmsi.nix
|
./hosts/nixmsi.nix
|
||||||
hw.common-pc-ssd # enables fstrim
|
hw.common-pc-ssd # enables fstrim
|
||||||
hw.common-cpu-amd # microcode
|
hw.common-cpu-amd # microcode
|
||||||
hw.common-cpu-amd-pstate # amd-pstate
|
hw.common-cpu-amd-pstate # amd-pstate
|
||||||
hw.common-gpu-amd # configures drivers
|
hw.common-gpu-amd # configures drivers
|
||||||
hw.common-pc-laptop # enables tlp
|
hw.common-pc-laptop # enables tlp
|
||||||
|
(getPriv "nixmsi")
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
{ ... }:
|
|
||||||
{
|
|
||||||
nixmsi = {
|
|
||||||
# insert config here
|
|
||||||
};
|
|
||||||
}
|
|
5
system/private.nix.sample
Normal file
5
system/private.nix.sample
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
nixmsi = { ... }: {
|
||||||
|
# insert private config here
|
||||||
|
};
|
||||||
|
}
|
Loading…
Reference in a new issue