changed: editing to bring in line with changes in hyprland branch

This commit is contained in:
Serenity-F 2024-04-08 23:50:29 +10:00
parent c72fa779fc
commit 9fdd050b7c
11 changed files with 295 additions and 299 deletions

View file

@ -11,10 +11,7 @@ To Do:
> in order of priority
- [X] build ultraminimal general config **branch**
- [ ] build hyprland **branch**, following above structure
- [ ] build minimal fallback gnome **branch**, following main structure
- [ ] create new branch, merge, etc, make default branch if:
- [X] build "core" branch for all variant flakes to build upon
- [X] get flake to actually build
- [ ] per host hardware configurations
@ -23,25 +20,21 @@ To Do:
---
Cursory flake structure [Heavily WIP]
---
WIP Flake Structure
```
.
├── README
├── core
│ ├── configuration
│ ├── packages
│ └── users
├── flake.lock
├── flake.nix
├── hosts
│ ├── hades [MISSING]
│ └── proserpina
└── modules
└── core
├── audio
├── default
├── display
├── home
├── packages
└── services
└── hosts
└── proserpina
├── configuration
├── disko-config
├── hardware-configuration
└── network-configuration
```
---

102
core/configuration.nix Normal file
View file

@ -0,0 +1,102 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}:
{
imports = [
# home-manager
inputs.home-manager.nixosModules.home-manager
# also split up configuration.nix and import pieces:
./users.nix
./packages.nix
];
security = {
rtkit.enable = true;
sudo.execWheelOnly = true;
};
time.timeZone = "Australia/Brisbane";
i18n.defaultLocale = "en_GB.UTF-8";
nixpkgs = {
# add overlays here
overlays = [
# to use overlays exported from other flakes:
# neovim-nightly-overlay.overlays.default
# or define it inline, for example:
# (final: prev: {
# hi = final.hello.overrideAttrs (oldAttrs: {
# patches = [ ./change-hello-to-hi.patch ];
# });
# })
];
# configure nixpkgs instance
config = {
allowUnfree = true;
permittedInsecurePackages = [
];
};
};
# This will add each flake input as a registry
# To make nix3 commands consistent with your flake
nix.registry = (lib.mapAttrs (_: flake: {inherit flake;})) ((lib.filterAttrs (_: lib.isType "flake")) inputs);
# This will additionally add your inputs to the system's legacy channels
# Making legacy nix commands consistent as well, awesome!
nix.nixPath = ["/etc/nix/path"];
environment.etc =
lib.mapAttrs'
(name: value: {
name = "nix/path/${name}";
value.source = value.flake;
})
config.nix.registry;
nix.settings = {
cores = 0;
auto-optimise-store = true;
allowed-users = [ "@wheel" ];
experimental-features = [
"nix-command"
"flakes"
];
};
sound.enable = true;
hardware.pulseaudio.enable = false;
services.pipewire = {
enable = true;
jack.enable = true;
pulse.enable = true;
alsa.enable = true;
alsa.support32Bit = true;
# lowLatency.enable = true;
};
# disable these cuz they cause problems
# see: https://github.com/NixOS/nixpkgs/issues/180175
systemd.services = {
networkManager-wait-online.enable = lib.mkForce false;
systemd-networkd-wait-online.enable = lib.mkForce false;
};
# system.autoUpgrade = {
# enable = true;
# channel = "";
# };
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
system.stateVersion = "23.11";
}

107
core/packages.nix Normal file
View file

@ -0,0 +1,107 @@
{ pkgs, ... }:
{
programs = {
# hyprland.enable = true;
traceroute.enable = true;
starship.enable = true;
fish.enable = true;
git.enable = true;
firefox.enable = true;
};
environment.systemPackages = with pkgs; [
## nixos
appimage-run
# nix-tree
# nix-init
# nix-index
# nixpkgs-review
# nix-output-monitor
## filsesystem
udiskie
ntfs3g
xfsprogs
## compositor
waybar
swww
## terminal
kitty
micro
pipes
cbonsai
hyfetch
cmatrix
peaclock
## tools
file
fd
bc
gcc
zip
tldr
wget
curl
unzip
gnupg
blueman
busybox
ripgrep
killall
usbutils
pciutils
xdg_utils
moreutils
libsecret
git-crypt
## web browsers
# tor-browser-bundle-bin
# lagrange
# firefox
## misc, libraries, maybe more,
# qt5-wayland
# qt6-wayland
glib
];
fonts = {
packages = with pkgs; [
spleen
terminus_font
terminus_font_ttf
(nerdfonts.override { fonts = ["NerdFontsSymbolsOnly"]; })
];
fontDir.enable = true;
fontconfig = {
defaultFonts = {
monospace = [
"TerminusTTF"
];
serif = [
"spleen-32x64"
];
sansSerif = [
"spleen-32x64"
];
};
};
};
}

72
core/users.nix Normal file
View file

@ -0,0 +1,72 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}:
{
imports = [
inputs.home-manager.nixosModules.default
];
users.users = {
# To add users, copy and adjust to needs.
# coffee = {
# description = "Coffee Beans";
# isNormalUser = true;
# initialPassword = "password";
# shell = pkgs.fish;
# extraGroups = [
# "wheel"
# "networkmanager"
# ];
# };
serenity = {
description = "Serenity Amalgam";
isNormalUser = true;
initialPassword = "password";
shell = pkgs.fish;
extraGroups = [
"wheel"
"networkmanager"
];
};
};
home-manager = {
extraSpecialArgs = { inherit inputs outputs; };
useGlobalPkgs = true;
useUserPackages = true;
users = {
# coffee = {
# imports = [ ../home/home.nix ];
# home = {
# username = "coffee";
# homeDirectory = "/home/coffee";
# stateVersion = "23.11";
# };
# };
serenity = {
imports = [ ../home/home.nix ];
home = {
username = "serenity";
homeDirectory = "/home/serenity";
stateVersion = "23.11";
};
};
};
};
}

View file

@ -1,17 +0,0 @@
{ ... }:
{
sound.enable = true;
hardware.pulseaudio.enable = false;
services.pipewire = {
enable = true;
jack.enable = true;
pulse.enable = true;
alsa.enable = true;
alsa.support32Bit = true;
lowLatency.enable = true;
};
}

View file

@ -1,30 +0,0 @@
{ config, lib, pkgs, ... }:
{
imports = [
./services.nix
./display.nix
./user.nix
./packages
];
# Timezone & locale
time.timeZone = "Australia/Brisbane";
i18n.defaultLocale = "en_GB.UTF-8";
# security, apparently
security = {
rtkit.enable = true;
sudo.execWheelOnly = true;
};
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "23.11"; # Did you read the comment?
}

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,59 +0,0 @@
{pkgs, config, inputs, ... }:
{
imports = [
./packages.nix
];
nix = {
settings = {
cores = 0;
auto-optimise-store = true;
allowed-users = [
"@wheel"
];
experimental-features = [
"nix-command"
"flakes"
];
};
};
nixpkgs = {
overlays = [
];
config = {
allowUnfree = true;
permittedInsecurePackages = [
"schildichat-web-1.11.30-sc.2"
"electron-25.9.0"
];
};
};
qt.style = "adwaita-dark";
services.flatpak.enable = true;
boot.binfmt.registrations.appimage = {
wrapInterpreterInShell = false;
interpreter = "${pkgs.appimage-run}/bin/appimage-run";
recognitionType = "magic";
offset = 0;
mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff'';
magicOrExtension = ''\x7fELF....AI\x02'';
};
system = {
stateVersion = "23.11";
# autoUpgrade = {
# enable = true;
# channel = "INSERT_CHANNEL";
# };
};
}

View file

@ -1,63 +0,0 @@
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [
## nixos
appimage-run
# nix-tree
# nix-init
# nix-index
# nixpkgs-review
# nix-output-monitor
## filsesystem
udiskie
ntfs3g
xfsprogs
## terminal
kitty
micro
## cli tools
hyfetch
file
zip
unzip
gnupg
busybox
killall
usbutils
pciutils
moreutils
libsecret
git-crypt
## web browsers
# tor-browser-bundle-bin
# lagrange
# firefox
## misc, fonts, libraries, maybe more
(nerdfonts.override { fonts = ["NerdFontsSymbolsOnly"]; })
# qt5-wayland
# qt6-wayland
glib
];
programs = {
traceroute.enable = true;
starship.enable = true;
fish.enable = true;
git.enable = true;
# firefox.enable = true;
};
}

View file

@ -1,39 +0,0 @@
{ pkgs, lib, config, ... }:
{
imports = [
];
services = {
gvfs.enable = true;
dbus.enable = true;
avahi = {
enable = false;
nssmdns = false;
openFirewall = false;
};
locate = {
enable = false;
package = pkgs.plocate;
localuser = null;
};
};
# disable these cuz they cause problems
# see: https://github.com/NixOS/nixpkgs/issues/180175
systemd.services = {
networkManager-wait-online.enable = lib.mkForce false;
systemd-networkd-wait-online.enable = lib.mkForce false;
};
system.stateVersion = "23.11";
}

View file

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