Compare commits
No commits in common. "ba4ffd6bf1e82476ddcf98c4d08b9b94907a16b6" and "93343473aab0dd09a31f2801837b74c2bb90598a" have entirely different histories.
ba4ffd6bf1
...
93343473aa
6 changed files with 27 additions and 109 deletions
|
@ -18,11 +18,6 @@ in rec {
|
||||||
inherit stateVersion;
|
inherit stateVersion;
|
||||||
hostname = "mrmeeseeks";
|
hostname = "mrmeeseeks";
|
||||||
username = "ephase";
|
username = "ephase";
|
||||||
hostConfig = {
|
|
||||||
gaming = true;
|
|
||||||
desktop = true;
|
|
||||||
laptop = false;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
modules = [
|
modules = [
|
||||||
./nixos/default.nix
|
./nixos/default.nix
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ pkgs, hostConfig, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
emojione
|
emojione
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
{ hostConfig, ... }:
|
{ ... }:
|
||||||
let
|
{
|
||||||
cfg = hostConfig;
|
|
||||||
in {
|
|
||||||
imports = [
|
imports = [
|
||||||
./sway.nix
|
./sway.nix
|
||||||
./mako.nix
|
./mako.nix
|
||||||
|
@ -9,9 +7,5 @@ in {
|
||||||
./swaylock.nix
|
./swaylock.nix
|
||||||
./swayidle.nix
|
./swayidle.nix
|
||||||
./fuzzel.nix
|
./fuzzel.nix
|
||||||
] ++ (
|
];
|
||||||
if hostConfig.laptop then
|
|
||||||
[ ./kanshi.nix ]
|
|
||||||
else []
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,46 +0,0 @@
|
||||||
_: {
|
|
||||||
service.kanshi = {
|
|
||||||
enable = true;
|
|
||||||
profiles = {
|
|
||||||
home = {
|
|
||||||
outputs = [
|
|
||||||
{
|
|
||||||
criteria = "Iiyama North America PL2792UH 1166310803122";
|
|
||||||
mode = "3840x2160";
|
|
||||||
position = "0,0";
|
|
||||||
scale = 2;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
criteria = "Iiyama North America PL2792UH 1176923201598";
|
|
||||||
mode = "3840x2160";
|
|
||||||
position = "1920,0";
|
|
||||||
transform = "270";
|
|
||||||
scale = "2";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
criteria = "eDP-1";
|
|
||||||
status = "disable";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
work = {
|
|
||||||
outputs = [
|
|
||||||
{
|
|
||||||
criteria = "Iiyama North America PL2480H 11183M2807013";
|
|
||||||
mode = "1920x1080";
|
|
||||||
position = "0,0";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
criteria = "Iiyama North America PL2480H 11183M2807016";
|
|
||||||
mode = "1920x1080";
|
|
||||||
position = "1920,0";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
criteria = "eDP-1";
|
|
||||||
status = "disable";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,4 +1,5 @@
|
||||||
{ config, pkgs, lib, stateVersion, hostname, username, hostConfig, ... }:
|
{ config, pkgs, lib, stateVersion, hostname, username, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
[ # Include the results of the hardware scan.
|
[ # Include the results of the hardware scan.
|
||||||
|
@ -11,28 +12,11 @@
|
||||||
./includes/system/lvm.nix
|
./includes/system/lvm.nix
|
||||||
./includes/system/doas.nix
|
./includes/system/doas.nix
|
||||||
./includes/system/neovim.nix
|
./includes/system/neovim.nix
|
||||||
] ++ (
|
|
||||||
if hostConfig.desktop then
|
|
||||||
[
|
|
||||||
./includes/desktop/swaylock.nix
|
./includes/desktop/swaylock.nix
|
||||||
./includes/desktop/pipewire.nix
|
./includes/desktop/pipewire.nix
|
||||||
./includes/desktop/xdg-portal.nix
|
./includes/desktop/xdg-portal.nix
|
||||||
]
|
|
||||||
else []
|
|
||||||
) ++ (
|
|
||||||
if hostConfig.gaming then
|
|
||||||
[
|
|
||||||
./includes/gaming/steam.nix
|
./includes/gaming/steam.nix
|
||||||
]
|
];
|
||||||
else []
|
|
||||||
) ++ (
|
|
||||||
if hostConfig.laptop then
|
|
||||||
[
|
|
||||||
./includes/hardware/iwd.nix
|
|
||||||
]
|
|
||||||
else []
|
|
||||||
);
|
|
||||||
|
|
||||||
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
|
@ -57,9 +41,6 @@
|
||||||
home-manager = {
|
home-manager = {
|
||||||
useGlobalPkgs = true;
|
useGlobalPkgs = true;
|
||||||
useUserPackages = true;
|
useUserPackages = true;
|
||||||
extraSpecialArgs = {
|
|
||||||
inherit hostConfig;
|
|
||||||
};
|
|
||||||
users.${username} = {
|
users.${username} = {
|
||||||
home.stateVersion = stateVersion;
|
home.stateVersion = stateVersion;
|
||||||
programs.home-manager.enable = true;
|
programs.home-manager.enable = true;
|
||||||
|
@ -69,12 +50,9 @@
|
||||||
../modules/home/cli
|
../modules/home/cli
|
||||||
../modules/home/firefox
|
../modules/home/firefox
|
||||||
../modules/home/foot.nix
|
../modules/home/foot.nix
|
||||||
|
../modules/home/lutris.nix
|
||||||
../modules/home/zathura.nix
|
../modules/home/zathura.nix
|
||||||
] ++ (
|
];
|
||||||
if hostConfig.gaming then
|
|
||||||
[ ../modules/home/lutris.nix ]
|
|
||||||
else []
|
|
||||||
);
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
{
|
|
||||||
networking.wireless.iwd.enable = true;
|
|
||||||
}
|
|
Loading…
Add table
Add a link
Reference in a new issue