Compare commits

..

No commits in common. "03f0fbfc824f6c9955e96e152fd2649ec079a3fc" and "77822ebe332eb12377f8ed93f87522270074403d" have entirely different histories.

29 changed files with 99 additions and 183 deletions

View file

@ -9,38 +9,53 @@ in {
users.root
users.chaos
presets.home-manager.root-base
(with tree.presets.nixos; [
desktopGui
desktopGnome
laptop
gaming
encryptedUSB
])
(with tree.profiles.nixos; [
cross.arm64
remoteBuilders
])
(with presets.home-manager.by-user; [
root.base
chaos.base
chaos.guiDevDesktop
chaos.gaming
gaming.steam
])
./secrets.nix
./hardware.nix
]);
networking.firewall = {
enable = true;
allowPing = true;
home-manager.users.root.home.stateVersion = "24.05";
home-manager.users.chaos = {
imports = with tree.profiles.home-manager; [
base
dev.all
reversing
homeFolders
musicLibrary
programming.editors.nano
programming.editors.vscode
programming.languages.rust
programming.languages.nix
gaming.platforms.steam
gaming.platforms.lutris
];
home.stateVersion = "24.05";
};
networking.firewall.enable = true;
networking.firewall.allowPing = true;
networking.firewall.allowedTCPPorts = [8088];
networking.hostName = "lappy-t495";
time.timeZone = "Europe/London";
system.stateVersion = "24.05";
home-manager.users.root.home.stateVersion = "24.05";
home-manager.users.chaos.home.stateVersion = "24.05";
}

View file

@ -3,6 +3,7 @@
nixpkgs-unstable,
...
} @ inputs: let
inherit (nixpkgs-unstable.lib) forEach;
mkTree = inputs.tree-input.tree;
metaTree = mkTree ((import ../treeConfig.nix {}) // {inherit inputs;});

View file

@ -1,5 +0,0 @@
{tree, ...}: {
imports = with tree.profiles.home-manager; [
base
];
}

View file

@ -1,7 +0,0 @@
{tree, ...}: {
home-manager.users.chaos = {
imports = with tree.presets.home-manager; [
base
];
};
}

View file

@ -1,7 +0,0 @@
{tree, ...}: {
home-manager.users.chaos = {
imports = with tree.presets.home-manager; [
gaming
];
};
}

View file

@ -1,7 +0,0 @@
{tree, ...}: {
home-manager.users.chaos = {
imports = with tree.presets.home-manager; [
guiDesktop
];
};
}

View file

@ -1,20 +0,0 @@
{
tree,
lib,
...
}: let
inherit (lib.lists) flatten;
in {
home-manager.users.chaos = {
imports = flatten (with tree; [
(with presets.home-manager; [
guiDesktop
devGui
])
(with profiles.home-manager; [
reversing
])
]);
};
}

View file

@ -1,7 +0,0 @@
{tree, ...}: {
home-manager.users.root = {
imports = with tree.presets.home-manager; [
minimalServer
];
};
}

View file

@ -1,9 +0,0 @@
{tree, ...}: {
imports = with tree.profiles.home-manager; [
dev.all
programming.editors.nano
programming.languages.rust
programming.languages.nix
];
}

View file

@ -1,17 +0,0 @@
{
lib,
tree,
...
}: let
inherit (lib.lists) flatten;
in {
imports = flatten (with tree; [
(with presets.home-manager; [
devBase
])
(with profiles.home-manager; [
programming.editors.vscode
])
]);
}

View file

@ -1,6 +0,0 @@
{tree, ...}: {
imports = with tree.profiles.home-manager; [
gaming.steam
gaming.lutris
];
}

View file

@ -1,30 +0,0 @@
{tree, ...}: {
imports = with tree.profiles.home-manager; [
gui.base
gui.environments.gnome
homeFolders
musicLibrary
apps.fileRoller
apps.nautilus
apps.pavucontrol
apps.mpv
apps.firefox
apps.telegram
apps.thunderbird
apps.toot-cli
apps.obsidian
apps.libreoffice
apps.nicotine-plus
apps.musicutil
apps.mullvad
apps.aria2
apps.rclone
apps.restic
];
}

View file

@ -1,7 +0,0 @@
{tree, ...}: {
imports = with tree.profiles.home-manager; [
base.zsh
base.age-encryption
dev.small
];
}

View file

@ -1,6 +1,6 @@
{tree, ...}: {
home-manager.users.root = {
imports = with tree.presets.home-manager; [
imports = with tree.profiles.home-manager; [
base
];
};

View file

@ -0,0 +1,9 @@
{tree, ...}: {
home-manager.users.root = {
imports = with tree.profiles.home-manager; [
base.zsh
base.age-encryption
dev.small
];
};
}

View file

@ -8,7 +8,7 @@
profiles.nixos.base
users.root
presets.home-manager.by-user.root.minimalServer
presets.home-manager.root-minimalServer
modules.nixos.rcloneServe
modules.nixos.rcloneSync

View file

@ -0,0 +1,38 @@
{tree, ...}: {
imports = with tree.profiles.nixos; [
wifiHardware
sound.base
sound.pipewire
gui.base
mullvad
];
home-manager.users.chaos = {
imports = with tree.profiles.home-manager; [
gui.base
apps.fileRoller
apps.nautilus
apps.pavucontrol
apps.mpv
apps.firefox
apps.telegram
apps.thunderbird
apps.toot-cli
apps.obsidian
apps.libreoffice
apps.nicotine-plus
apps.musicutil
apps.mullvad
apps.aria2
apps.rclone
apps.restic
];
};
}

View file

@ -0,0 +1,12 @@
{tree, ...}: {
imports = with tree; [
presets.nixos.desktopBase
profiles.nixos.gui.environments.gnome
];
home-manager.users.chaos = {
imports = with tree; [
profiles.home-manager.gui.environments.gnome
];
};
}

View file

@ -1,25 +0,0 @@
{
lib,
tree,
...
}: let
inherit (lib.lists) flatten;
in {
imports = flatten (with tree; [
(with profiles.nixos; [
gui.base
gui.environments.gnome
sound.base
sound.pipewire
wifiHardware
mullvad
])
(with presets.home-manager; [
by-user.chaos.guiDesktop
])
]);
}

View file

@ -1,5 +0,0 @@
{tree, ...}: {
imports = with tree.profiles.nixos; [
gaming.steam
];
}

View file

@ -1,7 +1,7 @@
{tree, ...}: {
imports = with tree; [
users.root
presets.home-manager.by-user.root.minimalServer
presets.home-manager.root-minimalServer
profiles.nixos.sshd

View file

@ -0,0 +1 @@
{pkgs, ...}: {home.packages = with pkgs; [melonDS];}

View file

@ -0,0 +1 @@
{pkgs, ...}: {home.packages = with pkgs; [multimc jdk17];}

View file

@ -0,0 +1 @@
{pkgs, ...}: {home.packages = with pkgs; [osu-lazer];}

View file

@ -1,9 +0,0 @@
{pkgs, ...}: {
home.packages = with pkgs; [
(lutris.override {
extraPkgs = pkgs: with pkgs; [gamescope];
})
gamescope
wineWowPackages.staging
];
}

View file

@ -0,0 +1,3 @@
{pkgs, ...}: {
home.packages = with pkgs; [(lutris.override {extraPkgs = pkgs: with pkgs; [gamescope];}) wineWowPackages.staging];
}

View file

@ -0,0 +1 @@
{pkgs, ...}: {home.packages = with pkgs; [steam];}

View file

@ -1,5 +0,0 @@
{pkgs, ...}: {
home.packages = with pkgs; [
steam
];
}

View file

@ -19,7 +19,7 @@ in {
};
});
};
config = {
home-manager = {
useGlobalPkgs = true;