changed structure to accommodate laptop

This commit is contained in:
Kristian Krsnik 2023-09-22 22:13:46 +02:00
parent bd4a1763b4
commit 3ec72fc172
Signed by: Kristian
GPG Key ID: FD1330AC9F909E85
25 changed files with 36 additions and 55 deletions

View File

@ -18,18 +18,18 @@
home.keyboard.layout = "at";
imports = [
./modules/bash.nix
./modules/direnv.nix
./modules/firefox.nix
./modules/fonts.nix
./modules/git.nix
./modules/gnome.nix
./modules/gpg.nix
./modules/nvim
./modules/packages.nix
./modules/thunderbird.nix
./modules/vscode.nix
./modules/mpv.nix
./bash.nix
./direnv.nix
./firefox.nix
./fonts.nix
./git.nix
./gnome.nix
./gpg.nix
./nvim
./packages.nix
./thunderbird.nix
./vscode.nix
./mpv.nix
];
# Programs

View File

@ -26,6 +26,9 @@
xournalpp
onlyoffice-bin
# Games
osu-lazer
# Communication
webcord
telegram-desktop
@ -34,6 +37,7 @@
# Creative software
gimp
davinci-resolve
# Misc
comma # Run any binary from the repos with a comma `, cowsay neato`

View File

@ -44,7 +44,7 @@
formatter.${system} = pkgs.alejandra;
commonModules = [
./home.nix
./common
{
_module.args.wallpaper = wallpaper.packages.${system}.default;
@ -77,12 +77,12 @@
];
homeConfigurations = {
kristian = home-manager.lib.homeManagerConfiguration {
pc = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules =
[
./pc.nix
./pc
]
++ self.commonModules;
};
@ -92,7 +92,7 @@
modules =
[
./laptop.nix
./laptop
]
++ self.commonModules;
};

View File

@ -1,29 +0,0 @@
{pkgs, ...}: {
config.targets.genericLinux.enable = true;
config.home.packages = with pkgs; [
gnome-console
auto-cpufreq
];
config.programs.bash.shellAliases = {
hms = "home-manager switch --flake $HOME/.config/home-manager#laptop";
};
config.services = {
syncthing.enable = true;
};
# Changes specific to the laptop
config.dconf.settings = {
"org/gnome/settings-daemon/plugins/power" = {
sleep-inactive-ac-type = "nothing";
power-button-action = "nothing";
};
};
config.nix = {
package = pkgs.nix;
settings.experimental-features = ["nix-command" "flakes"];
};
}

14
laptop/default.nix Normal file
View File

@ -0,0 +1,14 @@
{...}: {
config.targets.genericLinux.enable = false;
config.programs.bash.shellAliases = {
hms = "home-manager switch --flake $HOME/.config/home-manager#laptop";
};
config.dconf.settings = {
"org/gnome/settings-daemon/plugins/power" = {
sleep-inactive-ac-type = "suspend";
power-button-action = "hibernate";
};
};
}

View File

@ -1,16 +1,8 @@
{pkgs, ...}: {
{...}: {
config.targets.genericLinux.enable = false;
# Changes specific to the PC
config.home.packages = with pkgs; [
davinci-resolve
# Games
osu-lazer
];
config.programs.bash.shellAliases = {
hms = "home-manager switch --flake $HOME/.config/home-manager";
hms = "home-manager switch --flake $HOME/.config/home-manager#pc";
};
config.dconf.settings = {