updated flake.nix - moving towards simpler home-manager config

This commit is contained in:
Serenity-F 2024-04-04 23:04:35 +10:00
parent a905e2dc3d
commit 6363c7655d
4 changed files with 105 additions and 35 deletions

View file

@ -1,5 +1,5 @@
{
description = "Serenity's NixOS configuration";
description = "SerenityOS v0.2.5";
inputs = {
@ -29,7 +29,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
hyprpicker.url = "github:hyprwm/hyprpicker";
# hypr-contrib.url = "github:hyprwm/contrib";
# hypr-contrib.url = "github:hyprwm/contrib";
};
@ -49,16 +49,6 @@
config.allowUnfree = true;
};
};
home-manager-config = toplevel: [
home-manager.nixosModules.home-manager # Home manager go brrrr
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
# home-manager.users.serenity = toplevel;
# Optionally, use home-manager.extraSpecialArgs to pass
# arguments to home.nix
}
];
overlay-flake-pkgs = final: prev: {
};
common-modules = [
@ -73,8 +63,9 @@
modules = [
./hosts/proserpina/configuration.nix # Load muir main nix config
# nixos-hardware.nixosModules.$MODEL
] ++ home-manager-config (import ./home/home.nix) ++ common-modules;
] ++ common-modules;
};
};
};
}

View file

@ -6,27 +6,27 @@
./modules
];
nixpkgs.config = {
allowUnfree = true;
permittedInsecurePackages = [
"schildichat-web-1.11.30-sc.2"
"electron-25.9.0"
"nix-2.15.3"
];
};
# nixpkgs.config = {
# allowUnfree = true;
# permittedInsecurePackages = [
# "schildichat-web-1.11.30-sc.2"
# "electron-25.9.0"
# "nix-2.15.3"
# ];
# };
# nix options
nix = {
settings = {
cores = 0;
auto-optimise-store = true;
allowed-users = [ "@wheel" ];
experimental-features = [
"nix-command"
"flakes"
];
};
};
# nix = {
# settings = {
# cores = 0;
# auto-optimise-store = true;
# allowed-users = [ "@wheel" ];
# experimental-features = [
# "nix-command"
# "flakes"
# ];
# };
# };
system.autoUpgrade = {
enable = true;

34
modules/core/display.nix Normal file
View file

@ -0,0 +1,34 @@
{ inputs, pkgs, username, ... }:
{
programs.hyprland.enable = true;
xdg.portal = {
enable = true;
wlr.enable = true;
xdgOpenUsePortal = true;
extraPortals = [
pkgs.xdg-desktop-portal-hyprland
pkgs.xdg-desktop-portal-gtk
];
};
services.xserver = {
enable = true;
xkb.layout = "us";
displayManager.autoLogin = {
enable = true;
user = "${USERNAME}";
};
libinput = {
enable = true;
# mouse = {
# accelProfile = "flat";
# };
};
};
# apparently prevents getting stuck at shutdown
systemd.extraConfig = "DefaultTimeoutStopSec=10s";
}

View file

@ -1,7 +1,52 @@
{ self, pkgs, lib, inputs, ... }:
{
imports = [
# ./file.nix
import = [
./packages.nix
];
nix = {
settings = {
cores = 0;
auto-optimise-store = true;
allowed-users = [
"@wheel"
];
experimental-features = [
"nix-command"
"flakes"
];
};
# gc = {
# automatic = true;
# };
};
nixpkgs = {
overlays = [
self.overlays.default
inputs.nur.overlay
];
config = {
allowUnfree = true;
permittedInsecurePackages = [
"schildichat-web-1.11.30-sc.2"
"electron-25.9.0"
# "nix-2.15.3"
]
};
};
environment.variables = {
NIXOS_OZONE_WL = "1";
NIXPKGS_ALLOW_UNFREE = "1";
PATH = [
"\${HOME}/.local/bin"
"\${HOME}/.config/rofi/scripts"
];
};
system.stateVersion = "23.11";
}