trimmed flake further, replaced home.nix with user.nix for now, etc,

This commit is contained in:
Serenity-F 2024-04-05 18:58:30 +10:00 • committed by Serenity
parent cd333cf854
commit 81d856faee
5 changed files with 26 additions and 122 deletions

View file

@ -4,7 +4,7 @@
imports = [
./services.nix
./display.nix
# ./home.nix
./user.nix
./packages
];

View file

@ -1,45 +0,0 @@
{ inputs, pkgs, username, ... }:
{
programs.hyprland = {
enable = true;
xwayland.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;
layout = "us"; # what is the difference #
xkbVariant = ""; # between
xkb.layout = "us"; # these 2 lolwut #
displayManager.autoLogin = {
enable = true;
user = "serenity";
};
libinput = {
enable = true;
mouse = {
accelProfile = "flat";
};
};
};
# apparently prevents getting stuck at shutdown
systemd.extraConfig = "DefaultTimeoutStopSec=10s";
# set up hardware video acceleration
# https://nixos.wiki/wiki/Accelerated_Video_Playback
system.stateVersion = "23.11";
}

View file

@ -1,73 +0,0 @@
{ pkgs, inputs, outputs, config, osConfig, ... }:
{
imports = [
];
users = {
defaultUserShell = pkgs.fish;
users.serenity = {
description = "Serenity";
isNormalUser = true;
shell = pkgs.fish;
extraGroups = [
"networkmanager"
"wheel"
];
};
};
home-manager = {
users.serenity = {
home = {
username = "serenity";
homeDirectory = "/home/serenity/";
stateVersion = "23.11";
};
programs = {
home-manager.enable = true;
direnv = {
enable = false;
nix-direnv.enable = false;
config.load_dotenv = false;
};
};
};
};
system.stateVersion = "23.11";
}
# Copy some files to where they go
# home.file.scripts = {
# source = ./scripts;
# target = ".local/bin/scripts";
# };
# Installing muir packages uvu
# home.packages = with pkgs; [
# - Multimedia
# spotify
# nicotine-plus
# jellyfin-media-player
# gimp
# krita
# inkscape
# obs
# ardour
# - Web & Chat
# fractal
# schildichat-desktop
# - Coding
# vscodium
# gitui
# ];

View file

@ -10,9 +10,6 @@
gvfs.enable = true;
dbus.enable = true;
# gnome-keyring.enable = true;
openssh.enable = false;
avahi = {
enable = false;

25
modules/core/user.nix Normal file
View file

@ -0,0 +1,25 @@
{ pkgs, config, ... }:
{
imports = [
];
users = {
defaultUserShell = pkgs.fish;
users.serenity = {
description = "Serenity Amalgam";
isNormalUser = true;
shell = pkgs.fish;
extraGroups = [
"wheel"
"networkmanager"
];
};
};
system.stateVersion = "23.11";
}