updated: merged in changes from core branch (wei still dont understand merging lol 🤦

This commit is contained in:
Serenity-F 2024-04-09 20:19:55 +10:00
commit 1a27cf40f1
5 changed files with 136 additions and 133 deletions

View file

@ -1,9 +1,6 @@
Hey there,
if you're not muis or one of muir headmates,
feel free to do as you wish with these configs :)
if you&'re a headmate, read [this](.guide/README.md)
To Do:
> in order of priority

View file

@ -9,89 +9,24 @@
{
imports = [
# home-manager
inputs.home-manager.nixosModules.home-manager
# also split up configuration.nix and import pieces:
## semi-modularised config
./packages
./display
../home/users
./packages.nix
];
security = {
rtkit.enable = true;
sudo.execWheelOnly = true;
};
## locale is common across machines
## crikey !
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 = [
"schildichat-web-1.11.30-sc.2"
"electron-25.9.0"
];
};
};
# 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"
];
};
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'';
};
qt.style = "adwaita-dark";
## gotta have sound, this too is common
sound.enable = true;
hardware.pulseaudio.enable = false;
services.pipewire = {
enable = true;
jack.enable = true;
pulse.enable = true;
@ -100,34 +35,42 @@
# lowLatency.enable = true;
};
programs.hyprland = {
enable = true;
xwayland.enable = true;
## genuinely dunno what these do hey, like isnt sudo
## already restricted to @wheel only? & wut is rtkit
security = {
rtkit.enable = true;
sudo.execWheelOnly = true;
};
services.xserver = {
enable = true;
displayManager.sddm = {
enable = true;
wayland.enable = true;
};
## settings for nix
nix.settings = {
## use all cores during build
cores = 0;
auto-optimise-store = true;
allowed-users = [ "@wheel" ];
## enable flakes uwu
experimental-features = [
"nix-command"
"flakes"
];
};
# apparently prevents getting stuck at shutdown
systemd.extraConfig = "DefaultTimeoutStopSec=10s";
# disable these cuz they cause problems
# see: https://github.com/NixOS/nixpkgs/issues/180175
## disable these cuz they cause problems (thx sasha)
## 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;
};
## apparently prevents getting stuck at shutdown
systemd.extraConfig = "DefaultTimeoutStopSec=10s";
## autoupgrades ? disabled for now, need to read into
# system.autoUpgrade = {
# enable = true;
# channel = "";
# enable = true;
# channel = "";
# };
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
## https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
system.stateVersion = "23.11";
}

20
core/display.nix Normal file
View file

@ -0,0 +1,20 @@
{ inputs, outputs, lib, config, pkgs, ... }:
{
programs.hyprland = {
enable = true;
xwayland.enable = true;
};
services.xserver = {
enable = true;
displayManager.sddm = {
enable = true;
wayland.enable = true;
};
};
qt.style = "adwaita-dark";
}

View file

@ -1,7 +1,78 @@
{ pkgs, ... }:
{ inputs, outputs, lib, config, pkgs, ... }:
{
## -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
## find a better home for these please <3
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"
];
};
};
};
## -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
nixpkgs = {
## configure nixpkgs instance
config = {
allowUnfree = true;
permittedInsecurePackages = [
];
};
## 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 ];
# });
# })
];
};
# 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;
programs = {
traceroute.enable = true;
fish.enable = true;
@ -9,18 +80,13 @@
};
services.flatpak.enable = true;
environment.systemPackages = with pkgs; [
## temporary
waybar
## nixos
# nix-tree
# nix-init
# nix-index
# nixpkgs-review
# nix-output-monitor
## filsesystem
udiskie
ntfs3g
@ -48,35 +114,12 @@
libsecret
git-crypt
## nixos
# nix-tree
# nix-init
# nix-index
# nixpkgs-review
# nix-output-monitor
];
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"
];
};
};
};
}

View file

@ -2,7 +2,7 @@
programs.git = {
enable = true;
userName = "serenity-F";
userEmail = "serenity-amalgam@protonmail.com";
userEmail = "serenity-F@noreply.codeberg.org";
extraConfig = {
init.defaultBranch = "main";
# Automatically track remote branch