From dc42ba64067af679dd4ac08180643a1d384ab34f Mon Sep 17 00:00:00 2001 From: serenity-F Date: Thu, 26 Sep 2024 17:28:02 +1000 Subject: [PATCH] tidying up --- core/packages.nix | 53 +++++++++++++++++++++++++++++--------------- flake.nix | 56 +++++++++++++++++++++++++++++++++-------------- 2 files changed, 75 insertions(+), 34 deletions(-) diff --git a/core/packages.nix b/core/packages.nix index a591c46..8d188a0 100644 --- a/core/packages.nix +++ b/core/packages.nix @@ -46,6 +46,7 @@ ## I put fonts here because i didn't know where tf else to put them lol + ## CURRENTLY BROKEN - PLEASE FIX fonts = { packages = with pkgs; [ spleen @@ -65,28 +66,41 @@ programs = { - ## a catgirl's favourite shell + ## A catgirl's favourite shell fish = { enable = true; }; - ## for when bimbo needs to manage platters + ## For when bimbo needs to play with platters gnome-disks = { enable = true; }; - ## for handling encryption keys + ## For handling encryption keys gnupg.agent = { enable = true; enableSSHSupport = true; #pinentryPackage = [ ]; }; - ## i wanted this in the user-level area, but w/e i guess + ## I wanted this in the user-level area, but w/e i guess steam = { enable = true; }; - ## temporary, fuck vax-bingus or w/e his name is + ## Temporary, fuck vaxery or whatever his name is + ## punk-ass motherfucker, swayfx looks neat + ## and is probably more stable anyway so yeah + ## whatever, im not mad, why would you think im mad + ## its not like the prettiest wayland "wm" has + ## a complete shithead as a lead dev, it's not + ## like i got sold on it and nearly set it up + ## completely before finding out about vaxo-bingus' + ## chuddery and deciding i had to jump ship to sway + ## a "wm" with comparatively little by ways of + ## "eye-candy". Oh boy am i glad swayfx exists + ## + ## Authors note: this is excessive, overly dramatic, + ## and played entirely (mostly) for laughs. hyprland = { enable = true; xwayland.enable = true; @@ -107,26 +121,30 @@ wayland.enable = true; }; - ## i use micro btw (neovim scares me) + ## We switched to neovim -mostly- full-time environment.variables = { - EDITOR = "micro"; - SYSTEMD_EDITOR = "micro"; - VISUAL = "micro"; + EDITOR = "neovim"; + SYSTEMD_EDITOR = "neovim"; + VISUAL = "neovim"; }; - ## enabling flatpak in case i need it + ## Enabling flatpak in case i need it services.flatpak.enable = true; - ## all system-level packages declared here + ## All* system-level packages declared here environment.systemPackages = with pkgs; [ ## Needed for that graphical config manager, suspect that the - ## whole inputs.nix- yaddah yaddah is unnecessary + ## whole inputs.nix- yaddah yaddah is unnecessary. + ## and look, -we- don't need a graphical config editor, but + ## the end goal here is to make a system environment that could + ## theoretically pass off as a complete linux distribution. + ## So there needs to be -some- way for users who are unwilling + ## to use a terminal and are more comfortable with a GUI. inputs.nixos-conf-editor.packages.${system}.nixos-conf-editor #nixos-conf-editor - - ## temporary desktop/user-level + ## Temporary desktop/user-level #waybar udiskie gparted @@ -138,15 +156,14 @@ polkit-kde-agent xorg.xhost - ## nix specific tools + ## Nix specific tools #nix-tree #nix-init #nix-index #nixpkgs-review #nix-output-monitor - ## filsesystem utilities - zfs + ## Filsesystem utilities xfsprogs ddrutility exfatprogs @@ -155,7 +172,7 @@ ntfs2btrfs scrounge-ntfs - ## cli tools & utilities + ## CLI tools & utilities fd bc zip diff --git a/flake.nix b/flake.nix index 00db661..0bb4e99 100644 --- a/flake.nix +++ b/flake.nix @@ -1,43 +1,70 @@ -{ - description = "SerenityOS v0.6.4"; - ## Latest features: - ## - Work on ZFS support continues +## SerenityOS - #this is a commented-out line of nix code - ## This is a real comment +## - A study in linux, packaging, user experience, +## system and desktop environments, themeing, +## system administration, and functional programming. + +## - We do not expect this to become a full-fledged linux +## distribution. Or be adopted by anymany but ourselves, +## but NixOS and its 'flakes' architecture allows for us +## to experiment and learn about the required subjects +## in a mock environment of sorts. + +## - Basically, we are playing linux distro simulator. /pos + + +## - Oh also, code-commenting is done like this: +## Place a hash directly before the code +## then indent the code by 1 extra space. + +## - A hash AFTER but on the same line +## as the code lets you add any thoughts. + +## example.nix = { +## #option1 = true; +## #option2 = true; # disabled for x reason +## option3 = false; +## }; + +{ + description = "SerenityOS v0.6.45"; + ## Latest features: + ## - A more defined roadmap for future flake development is now in place. + ## - Work on ZFS support continues, expect complete functionality soon. + ## - Work on commenting, reformating, and refactoring flake clode is progressing steadily. inputs = { - ## Nixpkgs + ## Nixpkgs version ## there was a way to have unstable as an overlay, ## will set it back up, lazy rn, for now pick one #nixpkgs.url = "nixpkgs/nixos-24.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; hardware.url = "github:nixos/nixos-hardware"; - ## declarative disk management + ## Declarative disk management disko = { url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; }; - ## secrets management + ## Secrets management sops-nix = { url = "github:Mic92/sops-nix"; ## optional, not necessary for the module #inputs.nixpkgs.follows = "nixpkgs"; }; - ## dots management + ## Dots management home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - ## themeing + ## Themeing nix-colors.url = "github:misterio77/nix-colors"; - ## ricer friendly wayland compositor + ## Ricer friendly wayland compositor hyprland.url = "github:hyprwm/Hyprland"; hyprland-plugins = { url = "github:hyprwm/hyprland-plugins"; @@ -46,7 +73,7 @@ ## Fix broken waybar on current nixpkgs-unstable #waybar.url = "github:Alexays/Waybar"; - ## graphical config editor? seeing what's up w/ it + ## Graphical config editor? seeing what's up w/ it nixos-conf-editor.url = "github:snowfallorg/nixos-conf-editor"; }; @@ -71,7 +98,6 @@ #iso = nixpkgs.lib.nixosSystem { #specialArgs = {inherit inputs outputs;}; - ## > Main nixos config files go here < #modules = [ #"${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix" #"${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix" @@ -83,7 +109,6 @@ persephone = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; - ## > Main nixos config files go here< modules = [ disko.nixosModules.disko sops-nix.nixosModules.sops @@ -93,7 +118,6 @@ hades = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; - # > Main nixos config files go here < modules = [ disko.nixosModules.disko sops-nix.nixosModules.sops