diff --git a/README.md b/README.md
index 272e511..132a1f5 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,47 @@
-Wei grabbed most of this from the ever lovely Sashanoraa,
-[have a look at zir project to see what wei missed](https://git.sr.ht/~zethra/nixcfg)
+To Do:
+---
+
+> uh so, yeah, wei dunno, wei couldn't even fiure out how to make flakes and home manager and w/e else work
+> with GNOME, so instead wei are jumping into a new WM/DE because that will definitely be "easier",, right?
+> - [Hyprland](https://hyprland.org/)
+
+---
+
+
+> 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] get flake to actually build
+
+ - [ ] per host hardware configurations
+ - [ ] Hades
+ - [X] Proserpina
+
+---
+
+Cursory flake structure [Heavily WIP]
+
+---
+
+```
+.
+├── flake.nix
+├── hosts
+│ ├── hades [MISSING]
+│ └── proserpina
+└── modules
+ └── core
+ ├── audio
+ ├── default
+ ├── display
+ ├── home
+ ├── packages
+ └── services
+
+```
+
+---
diff --git a/TODO.md b/TODO.md
deleted file mode 100644
index 810884b..0000000
--- a/TODO.md
+++ /dev/null
@@ -1,13 +0,0 @@
-#### To Do
----
-
- - [ ] fix `apply`, `build`, and `install` scripts
- - [ ] move contents of `./desktops/profiles/gnome.nix` to `./desktops/gnome.nix`
- - [ ] and some of `./home.nix` to `./desktops/gnome.nix`
- - [ ] select media for wallpapers, avatars, etc.
- - [ ] split off `environment.systemPackages` into own module
- - [ ] set up syncthing
- - [ ] prepare hades for nixos
- - [ ] uhhh, so much
- - [x] get flake to actually build
- - [ ] get `/home/serenity/` to show up (._.') (>-<;)
diff --git a/configuration.nix b/configuration.nix
deleted file mode 100755
index ad7b163..0000000
--- a/configuration.nix
+++ /dev/null
@@ -1,278 +0,0 @@
-{ pkgs, lib, ... }:
-{
-
- imports = [
- # ./packages
- # ./packages.nix
- ./users.nix
- ./desktops/gnome/gnome.nix
- #
- ];
-
- nixpkgs.config = {
- allowUnfree = true;
- permittedInsecurePackages = [
- "schildichat-web-1.11.30-sc.2"
- "electron-25.9.0"
- "nix-2.15.3"
- ];
- };
-
- # nix options
- nix = {
- settings = {
- cores = 0;
- auto-optimise-store = true;
- allowed-users = [ "@wheel" ];
- experimental-features = [
- "nix-command"
- "flakes"
- ];
- };
- gc = {
- # automatic = true;
- # dates = "weekly";
- # options = "--delete-older-than 5d";
- # persistent = true;
- };
- };
- # Bootloader.
- boot = {
- # loader = {
- # systemd-boot.enable = true;
- # systemd-boot.configurationLimit = 5;
- # efi.canTouchEfiVariables = true;
- # };
- # plymouth.enable = true;
- initrd = {
- # systemd.enable = true;
- # secrets = {
- # "/crypto_keyfile.bin" = null;
- # };
- # kernelParams = [
- # "quiet"
- # ];
- # kernel.sysctl = {
- # "kernel.sysrq" = 1;
- # };
- luks = {
- # devices."luks-uuid" = {
- # device = "/dev/disk/by-uuid/luks-uuid";
- # };
- };
- };
- };
-
- # Run appimages normally
- 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'';
- };
-
- security = {
- sudo.execWheelOnly = true;
- };
-
- # Enable networking
- networking = {
- wireless.enable = false;
- networkmanager = {
- enable = true;
- # insertNameServers = [
- # "10.7.0.1"
- # ];
- };
- proxy = {
- # default = "https://user:password@proxy:port/";
- # noProxy = "127.0.0.1, localhost,internal.domain";
- };
- firewall = {
- enable = false;
- # allowedTCPPorts = [ 22000 21027 25565 ];
- # allowedUDPPorts = [ 41641 22000 21027 51820 ];
- # allowedTCPPortRanges = [
- # { from = 1714; to = 1764; } # KDE Connect
- # { from = 2234; to = 2239; } # Nicotine+
- # ];
- # allowedUDPPortRanges = [
- # { from = 1714; to = 1764; } # KDE Connect
- # ];
- # checkReversePath = "loose";
- # interfaces."tun0".allowedTCPPorts = [ 28996 ];
- };
- };
-
- # Set your time zone.
- time.timeZone = "Australia/Brisbane";
-
- # Select internationalisation properties.
- i18n.defaultLocale = "en_GB.UTF-8";
-
- # Enable X11 & GNOME
- services.xserver = {
- enable = true;
- # displayManager.gdm.enable = true;
- # desktopManager.gnome.enable = true;
- layout = "us";
- xkbVariant = "";
- };
-
- # Enable sound with pipewire.
- # sound.enable = true;
- hardware.pulseaudio.enable = false;
- security.rtkit.enable = true;
- services.pipewire = {
- enable = true;
- alsa.enable = true;
- alsa.support32Bit = true;
- pulse.enable = true;
- jack.enable = true;
- # Use the example session manager (this is enabled by default)
- # media-session.enable = true;
- };
-
- environment.systemPackages = with pkgs; [
- # file system support
- ntfs3g
- xfsprogs
- # nixos specific
- # nix-output-monitor
- # nixpkgs-review
- appimage-run
- # home-manager
- # nix-index
- # nix-tree
- # nix-init
- # essentials
- # firefox
- # lagrange
- tor-browser-bundle-bin
- # misc/Fonts
- font-manager
- (unstable.nerdfonts.override { fonts = ["NerdFontsSymbolsOnly"]; })
- # cli
- file
- zip
- unzip
- busybox
- killall
- usbutils
- pciutils
- moreutils
-
- libsecret
- git-crypt
- gnupg
-
- micro
- ffmpeg
- ventoy
- hyfetch
-
- # languages
-
- # - python
- # python313
-
- # - javascript/typescript
-
- # - dart/flutter
-
- # - golang
-
- # - c/++/#
-
- # - rust
- # rustc
- # rustup
- # cargo-edit
- # cargo-outdated
- # cargo-update
- # cargo-auditable
- # cargo-audit
- # cargo-cross
- # cargo-bloat
- # cargo-msrv
- ];
-
- # Qt dark mode
- # qt.style = "adwaita-dark";
-
- # More programs I want
- programs = {
- # home-manager.enable = true;
- traceroute.enable = true;
- corectrl.enable = true;
- firefox.enable = true;
- htop.enable = true;
- git.enable = true;
- gnupg.agent = {
- enable = true;
- enableSSHSupport = false;
- };
-
- fish = {
- enable = true;
- # import programs/fish.nix pkgs;
- };
-
- # starship.enable = true;
-
- };
-
- # Some programs need SUID wrappers, can be configured further or are
- # started in user sessions.
- # List services that you want to enable:
-
- services = {
-
- flatpak.enable = true;
-
- udev.packages = with pkgs; [
- # yubikey-personalization
- ];
- locate = {
- enable = false;
- package = pkgs.plocate;
- localuser = null;
- };
- printing = {
- enable = false;
- # drivers = with pkgs; [ gutenprint hll2390dw-cups ];
- };
- avahi = {
- enable = false;
- nssmdns = false;
- openFirewall = false;
- };
- openssh = {
- enable = false;
- };
-
- };
-
- # Set up hardware acceleration
- # https://nixos.wiki/wiki/Accelerated_Video_Playback
- hardware = {
- # MOVED
- };
-
- # 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;
- };
-
- # 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?
-
-}
diff --git a/desktops/gnome/gnome.nix b/desktops/gnome/gnome.nix
deleted file mode 100644
index dc9b1a9..0000000
--- a/desktops/gnome/gnome.nix
+++ /dev/null
@@ -1,93 +0,0 @@
-{ inputs, outputs, config, pkgs, lib, osConfig, ... }:
-
-{
-
- imports = [
- #
- ];
-
- services = {
-
- xserver = {
- displayManager.gdm.enable = true;
- desktopManager.gnome.enable = true;
- };
-
- gnome = {
- # gnome-keying.enable = true;
- # gnome-online-accounts.enable = false;
- };
-
- udev.packages = with pkgs; [
- gnome.gnome-settings-daemon
- ];
- };
-
- qt = {
- style = "adwaita-dark";
- };
-
- programs = {
- # home-manager.enable = true;
- dconf.enable = true;
- };
-
- environment = {
- systemPackages = with pkgs; [
- helvum
- fragments
- gnome-photos
- gnome-secrets
- authenticator
- gnome-extension-manager
- ] ++ (with pkgs.gnome; with pkgs.gnomeExtensions; [
- pano
- sushi
- gnome-boxes
- gnome-tweaks
- dconf-editor
- nautilus-python
- # shell extensions
- ddterm
- caffeine
- gsconnect
- dash-to-panel
- just-perfection
- clipboard-indicator
- custom-accent-colors
- quick-settings-tweaker
- rounded-window-corners
- ]) ++ (with pkgs.unstable; [
- mission-center
- fractal
- ]);
- # ]) ++ (import ./pkg-scripts pkgs);
-
- gnome.excludePackages = (with pkgs; with pkgs.gnome; [
- snapshot
- gnome-tour
- gnome-usage
- # gnome-text-editor
- gnome-connections
-
- yelp
- geary
- # gedit
- cheese
- epiphany
- gnome-maps
- simple-scan
- gnome-clocks
- gnome-weather
- gnome-terminal
- gnome-software
- gnome-contacts
- gnome-calendar
- gnome-initial-setup
- gnome-system-monitor
-
- ]);
-
- };
-
-}
diff --git a/desktops/gnome/profiles/gnome-profile.nix b/desktops/gnome/profiles/gnome-profile.nix
deleted file mode 100644
index ccc405a..0000000
--- a/desktops/gnome/profiles/gnome-profile.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- extensions = rec {
- base = [
- # "espresso@coadmunkee.github.com"
- "gsconnect@andyholmes.github.io"
- "rounded-window-corners@yilozt"
- "caffeine@patapon.info"
- # "appindicatorsupport@rgcjonas.gmail.com"
- # "aztaskbar@aztaskbar.gitlab.com"
- # "pano@elhan.io"
- ];
- desktop = base ++ [
- "Current_screen_only_for_Alternate_Tab@bourcereau.fr"
- "advanced-alt-tab@G-dH.github.com"
- ];
- laptop = base;
- };
- pinnedApps = rec {
- base = [
- ];
- base-end = [
- ];
- desktop = base ++ [
- ] ++ base-end;
- laptop = base ++ [
- ] ++ base-end;
- };
- extraDconf = {
- desktop = {
- # "org/gnome/shell/extensions/advanced-alt-tab-window-switcher" = {
- # switcher-popup-position = 2;
- # };
- };
- };
-}
diff --git a/desktops/media/LICENSE b/desktops/media/LICENSE
deleted file mode 100644
index cc3e245..0000000
--- a/desktops/media/LICENSE
+++ /dev/null
@@ -1,427 +0,0 @@
-Attribution-ShareAlike 4.0 International
-
-=======================================================================
-
-Creative Commons Corporation ("Creative Commons") is not a law firm and
-does not provide legal services or legal advice. Distribution of
-Creative Commons public licenses does not create a lawyer-client or
-other relationship. Creative Commons makes its licenses and related
-information available on an "as-is" basis. Creative Commons gives no
-warranties regarding its licenses, any material licensed under their
-terms and conditions, or any related information. Creative Commons
-disclaims all liability for damages resulting from their use to the
-fullest extent possible.
-
-Using Creative Commons Public Licenses
-
-Creative Commons public licenses provide a standard set of terms and
-conditions that creators and other rights holders may use to share
-original works of authorship and other material subject to copyright
-and certain other rights specified in the public license below. The
-following considerations are for informational purposes only, are not
-exhaustive, and do not form part of our licenses.
-
- Considerations for licensors: Our public licenses are
- intended for use by those authorized to give the public
- permission to use material in ways otherwise restricted by
- copyright and certain other rights. Our licenses are
- irrevocable. Licensors should read and understand the terms
- and conditions of the license they choose before applying it.
- Licensors should also secure all rights necessary before
- applying our licenses so that the public can reuse the
- material as expected. Licensors should clearly mark any
- material not subject to the license. This includes other CC-
- licensed material, or material used under an exception or
- limitation to copyright. More considerations for licensors:
- wiki.creativecommons.org/Considerations_for_licensors
-
- Considerations for the public: By using one of our public
- licenses, a licensor grants the public permission to use the
- licensed material under specified terms and conditions. If
- the licensor's permission is not necessary for any reason--for
- example, because of any applicable exception or limitation to
- copyright--then that use is not regulated by the license. Our
- licenses grant only permissions under copyright and certain
- other rights that a licensor has authority to grant. Use of
- the licensed material may still be restricted for other
- reasons, including because others have copyright or other
- rights in the material. A licensor may make special requests,
- such as asking that all changes be marked or described.
- Although not required by our licenses, you are encouraged to
- respect those requests where reasonable. More considerations
- for the public:
- wiki.creativecommons.org/Considerations_for_licensees
-
-=======================================================================
-
-Creative Commons Attribution-ShareAlike 4.0 International Public
-License
-
-By exercising the Licensed Rights (defined below), You accept and agree
-to be bound by the terms and conditions of this Creative Commons
-Attribution-ShareAlike 4.0 International Public License ("Public
-License"). To the extent this Public License may be interpreted as a
-contract, You are granted the Licensed Rights in consideration of Your
-acceptance of these terms and conditions, and the Licensor grants You
-such rights in consideration of benefits the Licensor receives from
-making the Licensed Material available under these terms and
-conditions.
-
-
-Section 1 -- Definitions.
-
- a. Adapted Material means material subject to Copyright and Similar
- Rights that is derived from or based upon the Licensed Material
- and in which the Licensed Material is translated, altered,
- arranged, transformed, or otherwise modified in a manner requiring
- permission under the Copyright and Similar Rights held by the
- Licensor. For purposes of this Public License, where the Licensed
- Material is a musical work, performance, or sound recording,
- Adapted Material is always produced where the Licensed Material is
- synched in timed relation with a moving image.
-
- b. Adapter's License means the license You apply to Your Copyright
- and Similar Rights in Your contributions to Adapted Material in
- accordance with the terms and conditions of this Public License.
-
- c. BY-SA Compatible License means a license listed at
- creativecommons.org/compatiblelicenses, approved by Creative
- Commons as essentially the equivalent of this Public License.
-
- d. Copyright and Similar Rights means copyright and/or similar rights
- closely related to copyright including, without limitation,
- performance, broadcast, sound recording, and Sui Generis Database
- Rights, without regard to how the rights are labeled or
- categorized. For purposes of this Public License, the rights
- specified in Section 2(b)(1)-(2) are not Copyright and Similar
- Rights.
-
- e. Effective Technological Measures means those measures that, in the
- absence of proper authority, may not be circumvented under laws
- fulfilling obligations under Article 11 of the WIPO Copyright
- Treaty adopted on December 20, 1996, and/or similar international
- agreements.
-
- f. Exceptions and Limitations means fair use, fair dealing, and/or
- any other exception or limitation to Copyright and Similar Rights
- that applies to Your use of the Licensed Material.
-
- g. License Elements means the license attributes listed in the name
- of a Creative Commons Public License. The License Elements of this
- Public License are Attribution and ShareAlike.
-
- h. Licensed Material means the artistic or literary work, database,
- or other material to which the Licensor applied this Public
- License.
-
- i. Licensed Rights means the rights granted to You subject to the
- terms and conditions of this Public License, which are limited to
- all Copyright and Similar Rights that apply to Your use of the
- Licensed Material and that the Licensor has authority to license.
-
- j. Licensor means the individual(s) or entity(ies) granting rights
- under this Public License.
-
- k. Share means to provide material to the public by any means or
- process that requires permission under the Licensed Rights, such
- as reproduction, public display, public performance, distribution,
- dissemination, communication, or importation, and to make material
- available to the public including in ways that members of the
- public may access the material from a place and at a time
- individually chosen by them.
-
- l. Sui Generis Database Rights means rights other than copyright
- resulting from Directive 96/9/EC of the European Parliament and of
- the Council of 11 March 1996 on the legal protection of databases,
- as amended and/or succeeded, as well as other essentially
- equivalent rights anywhere in the world.
-
- m. You means the individual or entity exercising the Licensed Rights
- under this Public License. Your has a corresponding meaning.
-
-
-Section 2 -- Scope.
-
- a. License grant.
-
- 1. Subject to the terms and conditions of this Public License,
- the Licensor hereby grants You a worldwide, royalty-free,
- non-sublicensable, non-exclusive, irrevocable license to
- exercise the Licensed Rights in the Licensed Material to:
-
- a. reproduce and Share the Licensed Material, in whole or
- in part; and
-
- b. produce, reproduce, and Share Adapted Material.
-
- 2. Exceptions and Limitations. For the avoidance of doubt, where
- Exceptions and Limitations apply to Your use, this Public
- License does not apply, and You do not need to comply with
- its terms and conditions.
-
- 3. Term. The term of this Public License is specified in Section
- 6(a).
-
- 4. Media and formats; technical modifications allowed. The
- Licensor authorizes You to exercise the Licensed Rights in
- all media and formats whether now known or hereafter created,
- and to make technical modifications necessary to do so. The
- Licensor waives and/or agrees not to assert any right or
- authority to forbid You from making technical modifications
- necessary to exercise the Licensed Rights, including
- technical modifications necessary to circumvent Effective
- Technological Measures. For purposes of this Public License,
- simply making modifications authorized by this Section 2(a)
- (4) never produces Adapted Material.
-
- 5. Downstream recipients.
-
- a. Offer from the Licensor -- Licensed Material. Every
- recipient of the Licensed Material automatically
- receives an offer from the Licensor to exercise the
- Licensed Rights under the terms and conditions of this
- Public License.
-
- b. Additional offer from the Licensor -- Adapted Material.
- Every recipient of Adapted Material from You
- automatically receives an offer from the Licensor to
- exercise the Licensed Rights in the Adapted Material
- under the conditions of the Adapter's License You apply.
-
- c. No downstream restrictions. You may not offer or impose
- any additional or different terms or conditions on, or
- apply any Effective Technological Measures to, the
- Licensed Material if doing so restricts exercise of the
- Licensed Rights by any recipient of the Licensed
- Material.
-
- 6. No endorsement. Nothing in this Public License constitutes or
- may be construed as permission to assert or imply that You
- are, or that Your use of the Licensed Material is, connected
- with, or sponsored, endorsed, or granted official status by,
- the Licensor or others designated to receive attribution as
- provided in Section 3(a)(1)(A)(i).
-
- b. Other rights.
-
- 1. Moral rights, such as the right of integrity, are not
- licensed under this Public License, nor are publicity,
- privacy, and/or other similar personality rights; however, to
- the extent possible, the Licensor waives and/or agrees not to
- assert any such rights held by the Licensor to the limited
- extent necessary to allow You to exercise the Licensed
- Rights, but not otherwise.
-
- 2. Patent and trademark rights are not licensed under this
- Public License.
-
- 3. To the extent possible, the Licensor waives any right to
- collect royalties from You for the exercise of the Licensed
- Rights, whether directly or through a collecting society
- under any voluntary or waivable statutory or compulsory
- licensing scheme. In all other cases the Licensor expressly
- reserves any right to collect such royalties.
-
-
-Section 3 -- License Conditions.
-
-Your exercise of the Licensed Rights is expressly made subject to the
-following conditions.
-
- a. Attribution.
-
- 1. If You Share the Licensed Material (including in modified
- form), You must:
-
- a. retain the following if it is supplied by the Licensor
- with the Licensed Material:
-
- i. identification of the creator(s) of the Licensed
- Material and any others designated to receive
- attribution, in any reasonable manner requested by
- the Licensor (including by pseudonym if
- designated);
-
- ii. a copyright notice;
-
- iii. a notice that refers to this Public License;
-
- iv. a notice that refers to the disclaimer of
- warranties;
-
- v. a URI or hyperlink to the Licensed Material to the
- extent reasonably practicable;
-
- b. indicate if You modified the Licensed Material and
- retain an indication of any previous modifications; and
-
- c. indicate the Licensed Material is licensed under this
- Public License, and include the text of, or the URI or
- hyperlink to, this Public License.
-
- 2. You may satisfy the conditions in Section 3(a)(1) in any
- reasonable manner based on the medium, means, and context in
- which You Share the Licensed Material. For example, it may be
- reasonable to satisfy the conditions by providing a URI or
- hyperlink to a resource that includes the required
- information.
-
- 3. If requested by the Licensor, You must remove any of the
- information required by Section 3(a)(1)(A) to the extent
- reasonably practicable.
-
- b. ShareAlike.
-
- In addition to the conditions in Section 3(a), if You Share
- Adapted Material You produce, the following conditions also apply.
-
- 1. The Adapter's License You apply must be a Creative Commons
- license with the same License Elements, this version or
- later, or a BY-SA Compatible License.
-
- 2. You must include the text of, or the URI or hyperlink to, the
- Adapter's License You apply. You may satisfy this condition
- in any reasonable manner based on the medium, means, and
- context in which You Share Adapted Material.
-
- 3. You may not offer or impose any additional or different terms
- or conditions on, or apply any Effective Technological
- Measures to, Adapted Material that restrict exercise of the
- rights granted under the Adapter's License You apply.
-
-
-Section 4 -- Sui Generis Database Rights.
-
-Where the Licensed Rights include Sui Generis Database Rights that
-apply to Your use of the Licensed Material:
-
- a. for the avoidance of doubt, Section 2(a)(1) grants You the right
- to extract, reuse, reproduce, and Share all or a substantial
- portion of the contents of the database;
-
- b. if You include all or a substantial portion of the database
- contents in a database in which You have Sui Generis Database
- Rights, then the database in which You have Sui Generis Database
- Rights (but not its individual contents) is Adapted Material,
-
- including for purposes of Section 3(b); and
- c. You must comply with the conditions in Section 3(a) if You Share
- all or a substantial portion of the contents of the database.
-
-For the avoidance of doubt, this Section 4 supplements and does not
-replace Your obligations under this Public License where the Licensed
-Rights include other Copyright and Similar Rights.
-
-
-Section 5 -- Disclaimer of Warranties and Limitation of Liability.
-
- a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
- EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
- AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
- ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
- IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
- WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
- PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
- ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
- KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
- ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
-
- b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
- TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
- NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
- INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
- COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
- USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
- ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
- DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
- IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
-
- c. The disclaimer of warranties and limitation of liability provided
- above shall be interpreted in a manner that, to the extent
- possible, most closely approximates an absolute disclaimer and
- waiver of all liability.
-
-
-Section 6 -- Term and Termination.
-
- a. This Public License applies for the term of the Copyright and
- Similar Rights licensed here. However, if You fail to comply with
- this Public License, then Your rights under this Public License
- terminate automatically.
-
- b. Where Your right to use the Licensed Material has terminated under
- Section 6(a), it reinstates:
-
- 1. automatically as of the date the violation is cured, provided
- it is cured within 30 days of Your discovery of the
- violation; or
-
- 2. upon express reinstatement by the Licensor.
-
- For the avoidance of doubt, this Section 6(b) does not affect any
- right the Licensor may have to seek remedies for Your violations
- of this Public License.
-
- c. For the avoidance of doubt, the Licensor may also offer the
- Licensed Material under separate terms or conditions or stop
- distributing the Licensed Material at any time; however, doing so
- will not terminate this Public License.
-
- d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
- License.
-
-
-Section 7 -- Other Terms and Conditions.
-
- a. The Licensor shall not be bound by any additional or different
- terms or conditions communicated by You unless expressly agreed.
-
- b. Any arrangements, understandings, or agreements regarding the
- Licensed Material not stated herein are separate from and
- independent of the terms and conditions of this Public License.
-
-
-Section 8 -- Interpretation.
-
- a. For the avoidance of doubt, this Public License does not, and
- shall not be interpreted to, reduce, limit, restrict, or impose
- conditions on any use of the Licensed Material that could lawfully
- be made without permission under this Public License.
-
- b. To the extent possible, if any provision of this Public License is
- deemed unenforceable, it shall be automatically reformed to the
- minimum extent necessary to make it enforceable. If the provision
- cannot be reformed, it shall be severed from this Public License
- without affecting the enforceability of the remaining terms and
- conditions.
-
- c. No term or condition of this Public License will be waived and no
- failure to comply consented to unless expressly agreed to by the
- Licensor.
-
- d. Nothing in this Public License constitutes or may be interpreted
- as a limitation upon, or waiver of, any privileges and immunities
- that apply to the Licensor or You, including from the legal
- processes of any jurisdiction or authority.
-
-
-=======================================================================
-
-Creative Commons is not a party to its public
-licenses. Notwithstanding, Creative Commons may elect to apply one of
-its public licenses to material it publishes and in those instances
-will be considered the “Licensor.” The text of the Creative Commons
-public licenses is dedicated to the public domain under the CC0 Public
-Domain Dedication. Except for the limited purpose of indicating that
-material is shared under a Creative Commons public license or as
-otherwise permitted by the Creative Commons policies published at
-creativecommons.org/policies, Creative Commons does not authorize the
-use of the trademark "Creative Commons" or any other trademark or logo
-of Creative Commons without its prior written consent including,
-without limitation, in connection with any unauthorized modifications
-to any of its public licenses or any other arrangements,
-understandings, or agreements concerning use of licensed material. For
-the avoidance of doubt, this paragraph does not form part of the
-public licenses.
-
-Creative Commons may be contacted at creativecommons.org.
diff --git a/desktops/media/README.md b/desktops/media/README.md
deleted file mode 100644
index ec0fe1f..0000000
--- a/desktops/media/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-Profile image is licensed under CC-BY-SA as stated in [`LICENSE`](./LICENSE).
-Wallpaper is not owned by me.
diff --git a/flake.lock b/flake.lock
index de9ab5a..c0c32a6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,23 +1,22 @@
{
"nodes": {
- "home-manager": {
+ "disko": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
- "lastModified": 1710888565,
- "narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=",
+ "lastModified": 1711934712,
+ "narHash": "sha256-sBDe+QmX/QohlnKeSEzrftcXyZL5FY09OMjZ59Rpyy4=",
"owner": "nix-community",
- "repo": "home-manager",
- "rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce",
+ "repo": "disko",
+ "rev": "611c9ea53250f7bb22286b3d26872280a0e608f9",
"type": "github"
},
"original": {
"owner": "nix-community",
- "ref": "release-23.11",
- "repo": "home-manager",
+ "repo": "disko",
"type": "github"
}
},
@@ -39,26 +38,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1711460390,
- "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=",
+ "lastModified": 1712163089,
+ "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "44733514b72e732bd49f5511bd0203dea9b9a434",
- "type": "github"
- },
- "original": {
- "id": "nixpkgs",
- "ref": "nixos-23.11",
- "type": "indirect"
- }
- },
- "nixpkgs-unstable": {
- "locked": {
- "lastModified": 1711523803,
- "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
+ "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
"type": "github"
},
"original": {
@@ -69,10 +53,9 @@
},
"root": {
"inputs": {
- "home-manager": "home-manager",
+ "disko": "disko",
"nixos-hardware": "nixos-hardware",
- "nixpkgs": "nixpkgs",
- "nixpkgs-unstable": "nixpkgs-unstable"
+ "nixpkgs": "nixpkgs"
}
}
},
diff --git a/flake.nix b/flake.nix
index 96c09e6..222316c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,61 +1,36 @@
{
- description = "Serenity's NixOS configuration";
+ description = "SerenityOS v0.2.9";
inputs = {
- # Nixpkgs and home mananger
- nixpkgs.url = "nixpkgs/nixos-23.11";
- 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
+
+ # Nixpkgs and hardware specific configs
+
+ # 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-23.11";
+ nixpkgs.url = "nixpkgs/nixos-unstable";
+
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
- # Packages
- # apoth-admin.url = "git+https://codeberg.org/Apothecary/apoth-admin.git";
- # apoth-admin.inputs.nixpkgs.follows = "nixpkgs-unstable";
+
+ # declarative disks
+ disko = {
+ url = "github:nix-community/disko";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
+
};
- outputs =
- { nixpkgs
- , nixpkgs-unstable
- , home-manager
- , nixos-hardware
- # , apoth-admin
- , ...
- }:
- let
- system = "x86_64-linux";
- overlay-unstable = final: prev: {
- unstable = import nixpkgs-unstable {
- inherit system;
- config.allowUnfree = true;
- };
- };
- home-manager-config = toplevel: [
- home-manager.nixosModules.home-manager # Home manager go brrrr
- {
- home-manager.useGlobalPkgs = true;
- home-manager.useUserPackages = true;
- # ASK AKESI ABOUT EASIER WAY TO LOAD ALL USERS MAYBE?
- home-manager.users.serenity = toplevel;
- # Optionally, use home-manager.extraSpecialArgs to pass
- # arguments to home.nix
- }
- ];
- overlay-flake-pkgs = final: prev: {
- };
- common-modules = [
- ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable overlay-flake-pkgs ]; })
- ];
- in
- {
- nixosConfigurations = {
- proserpina = nixpkgs.lib.nixosSystem {
- inherit system;
- modules = [
- ./hosts/proserpina/configuration.nix # Load muir main nix config
- # nixos-hardware.nixosModules.$MODEL
- ] ++ home-manager-config (import ./hosts/proserpina/home.nix) ++ common-modules;
- };
+ outputs = { nixpkgs, nixos-hardware, disko, ... }: {
+ nixosConfigurations = {
+ proserpina = nixpkgs.lib.nixosSystem {
+ system = "x86_64-linux";
+ modules = [
+ # nixos-hardware.nixosModules.$MODEL
+ ./hosts/proserpina/configuration.nix
+ disko.nixosModules.disko
+ ];
};
};
+ };
+
}
diff --git a/home.nix b/home.nix
deleted file mode 100755
index 0007c8c..0000000
--- a/home.nix
+++ /dev/null
@@ -1,106 +0,0 @@
-{ pkgs, lib, osConfig, ... }:
-{
-
- imports = [
- # ./users.nix
- ];
-
- programs.home-manager.enable = true;
-
- # 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
- gimp
- krita
- spotify
- jellyfin-media-player
- # - Web & Chat
- lagrange
- schildichat-desktop
- # - Coding
- gitui
- vscodium
- ];
-
-
- # Configure muir programs
- programs.gpg.enable = true;
- # programs.firefox = import programs/firefox.nix pkgs;
- programs.git = import programs/git.nix pkgs;
- programs.topgrade = {
- enable = false;
- settings = {
- misc = {
- assume_yes = true;
- pre_sudo = true;
- disable = [ "system" "gnome_shell_extensions" "nix" ];
- };
- commands = {
- "Upgrade System" = "nixos-upgrade -y";
- };
- post_commands = {
- "Run Garbage Collection on Nix Store" = "nix-collect-garbage";
- };
- };
- };
-
- programs.direnv = {
- enable = true;
- nix-direnv.enable = true;
- config.load_dotenv = false;
- };
-
- # Configure Gnome shell juuuust right WIP
- dconf.settings = {
- "org/gnome/shell" = {
- disable-user-extensions = false;
- };
- "org/gnome/desktop/interface" = {
- prefer-dark = true;
- };
- "org/gnome/shell/keybindings" = {
- toggle-message-tray = [ "m" ];
- };
- "org/gnome/desktop/input-sources" = {
- xkb-options = [ "terminate:ctrl_alt_bksp" "compose:ralt" ];
- };
- "org/gtk/gtk4/settings/file-chooser" = {
- sort-directories-first = true;
- };
- # "org/gnome/desktop/background" = {
- # picture-uri = "file:///home/sasha/.local/share/backgrounds/wallpaper.jpg";
- # picture-uri-dark = "file:///home/sasha/.local/share/backgrounds/wallpaper.jpg";
- # color-shading-type = "solid";
- # picture-options = "zoom";
- # primary-color = "#000000000000";
- # secondary-color = "#000000000000";
- # };
- # "org/gnome/desktop/screensaver" = {
- # picture-uri = "file:///home/sasha/.local/share/backgrounds/wallpaper.jpg";
- # color-shading-type = "solid";
- # picture-options = "zoom";
- # primary-color = "#000000000000";
- # secondary-color = "#000000000000";
- # };
- # Pano settings
- # "org/gnome/shell/extensions/pano" = {
- # open-links-in-browser = false;
- # paste-on-select = false;
- # };
- # "org/gnome/shell/extensions/pano/text-item" = {
- # header-bg-color = "rgb(97,53,131)";
- # body-bg-color = "rgb(36,31,49)";
- # body-color = "rgb(255,255,255)";
- # };
- };
-
- # don't uh, change this or something might break lol idk
- home.stateVersion = "23.11";
-}
diff --git a/hosts/hades/null.nix b/hosts/hades/null.nix
deleted file mode 100644
index e69de29..0000000
diff --git a/hosts/proserpina/configuration.nix b/hosts/proserpina/configuration.nix
index a608ffe..c652a14 100644
--- a/hosts/proserpina/configuration.nix
+++ b/hosts/proserpina/configuration.nix
@@ -1,21 +1,23 @@
-{ inputs, outputs, config, pkgs, lib, ... }:
+{ inputs, outputs, config, lib, pkgs, ... }:
{
- 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
- ];
+ imports = [
+ # Include the results of the hardware scan.
+ ./hardware-configuration.nix
+ # "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"
+ ./disko-config.nix
+ ./network-configuration.nix
+
+ ./../../modules/core
+
+ ];
# Enable swap on luks
boot = {
loader = {
systemd-boot = {
enable = true;
- configurationLimit = 5;
+ configurationLimit = 5;
};
efi = {
canTouchEfiVariables = true;
@@ -70,34 +72,4 @@
};
};
- networking = {
- hostName = "proserpina"; # Define your hostname
- };
-
- services = {
-
- syncthing = {
- enable = true;
- 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" ];
- # };
-
- };
- };
- };
- };
-
}
diff --git a/hosts/proserpina/disko-config.nix b/hosts/proserpina/disko-config.nix
index ecc32ac..06b376d 100644
--- a/hosts/proserpina/disko-config.nix
+++ b/hosts/proserpina/disko-config.nix
@@ -1,4 +1,5 @@
{
+
disko.devices = {
disk = {
sda = {
@@ -19,6 +20,7 @@
];
};
};
+
luks = {
size = "100%";
content = {
@@ -31,6 +33,7 @@
#keyFile = "/tmp/secret.key";
};
# additionalKeyFiles = [ "/tmp/additionalSecret.key" ];
+
content = {
type = "btrfs";
extraArgs = [ "-f" ];
@@ -49,11 +52,15 @@
};
};
};
+
};
};
+
};
};
};
};
+
};
+
}
diff --git a/hosts/proserpina/hardware-configuration.nix b/hosts/proserpina/hardware-configuration.nix
index 47a61f8..1e02223 100644
--- a/hosts/proserpina/hardware-configuration.nix
+++ b/hosts/proserpina/hardware-configuration.nix
@@ -5,7 +5,10 @@
{
imports =
- [ (modulesPath + "/installer/scan/not-detected.nix")
+ [
+ (modulesPath + "/installer/scan/not-detected.nix")
+ # ./disko-config.sh
+ ./disko-config.nix
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" ];
diff --git a/hosts/proserpina/home.nix b/hosts/proserpina/home.nix
deleted file mode 100644
index dca63aa..0000000
--- a/hosts/proserpina/home.nix
+++ /dev/null
@@ -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;
- };
- };
-}
diff --git a/hosts/proserpina/network-configuration.nix b/hosts/proserpina/network-configuration.nix
new file mode 100644
index 0000000..eb93781
--- /dev/null
+++ b/hosts/proserpina/network-configuration.nix
@@ -0,0 +1,72 @@
+{ pkgs, lib, config, ... }:
+
+{
+
+ imports = [
+ # ./file.nix
+ ];
+
+ networking = {
+ hostName = "proserpina";
+ wireless.enable = false;
+ networkmanager = {
+ enable = true;
+ };
+ # nameservers = [
+ # "1.1.1.1"
+ # ];
+ };
+
+ # networking.proxy = {
+ # default = "https://user:password@proxy:port/";
+ # noProxy = "127.0.0.1, localhost, internal.comain";
+ # };
+
+ networking.firewall = {
+ enable = false;
+ # checkReversePath = "loose";
+ # allowedTCPPorts = [ 22000 21027 25565 ];
+ # allowedUDPPorts = [ 22000 21027 41641 51820 ];
+ # allowedTCPPortRanges = [
+ # { from = 9999; to = 9999; } # KDE COnnect
+ # { from = 9999; to = 9999; } # Nicotine+
+ # ];
+ # allowedUDPPortRanges = [
+ # { from = 9999; to = 9999; } # KDE COnnect
+ # ];
+ # interfaces."DEVICENAME".allowedTCPPorts = [ 22999 ]
+ };
+
+ services.syncthing = {
+ enable = false;
+ dataDir = "/home/serenity/";
+ configDir = "/home/serenity/.config/syncthing";
+ user = "serenity";
+ settings.devices = {
+
+ # hades.id = "DEVICE_ID";
+ # proserpina.id = "DEVICE_ID";
+ # hecate.id = "DEVICE_ID";
+
+ };
+ settings.folders = {
+
+ # "FOLDER_ID" = {
+ # path = "/home/serenity/Documents/Notes";
+ # devices = [ "hecate" "hades" "proserpina" ];
+ # };
+
+ # "FOLDER_ID" = {
+ # path = "/home/serenity/Documents/Notes";
+ # devices = [ "hecate" "hades" "proserpina" ];
+ # };
+
+ # "FOLDER_ID" = {
+ # path = "/home/serenity/Documents/Notes";
+ # devices = [ "hecate" "hades" "proserpina" ];
+ # };
+
+ };
+ };
+
+}
diff --git a/modules/core/audio.nix b/modules/core/audio.nix
new file mode 100644
index 0000000..ba6ed67
--- /dev/null
+++ b/modules/core/audio.nix
@@ -0,0 +1,17 @@
+{ ... }:
+
+{
+
+ 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;
+ };
+
+}
diff --git a/modules/core/default.nix b/modules/core/default.nix
new file mode 100644
index 0000000..dfbb069
--- /dev/null
+++ b/modules/core/default.nix
@@ -0,0 +1,30 @@
+{ 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?
+
+}
diff --git a/modules/core/display.nix b/modules/core/display.nix
new file mode 100644
index 0000000..6683344
--- /dev/null
+++ b/modules/core/display.nix
@@ -0,0 +1,45 @@
+{ 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";
+
+}
diff --git a/modules/core/packages/default.nix b/modules/core/packages/default.nix
new file mode 100644
index 0000000..a618b2f
--- /dev/null
+++ b/modules/core/packages/default.nix
@@ -0,0 +1,59 @@
+{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";
+ # };
+ };
+
+}
diff --git a/modules/core/packages/packages.nix b/modules/core/packages/packages.nix
new file mode 100644
index 0000000..139f30a
--- /dev/null
+++ b/modules/core/packages/packages.nix
@@ -0,0 +1,63 @@
+{ 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;
+
+ };
+
+
+}
diff --git a/modules/core/services.nix b/modules/core/services.nix
new file mode 100644
index 0000000..abdfec8
--- /dev/null
+++ b/modules/core/services.nix
@@ -0,0 +1,39 @@
+{ 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";
+
+}
diff --git a/modules/core/user.nix b/modules/core/user.nix
new file mode 100644
index 0000000..c3b5562
--- /dev/null
+++ b/modules/core/user.nix
@@ -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";
+
+}
diff --git a/packages/default.nix b/packages/default.nix
deleted file mode 100644
index 1d2c2f1..0000000
--- a/packages/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ pkgs, ... }:
-with pkgs;
-
-{
- environment.systemPackages = [
- # (callPackage ./lunarvim { })
- ];
- # programs.firefox.nativeMessagingHosts.packages = [
- # (callPackage ./vdhcoapp { })
- # ];
-}
diff --git a/programs/firefox.nix b/programs/firefox.nix
deleted file mode 100644
index 750c668..0000000
--- a/programs/firefox.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-pkgs: {
- enable = true;
- profiles = {
- nixos = {
- name = "NixOS Profile";
- settings = {
- "media.ffmpeg.vaapi.enabled" = true;
- "browser.startup.homepage" = "https://sashanoraa.gay/";
- "browser.cache.disk.capacity" = 536870912; # 1 GiB
- "extensions.pocket.enabled" = false;
- "browser.eme.ui.enabled" = false; # DRM popup
- "image.jxl.enabled" = true;
- "browser.aboutConfig.showWarning" = false;
- "browser.search.suggest.enabled" = false;
- };
- search.force = true;
- search.default = "NixOS Wiki";
- search.engines = {
- "YouTube" = {
- urls = [{
- template = "https://youtube.com/results";
- params = [
- { name = "search_query"; value = "{searchTerms}"; }
- { name = "page"; value = "{startPage}"; }
- ];
- }];
- iconUpdateURL = "https://www.youtube.com/favicon.ico";
- updateInterval = 7 * 24 * 60 * 60 * 1000; # every week
- definedAliases = [ "!yt" ];
- };
- "ArchWiki" = {
- urls = [{
- template = "https://wiki.archlinux.org/index.php";
- params = [
- { name = "search"; value = "{searchTerms}"; }
- { name = "title"; value = "Special:Search"; }
- ];
- }];
- iconUpdateURL = "https://wiki.archlinux.org/favicon.ico";
- updateInterval = 7 * 24 * 60 * 60 * 1000; # every week
- definedAliases = [ "!a" ];
- };
- "NixOS Wiki" = {
- urls = [{ template = "https://nixos.wiki/index.php?search={searchTerms}"; }];
- iconUpdateURL = "https://nixos.wiki/favicon.png";
- updateInterval = 7 * 24 * 60 * 60 * 1000; # every week
- definedAliases = [ "!nix" ];
- };
- "GitHub" = {
- urls = [
- {
- template = "https://github.com/search";
- params = [
- { name = "q"; value = "{searchTerms}"; }
- ];
- }
- ];
- iconUpdateURL = "https://github.com/favicon.ico";
- updateInterval = 7 * 24 * 60 * 60 * 1000; # every week
- definedAliases = [ "!gh" ];
- };
- "Wikipedia (en)".metaData.alias = "!w";
- "Google".metaData.alias = "!g";
- };
- };
- };
-}
diff --git a/programs/git.nix b/programs/git.nix
deleted file mode 100644
index 7f4f518..0000000
--- a/programs/git.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-pkgs: {
- enable = true;
- lfs.enable = true;
- package = pkgs.gitAndTools.gitFull;
- userName = "Serenity-F";
- userEmail = "serenity-amalgam@protonmail.com";
- extraConfig = {
- core.editor = "micro";
- init.defaultbranch = "main";
- pull.rebase = true;
- push.followTags = true;
- credential.helper = "libsecret";
- # delta.enable = true;
- # delta.options = {
- # features = "side-by-side line-numbers decorations";
- # plus-style = "syntax \"#003800\"";
- # minus-style = "syntax \"#3f0001\"";
- # syntax-theme = "Dracula";
- # decorations = {
- # commit-decoration-style = "bold yellow box ul";
- # file-style = "bold yellow ul";
- # file-decoration-style = "none";
- # hunk-header-decoration-style = "cyan box ul";
- # };
- # line-numbers = {
- # line-numbers-left-style = "cyan";
- # line-numbers-right-style = "cyan";
- # line-numbers-minus-style = "124";
- # line-numbers-plus-style = "28";
- # };
- # };
- };
-}
diff --git a/scripts/apply.sh b/scripts/apply.sh
deleted file mode 100755
index eac636c..0000000
--- a/scripts/apply.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-./install.sh
-./build.sh
-sudo nixos-rebuild switch
-if ! cmp -s "./hosts/$(hostname)/flake.lock" /etc/nixos/flake.lock; then
- sudo cp /etc/nixos/flake.lock "./hosts/$(hostname)/flake.lock"
-fi
diff --git a/scripts/build.sh b/scripts/build.sh
deleted file mode 100755
index 992e104..0000000
--- a/scripts/build.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-trap "git rm -f flake.lock" EXIT
-ln -s ./hosts/$(hostname)/flake.lock flake.lock
-git add flake.lock
-nom build ".#nixosConfigurations.$(hostname).config.system.build.toplevel"
diff --git a/scripts/install.sh b/scripts/install.sh
deleted file mode 100755
index 37f4297..0000000
--- a/scripts/install.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-sudo rsync -rla --delete --exclude=".*" . /etc/nixos
-sudo ln -s /etc/nixos/hosts/$(hostname)/hardware-configuration.nix /etc/nixos/hardware-configuration.nix
-sudo ln -s /etc/nixos/hosts/$(hostname)/flake.lock /etc/nixos/flake.lock
-if [ "$(hostname)" = "wyvern" ]; then
- sudo chown syncoid:syncoid /etc/nixos/secrets/turtle-backup.key
- sudo chown nebula-bbs:nebula-bbs /etc/nixos/secrets/ca.crt
- sudo chown nebula-bbs:nebula-bbs /etc/nixos/secrets/wyvern.bbs.lan.crt
- sudo chown nebula-bbs:nebula-bbs /etc/nixos/secrets/wyvern.bbs.lan.key
-fi
-
-mkdir -p ~/.ssh
-rsync -p --chmod=600 ./secrets/id_yubikey1_fido2 ~/.ssh/
-rsync -p --chmod=600 ./secrets/id_yubikey2_fido2 ~/.ssh/
-rsync -p --chmod=600 ./secrets/fallback ~/.ssh/
-
-mkdir -p ~/.config/sops/age
-rsync -p --chmod=600 ./secrets/sops-age-keys.txt ~/.config/sops/age/keys.txt
-
-sudo cp ./media/pfp.png /var/lib/AccountsService/icons/sasha
diff --git a/scripts/nixos-upgrade b/scripts/nixos-upgrade
deleted file mode 100755
index 63b0347..0000000
--- a/scripts/nixos-upgrade
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-set -euo pipefail
-
-nixcfg=~/Projects/nixcfg
-
-cd "$nixcfg"
-tmpdir="$(mktemp -d)"
-outdir="$tmpdir/out"
-trap "git rm -f --ignore-unmatch flake.lock" EXIT
-ln -s ./hosts/$(hostname)/flake.lock .
-git add flake.lock
-nix flake update
-nom build -o "$outdir" ".#nixosConfigurations.$(hostname).config.system.build.toplevel"
-nvd diff /run/current-system "$outdir"
-
-if [ "$#" -gt 0 ] && [ "$1" = "-y" ]; then
- echo 'Skipping prompt'
-else
- echo
- while true; do
- read -p 'Do you want to process with upgrade [Y/n]' yn
- case "$yn" in
- [Yy]* )
- break
- ;;
- [Nn]* )
- exit 1
- ;;
- "")
- break
- ;;
- * )
- ;;
- esac
- done
-fi
-
-echo Upgrading...
-
-# Do system upgrade
-sudo rsync -rl --delete --exclude=".*" . /etc/nixos
-sudo ln -s "/etc/nixos/hosts/$(hostname)/hardware-configuration.nix" /etc/nixos/hardware-configuration.nix
-sudo nixos-rebuild switch
-
-if [ $(git status --porcelain ./hosts/$(hostname)/flake.lock | wc -l) -gt 0 ]; then
- git rm -f flake.lock
- git add ./hosts/$(hostname)/flake.lock
- git commit -m "System upgrade $(hostname)"
-fi
diff --git a/scripts/show-upgrade b/scripts/show-upgrade
deleted file mode 100755
index 033047b..0000000
--- a/scripts/show-upgrade
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-set -euo pipefail
-
-nixcfg=~/Projects/nixcfg
-
-tempdir=$(mktemp -d /tmp/tmp.nix-updateinfo.XXX)
-git clone --reference "$nixcfg" "$nixcfg" "$tempdir"
-cd $tempdir
-nix flake lock --update-input nixpkgs
-nix build ".#nixosConfigurations.$(hostname).config.system.build.toplevel"
-nvd diff /run/current-system ./result
-
-cd ~-
-rm -rf "$tempdir"
diff --git a/users.nix b/users.nix
deleted file mode 100644
index 22c824e..0000000
--- a/users.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-
- imports = [
-
- # ./coffee.nix
- ./users/serenity.nix
-
- ];
-
- users = {
- defaultUserShell = pkgs.fish;
- };
-
-}
diff --git a/users/serenity.nix b/users/serenity.nix
deleted file mode 100644
index 0b7963b..0000000
--- a/users/serenity.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ ... }:
-
-{
- imports = [
- # ../desktops/gnome/gnome.nix
- ];
-
- users = {
- users.serenity = {
- description = "Serenity";
- home = "/home/serenity";
- createHome = true;
- initialPassword = "amogus";
- isNormalUser = true;
- extraGroups = [
- "wheel"
- "networkmanager"
- ];
- # packages = with pkgs; [
- # ];
- # openssh.authorizedkeys.keys =[
- # ];
- };
- };
-
- # home-manager = {
- # extraSpecialArgs = { inherit inputs outputs; };
- # users = {
- # Import your& home-manager configs
- # serenity = { pkgs, ... }:
-
- # {
- # import ../../home-manager/home.nix;
- # home = {
- # packages = with pkgs; [
- # micro
- # ];
- # stateVersion = "23.11";
- # };
- # };
- # };
- # };
-
- system.stateVersion = "23.11";
-}