aaaaahhhh, wei forgot to do regular commits, whoopsies, have a look at the changes yourselves

This commit is contained in:
Serenity-F 2024-04-01 01:41:03 +10:00
parent be46733d6a
commit 22d2c1a713
23 changed files with 439 additions and 81 deletions

12
TODO.md
View file

@ -1,11 +1,15 @@
#### To Do
--- ---
- [ ] trim down and remove old configuration options for GDM/GNOME #### To Do
- [ ] steal, i mean, uh, look at, other creature's nixos/hyprland setups
- [ ] build minimal system base configuration around hyprland ---
- [?] trim down and remove old configuration options for GDM/GNOME
- [?] steal, i mean, uh, look at, other creature's nixos/hyprland setups
- [ ] build ~~minimal~~ system-framework/scaffolding for configuration around hyprland
- [ ] build user configuration - [ ] build user configuration
- [ ] optional multi-user support - [ ] optional multi-user support
- [ ] get flake to actually build - [ ] get flake to actually build
- [ ] select media for wallpapers, avatars, etc. - [ ] select media for wallpapers, avatars, etc.
- [ ] uhhh, so much - [ ] uhhh, so much
- [ ] once hades is on nix, have specialised configs for each machine (duh)

View file

@ -2,11 +2,8 @@
{ {
imports = [ imports = [
# ./packages ./home
# ./packages.nix ./modules
# ./users.nix
# ./desktops/gnome/gnome.nix
# <home-manager/nixos>
]; ];
nixpkgs.config = { nixpkgs.config = {
@ -151,20 +148,23 @@
# nix-init # nix-init
# web browsers # web browsers
# firefox firefox
# lagrange # lagrange
tor-browser-bundle-bin tor-browser-bundle-bin
# misc/Fonts # misc/Fonts
(unstable.nerdfonts.override { fonts = ["NerdFontsSymbolsOnly"]; }) (unstable.nerdfonts.override { fonts = ["NerdFontsSymbolsOnly"]; })
# cli # terminal stuff
kitty
micro
hyfetch
# cli utilities
file file
zip zip
unzip unzip
gnupg gnupg
micro
hyfetch
busybox busybox
killall killall
usbutils usbutils

View file

@ -2,26 +2,39 @@
description = "Serenity's NixOS configuration"; description = "Serenity's NixOS configuration";
inputs = { inputs = {
# Nixpkgs and home mananger
# Nixpkgs and hardware specific configs
nixpkgs.url = "nixpkgs/nixos-23.11"; nixpkgs.url = "nixpkgs/nixos-23.11";
nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
home-manager.url = "github:nix-community/home-manager/release-23.11";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
# Hardware specific configuration stuff
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
# Packages
# apoth-admin.url = "git+https://codeberg.org/Apothecary/apoth-admin.git"; # nixos user repository ? :o
# apoth-admin.inputs.nixpkgs.follows = "nixpkgs-unstable"; nur.url "git:nix-community/NUR";
# nix gaming ?
nix-gaming.url = "github:fufexan/nix-gaming";
# declarative dots
home-manager = {
url = "github:nix-community/home-manager/release-23.11";
inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = # window manager (ricer friendly)
{ nixpkgs hyprland = {
, nixpkgs-unstable url = "github:hyprwm/Hyprland";
, home-manager inputs.nixpkgs.follows = "nixpkgs";
, nixos-hardware };
# , apoth-admin
, ... };
}:
outputs = {
nixpkgs,
nixpkgs-unstable,
home-manager,
hyprland,
nixos-hardware,
... }:
let let
system = "x86_64-linux"; system = "x86_64-linux";
overlay-unstable = final: prev: { overlay-unstable = final: prev: {
@ -54,7 +67,7 @@
modules = [ modules = [
./hosts/proserpina/configuration.nix # Load muir main nix config ./hosts/proserpina/configuration.nix # Load muir main nix config
# nixos-hardware.nixosModules.$MODEL # nixos-hardware.nixosModules.$MODEL
] ++ home-manager-config (import ./hosts/proserpina/home.nix) ++ common-modules; ] ++ home-manager-config (import ./home/home.nix) ++ common-modules;
}; };
}; };
}; };

7
home/default.nix Normal file
View file

@ -0,0 +1,7 @@
{
import = [
./home.nix
];
}

17
home/desktop/default.nix Normal file
View file

@ -0,0 +1,17 @@
{
imports = [
./hyprland
# ./dunst
# ./fish
./git
./hyprland
./kitty
# ./micro
# ./rofi
# ./starship
# ./stylix
./waybar
];
}

View file

@ -0,0 +1,21 @@
{ pkgs, ... }:
{
programs.git = {
enable = true;
userName = "serenity-F";
userEmail = "serenity-amalgam@protonmail.com";
extraConfig = {
init.defaultBranch = "main";
};
};
home.packages = [
pkgs.gh
pkgs.git-lfs
];
}

View file

@ -0,0 +1,45 @@
{ config, lib, pkgs, osConfig, ... }
{
imports = [
hyprland.homeManagerModules.default
./hyprland-environment.nix
];
home = {
packages = with pkgs; [
waybar
];
};
wayland.windowManager.hyprland = {
enable = true;
systemdIntegration = true;
settings = {
"$mod" = "SUPER";
bind = [
"$mod, F, exec, firefox"
", Print, exec, grimblast copy area"
] ++ ( # workspaces
# binds $mod + [shift+] {1..10} to [move to] workspace {1..10}
builtins.concatLists (builtins.genList (
x: let
ws = let
c = (x + 1) / 10;
in
builtins.toString (x + 1 - (c * 10));
in [
"$mod, ${ws}, workspace, ${toString (x + 1)}"
"$mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}"
]
)
10)
);
};
};
home.stateVersion = "23.11";
}

View file

@ -0,0 +1,20 @@
{ config, pkgs, ... }:
{
home = {
sessionVariables = {
EDITOR = "micro";
BROWSER = "firefox";
TERMINAL = "kitty";
XDG_CURRENT_DESKTOP = "Hyprland";
XDG_SESSION_DESKTOP - "Hyprland";
XDG_SESSION_TYPE = "wayland";
};
};
}

View file

@ -0,0 +1,39 @@
{ pkgs, ... }:
{
programs.kitty = {
enable = true;
# theme = "insert-theme"
# font = {
# name = "insert-font"
# size = 12
# };
settings ={
confirm_os_window_close = 0;
background_opacity = "0.55";
window_padding_width = 10;
scrollback_lines = 10000;
enable_audio_bell = false;
mouse_hide_wait = 60;
tab_title_template = "{index}";
active_tab_font_style = "normal";
inactive_tab_font_style = "normal";
tab_bar_style = "powerline";
tab_powerline_style = "round";
active_tab_foreground = "#1e1e2e";
active_tab_background = "#cba6f7";
inactive_tab_foreground = "#bac2de";
inactive_tab_background = "#313244";
};
keybindings = {
};
};
}

View file

@ -2,8 +2,9 @@
{ {
imports = [ imports = [
# ./users.nix ./users
./modules/hyprland.nix ./desktop
]; ];
programs.home-manager.enable = true; programs.home-manager.enable = true;
@ -16,15 +17,25 @@
# Installing muir packages uvu # Installing muir packages uvu
home.packages = with pkgs; [ home.packages = with pkgs; [
# - Multimedia # - Multimedia
gimp
spotify spotify
# nicotine-plus
# jellyfin-media-player # jellyfin-media-player
# gimp
# krita
# inkscape
# obs
# ardour
# - Web & Chat # - Web & Chat
# fractal
schildichat-desktop schildichat-desktop
# - Coding # - Coding
# vscodium # vscodium
# gitui # gitui
]; ];

7
home/users/default.nix Normal file
View file

@ -0,0 +1,7 @@
{
import = [
./serenity.nix
];
}

1
home/users/serenity.nix Normal file
View file

@ -0,0 +1 @@
# EMPTY FOR NOW

View file

@ -0,0 +1,103 @@
{ inputs, outputs, config, pkgs, lib, ... }:
{
imports =
[
# Include the results of the hardware scan.
"${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"
./disko-config.nix
./hardware-configuration.nix
../../configuration.nix
];
# Enable swap on luks
boot = {
loader = {
systemd-boot = {
enable = true;
configurationLimit = 10;
};
efi = {
canTouchEfiVariables = true;
# efiSysMountPoint = "/boot/efi";
};
};
initrd = {
systemd.enable = true;
secrets = {
# "crypto_keyfile.bin" = null;
};
luks = {
# devices."luks-DISK_UUID" = {
# device = "/dev/disk/by-uuid/DISK_UUID";
# keyfile = "/crypto_keyfile.bin";
# };
};
};
};
services.fstrim.enable = true;
powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
hardware = {
cpu.intel.updateMicrocode = true;
enableAllFirmware = false;
bluetooth.enable = false;
opengl = {
enable = true;
extraPackages = with pkgs; [
intel-compute-runtime
intel-media-driver
vaapiIntel
vaapiVdpau
libvdpau-va-gl
];
};
};
nix = {
# settings = {
# };
gc = {
automatic = true;
dates = "daily";
options = "--delete-older-than 7d";
persistent = true;
};
};
networking = {
hostName = "hades"; # Define your hostname
};
services = {
syncthing = {
enable = false;
dataDir = "/home/serenity/";
configDir = "/home/serenity/.config/syncthing";
user = "serenity";
settings = {
devices = {
# hades.id = "$DEVICE_ID";
# hecate.id = "$DEVICE_ID";
# proserpina.id = "$DEVICE_ID";
};
folders = {
# "$FOLDER_ID" = {
# path = "/home/serenity/Documents/Notes";
# devices = [ "hecate" "hades" ];
# };
};
};
};
};
}

View file

@ -0,0 +1,59 @@
{
disko.devices = {
disk = {
sda = {
type = "disk";
device = "/dev/sda";
content = {
type = "gpt";
partitions = {
ESP = {
size = "512M";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
mountOptions = [
"defaults"
];
};
};
luks = {
size = "100%";
content = {
type = "luks";
name = "pomegranate";
# disable settings.keyFile if you want to use interactive password entry
#passwordFile = "/tmp/secret.key"; # Interactive
settings = {
allowDiscards = true;
#keyFile = "/tmp/secret.key";
};
# additionalKeyFiles = [ "/tmp/additionalSecret.key" ];
content = {
type = "btrfs";
extraArgs = [ "-f" ];
subvolumes = {
"/root" = {
mountpoint = "/";
mountOptions = [ "compress=zstd" "noatime" ];
};
"/home" = {
mountpoint = "/home";
mountOptions = [ "compress=zstd" "noatime" ];
};
"/nix" = {
mountpoint = "/nix";
mountOptions = [ "compress=zstd" "noatime" ];
};
};
};
};
};
};
};
};
};
};
}

View file

@ -0,0 +1,26 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

View file

View file

@ -77,7 +77,7 @@
services = { services = {
syncthing = { syncthing = {
enable = true; enable = false;
dataDir = "/home/serenity/"; dataDir = "/home/serenity/";
configDir = "/home/serenity/.config/syncthing"; configDir = "/home/serenity/.config/syncthing";
user = "serenity"; user = "serenity";

View file

@ -1,14 +0,0 @@
let
gnomeProfile = import ../../desktops/gnome/profiles/gnome-profile.nix;
in
{
imports = [
../../home.nix
];
dconf.settings = {
"org/gnome/shell" = {
enabled-extensions = gnomeProfile.extensions.laptop;
# favorite-apps = gnomeProfile.pinnedApps.laptop;
};
};
}

9
modules/default.nix Normal file
View file

@ -0,0 +1,9 @@
{
imports = [
./services
./packages
./network
];
}

View file

@ -1,34 +0,0 @@
{ pkgs, lib, osConfig, ... }
{
wayland.windowManager.hyprland = {
enable = true;
settings = {
"$mod" = "SUPER";
bind =
[
"$mod, F, exec, firefox"
", Print, exec, grimblast copy area"
]
++ (
# workspaces
# binds $mod + [shift+] {1..10} to [move to] workspace {1..10}
builtins.concatLists (builtins.genList (
x: let
ws = let
c = (x + 1) / 10;
in
builtins.toString (x + 1 - (c * 10));
in [
"$mod, ${ws}, workspace, ${toString (x + 1)}"
"$mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}"
]
)
10)
);
};
};
}

View file

@ -0,0 +1,10 @@
{ config, lib, pkgs, ... }:
{
import = [
#
];
# INSERT NETWORKING CONFIG HERE
}

View file

@ -0,0 +1,7 @@
{
imports = [
# ./file.nix
];
}

View file

@ -0,0 +1,7 @@
{
imports = [
# file.nix
];
}