Merge branch 'main' into feature/bash-blesh-starship

.drone.yml

@@ -111,9 +111,8 @@ steps:
       - nix run nixpkgs#gnused -- --in-place "s/$ISO_NAME/PubSolarOS-latest.iso/" PubSolarOS-latest.iso.sha256
 
   - name: "Publish ISO"
-    # custom drone-scp image, source: https://git.b12f.io/pub-solar/drone-scp/
+    # https://github.com/appleboy/drone-scp/pull/141 got merged, yay
-    # docker build --tag registry.greenbaum.cloud/library/drone-scp:v1.6.5 --file ./docker/Dockerfile.linux.amd64 .
+    image: appleboy/drone-scp:1.6.5-linux-amd64
-    image: registry.greenbaum.cloud/library/drone-scp:v1.6.5
     volumes:
       - name: file-exchange
         path: /var/nix/iso-cache
@@ -126,7 +125,7 @@ steps:
         from_secret: iso_web_ssh_port
       key:
         from_secret: iso_web_ssh_key
-      target: /srv/www/os/download
+      target: /data/srv/www/os/download
       source:
         - /var/nix/iso-cache/*.iso
         - /var/nix/iso-cache/*.iso.sha256
@@ -148,6 +147,6 @@ volumes:
 
 ---
 kind: signature
-hmac: 0c0994f0878cdb49172772f78c9a772f5c75830b49c1c22bd15db385fe857e17
+hmac: 6aee0ffe22111bb629c0a79940bfbc3fa75f68c5ed5c4bba68abf6797b87a7ab
 
 ...

.drone/setup_ssh.sh

@@ -1,11 +0,0 @@
-#!/usr/bin/env sh
-
-set -e
-
-# Setup ssh inside container
-mkdir -p ~/.ssh
-echo "$GITEA_SSH_KEY" > ~/.ssh/id_rsa
-echo "[git.b12f.io]:2222 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ4uaREL7acSSCNAX+voDYl1Kj7JipP62fR5x1UyGP9u" >> ~/.ssh/known_hosts
-echo "Host git.b12f.io" >> ~/.ssh/config
-echo "  Port 2222" >> ~/.ssh/config
-chmod -R 600 ~/.ssh

.drone/upstream-branch.sh

@@ -1,12 +0,0 @@
-#!/usr/bin/env sh
-
-set -e
-set -u
-
-LOCAL="$DRONE_BRANCH"
-[ "$LOCAL" = "main" ] && UPSTREAM=origin/devos || UPSTREAM=origin/main
-
-git fetch --all
-git checkout "$LOCAL"
-git merge "$UPSTREAM"
-git push origin "$LOCAL"

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,38 +0,0 @@
----
-name: Bug report
-about: Create a report to help improve
-title: ''
-labels: 'bug'
-assignees: ''
-
----
-
-Your issue may already be reported!
-Please search on the [issue tracker](../) before creating one.
-
-## Expected Behavior
-<!--- What should happen? -->
-<!--- How it should work? -->
-
-## Current Behavior
-<!--- What happens instead of the expected behavior? -->
-
-## Possible Solution
-<!--- Not obligatory, but suggest a fix/reason for the bug, -->
-<!--- or ideas how to implement the addition or change -->
-
-## Steps to Reproduce
-<!--- An unambiguous set of steps to reproduce this bug. -->
-<!--- Linked fork or gist if needed. -->
-1.
-2.
-3.
-4.
-
-## Context
-<!--- How has this issue affected you? What are you trying to accomplish? -->
-<!--- Providing context helps us come up with a solution that is most useful in the real world. -->
-
-## Your Environment
-<!--- Include relevant details about the environment you experienced the bug in. -->
-<!--- If you have run `bud update`, for example, post the flake.lock file. -->

.github/ISSUE_TEMPLATE/community_request.md

@@ -1,22 +0,0 @@
----
-name: Commuity Request
-about: inspire contribution to the `community` branch
-title: ''
-labels: 'community'
-assignees: ''
-
----
-
-Your issue may already be reported!
-Please search on the [issue tracker](../) before creating one.
-
-## Ideas
-<!--- The `community` branch is meant to provide various preconfigured system options, -->
-<!--- useful to all kinds of users. -->
-
-<!--- The point is to engage the community for what it thinks are -->
-<!--- sane defaults for various tools. -->
-
-## Requests
-<!--- Have a tool that you'd like to see a system profile for? -->
-<!--- Feel free to request it here. -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,24 +0,0 @@
----
-name: Feature request
-about: Suggest an idea
-title: ''
-labels: 'enhancement'
-assignees: ''
-
----
-
-Your issue may already be reported!
-Please search on the [issue tracker](../) before creating one.
-
-## Would your feature fix an existing issue?
-<!--- If your idea is related to, or resolves other issues, please mention. -->
-
-## Describe the solution you'd like
-<!--- What you want to happen. -->
-
-## Describe alternatives you've considered
-<!--- Any alternative solutions or features you've considered? -->
-
-## Additional context
-<!--- Is this feature only useful for a particular usecase? -->
-<!--- Please elaborate. -->

.github/ISSUE_TEMPLATE/upstream_notice.md

@@ -1,16 +0,0 @@
----
-name: Upstream notice (Issues or Changes)
-about: Create an upstream notice to help our research
-title: '[ <put the upstream project> ]: <topic>'
-labels: 'upstream'
-assignees: ''
-
----
-
-## Link
-<!-- just place a link to the upstream issue, or PR -->
-
-
-## Context
-<!-- We want to make this as cheap for you as possible.
-Context is not required but helpful -->

.github/workflows/check.yml

@@ -1,29 +0,0 @@
-name: "Check & Cachix"
-on:
-  push:
-    branches:
-      - main
-      - trying
-      - staging
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2.3.4
-    - uses: cachix/install-nix-action@v13
-      with:
-        install_url: https://github.com/numtide/nix-flakes-installer/releases/download/nix-2.4pre20210415_76980a1/install
-        extra_nix_config: |
-          experimental-features = nix-command flakes
-          system-features = nixos-test benchmark big-parallel kvm recursive-nix
-          substituters = https://nrdxp.cachix.org https://nix-community.cachix.org https://cache.nixos.org
-          trusted-public-keys = nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
-    - uses: cachix/cachix-action@v10
-      with:
-        name: nrdxp
-        signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
-        authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-    - run: nix -Lv flake check
-    - run: nix -Lv build ".#nixosConfigurations.NixOS.config.system.build.toplevel"
-    - run: nix -Lv develop -c echo OK
-    - run: nix -Lv develop --command bud --help

.github/workflows/mdbook_docs.yml

@@ -1,27 +0,0 @@
-name: Deploy Docs to GitHub Pages
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  deploy:
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Setup mdBook
-        uses: peaceiris/actions-mdbook@v1
-        with:
-          mdbook-version: 'latest'
-
-      - run: mdbook build doc
-
-      - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_branch: gh-pages
-          publish_dir: ./doc/book
-          cname: devos.divnix.com

.github/workflows/release.yml

@@ -1,71 +0,0 @@
-name: Release
-
-on:
-  push:
-    tags:
-      - v*
-
-jobs:
-  changelog:
-    name: Update Changelog
-    runs-on: ubuntu-latest
-    steps:
-      - name: Get version from tag
-        env:
-          GITHUB_REF: ${{ github.ref }}
-        run: |
-          export CURRENT_VERSION=${GITHUB_TAG/refs\/tags\/v/}
-          echo "CURRENT_VERSION=$CURRENT_VERSION" >> $GITHUB_ENV
-      - name: Checkout code
-        uses: actions/checkout@v2
-        with:
-          ref: main
-      - name: Update Changelog
-        uses: heinrichreimer/github-changelog-generator-action@v2.1.1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          issues: false
-          issuesWoLabels: false
-          pullRequests: true
-          prWoLabels: true
-          addSections: '{"documentation":{"prefix":"**Documentation:**","labels":["documentation"]}}'
-      - uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: Update Changelog for tag ${{ env.CURRENT_VERSION }}
-          file_pattern: CHANGELOG.md
-
-  release_notes:
-    name: Create Release Notes
-    runs-on: ubuntu-latest
-    needs: changelog
-    steps:
-      - name: Get version from tag
-        env:
-          GITHUB_REF: ${{ github.ref }}
-        run: |
-          export CURRENT_VERSION=${GITHUB_TAG/refs\/tags\/v/}
-          echo "CURRENT_VERSION=$CURRENT_VERSION" >> $GITHUB_ENV
-
-      - name: Checkout code
-        uses: actions/checkout@v2
-        with:
-          ref: main
-
-      - name: Get Changelog Entry
-        id: changelog_reader
-        uses: mindsers/changelog-reader-action@v1
-        with:
-          version: ${{ env.CURRENT_VERSION }}
-          path: ./CHANGELOG.md
-
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
-          body: ${{ steps.changelog_reader.outputs.log_entry }}
-          draft: false
-          prerelease: false

default.nix

@@ -5,7 +5,6 @@ let
 
   ciSystems = [
     "aarch64-linux"
-    "i686-linux"
     "x86_64-linux"
   ];
 

doc/api-reference.md

@@ -59,5 +59,5 @@ list of strings
 _*Default*_
 
 ```
-["aarch64-linux","aarch64-darwin","i686-linux","x86_64-darwin","x86_64-linux"]
+["aarch64-linux","aarch64-darwin","x86_64-darwin","x86_64-linux"]
 ```

doc/book.toml

@@ -1,5 +1,9 @@
 [book]
-authors = ["Timothy DeHerrera"]
+authors = [
+  "Timothy DeHerrera",
+  "Parthiv Seetharaman",
+  "David Arnold",
+]
 language = "en"
 multilingual = false
 src = "."

doc/concepts/users.md

@@ -9,8 +9,7 @@
 Users are a special case of [profiles](profiles.md) that define system
 users and [home-manager][home-manager] configurations. For your convenience,
 home manager is wired in by default so all you have to worry about is declaring
-your users. For a fully fleshed out example, check out the developers personal
+your users.
-[branch](https://github.com/divnix/devos/tree/nrd/users/nrd/default.nix).
 
 ## Basic Usage
 
@@ -60,18 +59,6 @@ using the `homeConfigurations` flake output.
 This is great for keeping your environment consistent across Unix-like systems,
 including macOS.
 
-### From within the projects devshell:
-
-```sh
-# builds the pub-solar user defined in the PubSolarOS host
-nix build '.#homeConfigurations."pub-solar@PubSolarOS".activationPackage'
-
-# build and activate
-nix build '.#homeConfigurations."pub-solar@PubSolarOS".activationPackage' && ./result/activate && unlink result
-```
-
-### Manually from outside the project:
-
 ```sh
 # build
 nix build "github:divnix/devos#homeConfigurations.nixos@NixOS.home.activationPackage"
@@ -81,5 +68,5 @@ nix build "github:divnix/devos#homeConfigurations.nixos@NixOS.home.activationPac
 ```
 
 [home-manager]: https://nix-community.github.io/home-manager
-[modules-list]: https://github.com/divnix/devos/tree/main/users/modules/module-list.nix
+[modules-list]: https://github.com/divnix/digga/tree/main/users/modules/module-list.nix
 [portableuser]: https://digga.divnix.com/api-reference-home.html#homeusers

doc/start/index.md

@@ -4,7 +4,8 @@ The only dependency is nix, so make sure you have it [installed][install-nix].
 
 ## Get the Template
 
-If you currently don't have flakes setup, you can utilize the digga shell to pull the template:
+If you currently don't have flakes setup, you can utilize the digga shell to
+pull the template:
 
 ```sh
 nix-shell "https://github.com/divnix/digga/archive/main.tar.gz" \
@@ -22,37 +23,26 @@ Then make sure to create the git repository:
 ```sh
 git init
 git add .
-git commit -m init
+git commit
 ```
 
-To drop into a nix-shell, if you don't have flakes setup, use the digga shell to create a `flake.lock`:
+Finally, run `nix-shell` to get to an interactive shell with all the
-
+dependencies, including the unstable nix version required. You can run `menu` to
-```sh
+confirm that you are using digga (expected output includes [docs], [general
-nix-shell "https://github.com/divnix/digga/archive/main.tar.gz" \
+commands], [linter], etc.).
-  --run "nix flake lock"
-```
-
-Or if you do have flakes support, just run:
-
-```sh
-nix flake lock
-```
-
-Finally, run `nix-shell` to get to an interactive shell with all the dependencies, including the unstable nix
-version required. You can run `menu` to confirm that you are using digga (expected output includes [docs], [general commands], [linter], etc.).
 
 In addition, the [binary cache](../integrations/cachix.md) is added for faster deployment.
 
-> ##### _Notes:_
+> # _Notes:_
 >
 > - Flakes ignore files that have not been added to git, so be sure to stage new
 >   files before building the system.
 > - You can choose to simply clone the repo with git if you want to follow
 >   upstream changes.
-> - If the `nix-shell -p cachix --run "cachix use nrdxp"` line doesn't work
+> - If the `nix-shell -p cachix --run "cachix use nrdxp"` line doesn't work you
->   you can try with sudo: `sudo nix-shell -p cachix --run "cachix use nrdxp"`
+>   can try with sudo: `sudo nix-shell -p cachix --run "cachix use nrdxp"`
 
-## Next Steps:
+## Next Steps
 
 - [Make installable ISO](./iso.md)
 

doc/tests.md

@@ -14,12 +14,21 @@ be built during CI.
 
 ## Integration Tests
 
-All your profiles defined in suites will be tested in a NixOS VM.
+All your profiles defined in suites can be tested against an individual host.
+Simply use digga's pre-baked `digga.lib.allProfilesTest` like so:
+
+```nix
+{
+  hosts = {
+    Morty.tests = [ allProfilesTest ];
+  };
+}
+```
 
 You can write integration tests for one or more NixOS VMs that can,
 optionally, be networked together, and yes, it's as awesome as it sounds!
 
-Be sure to use the `mkTest` function from digga, `digga.lib.pkgs-lib.mkTest`
+Be sure to use the `mkTest` function from Digga, `digga.lib.mkTest`
 which wraps the official [testing-python][testing-python] function to ensure
 that the system is setup exactly as it is for a bare DevOS system. There are
 already great resources for learning how to use these tests effectively,
@@ -28,7 +37,7 @@ and the examples in [nixpkgs][nixos-tests].
 
 [test-doc]: https://nixos.org/manual/nixos/stable/index.html#sec-nixos-tests
 [test-blog]: https://www.haskellforall.com/2020/11/how-to-use-nixos-for-lightweight.html
-[default]: https://github.com/divnix/devos/tree/main/tests/default.nix
+[default]: https://github.com/divnix/devos/tree/core/tests/default.nix
 [run-test]: https://github.com/NixOS/nixpkgs/blob/6571462647d7316aff8b8597ecdf5922547bf365/lib/debug.nix#L154-L166
 [nixos-tests]: https://github.com/NixOS/nixpkgs/tree/master/nixos/tests
 [testing-python]: https://github.com/NixOS/nixpkgs/tree/master/nixos/lib/testing-python.nix

flake.lock

@@ -282,18 +282,6 @@
         "type": "github"
       }
     },
-    "nur": {
-      "locked": {
-        "lastModified": 0,
-        "narHash": "sha256-koC6DBYmLCrgXA+AMHVaODf1uHYPmvcFygHfy3eg6vI=",
-        "path": "/nix/store/6mfkswqi67m35qwv0vh7kpk8rypbl2rq-source",
-        "type": "path"
-      },
-      "original": {
-        "id": "nur",
-        "type": "indirect"
-      }
-    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -304,8 +292,7 @@
         "home": "home",
         "latest": "latest",
         "nixos": "nixos",
-        "nixos-hardware": "nixos-hardware",
+        "nixos-hardware": "nixos-hardware"
-        "nur": "nur"
       }
     },
     "utils": {

flake.nix

@@ -2,8 +2,6 @@
   description = "A highly structured configuration database.";
 
   nixConfig.extra-experimental-features = "nix-command flakes";
-  nixConfig.extra-substituters = "https://nix-dram.cachix.org https://dram.cachix.org  https://nrdxp.cachix.org https://nix-community.cachix.org";
-  nixConfig.extra-trusted-public-keys = "nix-dram.cachix.org-1:CKjZ0L1ZiqH3kzYAZRt8tg8vewAx5yj8Du/+iR8Efpg= dram.cachix.org-1:baoy1SXpwYdKbqdTbfKGTKauDDeDlHhUpC+QuuILEMY= nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=";
 
   inputs = {
     # Track channels with commits tested and built by hydra
@@ -44,7 +42,6 @@
     nixos,
     home,
     nixos-hardware,
-    nur,
     agenix,
     deploy,
     ...
@@ -76,7 +73,6 @@
             our = self.lib;
           });
         })
-        nur.overlay
         agenix.overlays.default
 
         (import ./pkgs)
@@ -101,9 +97,7 @@
 
         imports = [(digga.lib.importHosts ./hosts)];
         hosts = {
-          /*
+          # Set host-specific properties here
-          set host specific properties here
-          */
           bootstrap = {
             modules = [
               digga.nixosModules.bootstrapIso

lib/default.nix

@@ -1,2 +1,10 @@
 {lib}:
-lib.makeExtensible (self: {})
+lib.makeExtensible (self: let
+  callLibs = file: import file {lib = self;};
+in rec {
+  ## Define your own library functions here!
+  #id = x: x;
+  ## Or in files, containing functions that take {lib}
+  #foo = callLibs ./foo.nix;
+  ## In configs, they can be used under "lib.our"
+})

modules/audio/default.nix

@@ -96,7 +96,13 @@ in {
     };
 
     # Enable bluetooth
-    hardware.bluetooth.enable = mkIf cfg.bluetooth.enable true;
+    hardware.bluetooth = mkIf cfg.bluetooth.enable {
+      enable = true;
+      # disable useless SIM Access Profile plugin
+      disabledPlugins = [
+        "sap"
+      ];
+    };
     services.blueman.enable = mkIf cfg.bluetooth.enable true;
 
     # Enable audio server & client

modules/core/boot.nix

@@ -33,10 +33,10 @@ in {
         };
       };
 
-      loader.systemd-boot.enable = true;
+      loader.systemd-boot.enable = lib.mkDefault true;
 
       # Use latest LTS linux kernel by default
-      kernelPackages = pkgs.linuxPackages_5_15;
+      kernelPackages = lib.mkDefault pkgs.linuxPackages_5_15;
 
       # Support ntfs drives
       supportedFilesystems = ["ntfs"];

modules/core/hibernation.nix

@@ -15,8 +15,8 @@ in {
     };
 
     resumeDevice = mkOption {
-      type = types.str;
+      type = types.nullOr types.str;
-      default = "/dev/sda1";
+      default = null;
       description = "The location of the hibernation resume swap file.";
     };
 
@@ -29,7 +29,7 @@ in {
 
   config = {
     boot = mkIf cfg.enable {
-      resumeDevice = cfg.resumeDevice;
+      resumeDevice = mkIf (cfg.resumeDevice != null) cfg.resumeDevice;
       kernelParams = mkIf (cfg.resumeOffset != null) ["resume_offset=${builtins.toString cfg.resumeOffset}"];
     };
   };

modules/core/nix.nix

@@ -15,13 +15,14 @@
       auto-optimise-store = true;
       # Prevents impurities in builds
       sandbox = true;
-      # give root and @wheel special privileges with nix
+      # Give root and @wheel special privileges with nix
       trusted-users = ["root" "@wheel"];
-      # This is just a representation of the nix default
+      # Allow only group wheel to connect to the nix daemon
-      system-features = ["nixos-test" "benchmark" "big-parallel" "kvm"];
+      allowed-users = ["@wheel"];
     };
     # Generally useful nix option defaults
-    extraOptions = ''
+    extraOptions = lib.mkForce ''
+      experimental-features = flakes nix-command
       min-free = 536870912
       keep-outputs = true
       keep-derivations = true

modules/core/services.nix

@@ -10,7 +10,7 @@
     # If you don't want the host to have SSH actually opened up to the net,
     # set `services.openssh.openFirewall` to false in your config.
     openFirewall = lib.mkDefault true;
-    passwordAuthentication = false;
+    passwordAuthentication = lib.mkDefault false;
   };
 
   # Service that makes Out of Memory Killer more effective

modules/docker-ci-runner/default.nix

@@ -1,7 +1,11 @@
-{ lib, config, pkgs, self, ... }:
+{
-
+  lib,
-with lib;
+  config,
-let
+  pkgs,
+  self,
+  ...
+}:
+with lib; let
   bootstrap = pkgs.writeScript "bootstrap.sh" ''
     #!/usr/bin/env bash
 
@@ -23,7 +27,7 @@ let
 
     export nix_user_config_file="/home/build/.local/share/nix/trusted-settings.json"
     mkdir -p $(dirname \\$nix_user_config_file)
-    echo '{"extra-experimental-features":{"nix-command flakes":true},"extra-substituters":{"https://nix-dram.cachix.org https://dram.cachix.org  https://nrdxp.cachix.org https://nix-community.cachix.org":true},"extra-trusted-public-keys":{"nix-dram.cachix.org-1:CKjZ0L1ZiqH3kzYAZRt8tg8vewAx5yj8Du/+iR8Efpg= dram.cachix.org-1:baoy1SXpwYdKbqdTbfKGTKauDDeDlHhUpC+QuuILEMY= nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=":true}}' > \\$nix_user_config_file
+    echo '{"extra-experimental-features":{"nix-command flakes":true}}' > \\$nix_user_config_file
     chown -R build /home/build/
 
     curl -L https://github.com/drone-runners/drone-runner-exec/releases/latest/download/drone_runner_exec_linux_amd64.tar.gz | tar xz
@@ -40,8 +44,7 @@ let
   '';
   psCfg = config.pub-solar;
   cfg = config.pub-solar.docker-ci-runner;
-in
+in {
-{
   options.pub-solar.docker-ci-runner = {
     enable = lib.mkEnableOption "Enables a docker container running a drone exec runner as unprivileged user.";
 
@@ -88,7 +91,7 @@ in
           image = "debian";
           autoStart = true;
           entrypoint = "bash";
-          cmd = [ "/bootstrap.sh" ];
+          cmd = ["/bootstrap.sh"];
 
           volumes = [
             "${cfg.runnerVarsFile}:/run/vars"
@@ -98,7 +101,7 @@ in
 
           environment = cfg.runnerEnvironment;
 
-          extraOptions = lib.mkIf cfg.enableKvm [ "--device=/dev/kvm" ];
+          extraOptions = lib.mkIf cfg.enableKvm ["--device=/dev/kvm"];
         };
       };
     };

modules/terminal-life/default.nix

@@ -66,6 +66,7 @@ in {
         programs.neovim = import ./nvim {
           inherit config;
           inherit pkgs;
+          inherit lib;
         };
       };
   };

modules/terminal-life/nvim/default.nix

@@ -1,6 +1,7 @@
 {
   config,
   pkgs,
+  lib,
   ...
 }: let
   psCfg = config.pub-solar;
@@ -42,7 +43,9 @@ in {
       universal-ctags
     ];
 
-  plugins = with pkgs.vimPlugins; [
+  plugins = with pkgs.vimPlugins;
+    []
+    ++ lib.optionals (!cfg.lite) [
       nvim-cmp
       cmp-nvim-lsp
       cmp_luasnip

modules/terminal-life/nvim/preview-file.nix

@@ -31,6 +31,6 @@ with self; ''
     --style="''${BAT_STYLE:-numbers}" \
     --color=always \
     --pager=never \
-    --file-name=''$FILE \
+    --file-name="''$FILE" \
     --highlight-line=$CENTER
 ''

overlays/waybar.nix

@@ -0,0 +1,5 @@
+channels: final: prev: {
+  waybar = channels.latest.waybar.overrideAttrs (oldAttrs: rec {
+    inherit (prev.sources.waybar-nvfetcher) version src;
+  });
+}

pkgs/_sources/generated.nix

@@ -6,13 +6,13 @@
 }: {
   F-Sy-H = {
     pname = "F-Sy-H";
-    version = "b935a87a75560f8173dd78deee6717c59d464e06";
+    version = "899f68b52b6b86a36cd8178eb0e9782d4aeda714";
     src = fetchFromGitHub {
       owner = "z-shell";
       repo = "F-Sy-H";
-      rev = "b935a87a75560f8173dd78deee6717c59d464e06";
+      rev = "899f68b52b6b86a36cd8178eb0e9782d4aeda714";
       fetchSubmodules = false;
-      sha256 = "sha256-448OlDnrDkUjvaSLDhXsa9bkgYXzj1Ju8CTpJVjH8LM=";
+      sha256 = "sha256-zhaXjrNL0amxexbZm4Kr5Y/feq1+2zW0O6eo9iZhmi0=";
     };
   };
   blesh-nvfetcher = {
@@ -52,35 +52,35 @@
   };
   ohmyzsh = {
     pname = "ohmyzsh";
-    version = "5cb943eea46d322542c5c2a9f54b201eddc2aa67";
+    version = "b602e0a066d8c98e8c02201ad16c764447fd8531";
     src = fetchFromGitHub {
       owner = "ohmyzsh";
       repo = "ohmyzsh";
-      rev = "5cb943eea46d322542c5c2a9f54b201eddc2aa67";
+      rev = "b602e0a066d8c98e8c02201ad16c764447fd8531";
       fetchSubmodules = false;
-      sha256 = "sha256-Edxhyogl5evjmzyWvImnIpNo91ksvUgQtcuuY50L6c8=";
+      sha256 = "sha256-O4thanOQpX/DHPdfW2p/RUXzIPj6GUp9EnKJfkh7yQM=";
     };
   };
   powerlevel10k = {
     pname = "powerlevel10k";
-    version = "8091c8a3a8a845c70046684235a01cd500075def";
+    version = "a30145b0f82d06770e924e9eac064ed223a94e6b";
     src = fetchFromGitHub {
       owner = "romkatv";
       repo = "powerlevel10k";
-      rev = "8091c8a3a8a845c70046684235a01cd500075def";
+      rev = "a30145b0f82d06770e924e9eac064ed223a94e6b";
       fetchSubmodules = false;
-      sha256 = "sha256-I0/tktXCbZ3hMYTNvPoWfOEYWRgmHoXsar/jcUB6bpo=";
+      sha256 = "sha256-jnZXLrywUrJgTX1tFpoNH94r/jcGl2P6R7DoedluHxQ=";
     };
   };
   rnix-lsp-nvfetcher = {
     pname = "rnix-lsp-nvfetcher";
-    version = "6925256babec4307479a4080b44f2be38056f210";
+    version = "95d40673fe43642e2e1144341e86d0036abd95d9";
     src = fetchFromGitHub {
       owner = "nix-community";
       repo = "rnix-lsp";
-      rev = "6925256babec4307479a4080b44f2be38056f210";
+      rev = "95d40673fe43642e2e1144341e86d0036abd95d9";
       fetchSubmodules = false;
-      sha256 = "sha256-OKLyIXIXhUnRB3Xw+7zI3u6XkwF7Mrbfz1XaasV6i7Q=";
+      sha256 = "sha256-F0s0m62S5bHNVWNHLZD6SeHiLrsDx98VQbRjDyIu+qQ=";
     };
   };
   vim-apprentice-nvfetcher = {
@@ -138,6 +138,17 @@
       sha256 = "sha256-fhazQQqyFaO0fdoeNI9nBshwTDhKNHH262H/QThtuO0=";
     };
   };
+  waybar-nvfetcher = {
+    pname = "waybar-nvfetcher";
+    version = "09142fa322e080474de0f2dc3ea98036846550df";
+    src = fetchFromGitHub {
+      owner = "Alexays";
+      repo = "Waybar";
+      rev = "09142fa322e080474de0f2dc3ea98036846550df";
+      fetchSubmodules = false;
+      sha256 = "sha256-5KqQaaKwW14F/rVWGQ0qBUU0b3Z+v/Mq8lnSwqLtT7U=";
+    };
+  };
   zsh-nix-shell = {
     pname = "zsh-nix-shell";
     version = "af6f8a266ea1875b9a3e86e14796cadbe1cfbf08";

pkgs/sources.toml

@@ -47,6 +47,10 @@ fetch.github = "zeekay/vim-beautify"
 src.git = "https://github.com/romainl/Apprentice"
 fetch.github = "romainl/Apprentice"
 
+[waybar-nvfetcher]
+src.git = "https://github.com/Alexays/Waybar"
+fetch.github = "Alexays/Waybar"
+
 [blesh-nvfetcher]
 src.git = "https://github.com/akinomyoga/ble.sh"
 fetch.github = "akinomyoga/ble.sh"

profiles/base-user/.config/waybar/config

@@ -26,8 +26,22 @@
     "spacing": 10
   },
   "clock": {
-    "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+      "tooltip-format": "<tt><small>{calendar}</small></tt>",
-    "format-alt": "{:%a %d. %h %H:%M}"
+      "format-alt": "{:%a %d. %h %H:%M}",
+      //"on-scroll": {
+      //    "calendar": 1
+      //}
+      "calendar": {
+          "mode-mon-col"  : 3,
+          "on-scroll": -1,
+          "on-click-right": "mode",
+          "format": {
+              "months":     "<span color='#ffead3'><b>{}</b></span>",
+              "days":       "<span color='#ecc6d9'><b>{}</b></span>",
+              "weekdays":   "<span color='#ffcc66'><b>{}</b></span>",
+              "today":      "<span color='#ff6699'><b><u>{}</u></b></span>"
+          },
+      },
   },
   "backlight": {
     // "device": "acpi_video1",

profiles/base-user/.config/waybar/style.css

@@ -6,7 +6,7 @@
 }
 
 window#waybar {
-    font-family: Hack;
+    font-family: Hack, FontAwesome;
     font-weight: 500;
     font-size: 14px;
     background: rgba(11, 12, 13, 0.90);

profiles/base-user/session-variables.nix

@@ -83,6 +83,9 @@
 
     # TELEMETRY BS
     VUEDX_TELEMETRY = "off";
+
+    # FZF shell history widget default colors
+    FZF_DEFAULT_OPTS = "--color=bg+:#2d2a2e,bg:#1a181a,spinner:#ef9062,hl:#7accd7 --color=fg:#d3d1d4,header:#7accd7,info:#e5c463,pointer:#ef9062 --color=marker:#ef9062,fg+:#d3d1d4,prompt:#e5c463,hl+:#7accd7";
   };
 
   envListNames = lib.attrsets.mapAttrsToList (name: value: name) variables;

profiles/cachix/default.nix

@@ -1,13 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}: let
-  folder = ./.;
-  toImport = name: value: folder + ("/" + name);
-  filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key && key != "default.nix";
-  imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
-in {
-  inherit imports;
-  nix.settings.substituters = ["https://cache.nixos.org/"];
-}

profiles/cachix/nix-community.nix

@@ -1,10 +0,0 @@
-{
-  nix.settings = {
-    substituters = [
-      "https://nix-community.cachix.org"
-    ];
-    trusted-public-keys = [
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-    ];
-  };
-}

profiles/cachix/nrdxp.nix

@@ -1,10 +0,0 @@
-{
-  nix.settings = {
-    substituters = [
-      "https://nrdxp.cachix.org"
-    ];
-    trusted-public-keys = [
-      "nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4="
-    ];
-  };
-}

profiles/full-install/default.nix

@@ -7,8 +7,6 @@
 }: let
   inherit (lib) fileContents;
 in {
-  imports = [../cachix];
-
   config = {
     pub-solar.audio.mopidy.enable = true;
     pub-solar.audio.bluetooth.enable = true;

profiles/pub-solar-iso/default.nix

@@ -7,7 +7,6 @@
 }: let
   inherit (lib) fileContents;
 in {
-  imports = [../cachix];
   config = {
     pub-solar.graphical.wayland.software-renderer.enable = true;
     pub-solar.sway.terminal = "foot";

shell/devos.nix

@@ -8,11 +8,11 @@
   inherit
     (pkgs)
     agenix
+    alejandra
     cachix
     editorconfig-checker
-    mdbook
     nix
-    alejandra
+    nodePackages
     nvfetcher
     shellcheck
     shfmt
@@ -25,21 +25,23 @@
     prettier
     ;
 
-  hooks = import ./hooks;
-
   pkgWithCategory = category: package: {inherit package category;};
   devos = pkgWithCategory "devos";
-  linter = pkgWithCategory "linter";
+  formatter = pkgWithCategory "linter";
-  docs = pkgWithCategory "docs";
 in {
-  _file = toString ./.;
+  imports = ["${extraModulesPath}/git/hooks.nix" ./hooks];
-
-  imports = ["${extraModulesPath}/git/hooks.nix"];
-  git = {inherit hooks;};
 
   # override for our own welcome
   devshell.name = pkgs.lib.mkForce "PubSolarOS";
 
+  packages = [
+    alejandra
+    editorconfig-checker
+    nodePackages.prettier
+    shellcheck
+    shfmt
+  ];
+
   commands = with pkgs;
     [
       (devos nix)
@@ -50,14 +52,7 @@ in {
         help = pkgs.nvfetcher.meta.description;
         command = "cd $PRJ_ROOT/pkgs; ${pkgs.nvfetcher}/bin/nvfetcher -c ./sources.toml $@";
       }
-      (linter alejandra)
+      (formatter treefmt)
-      (linter editorconfig-checker)
-      (linter nodePackages.prettier)
-      (linter shfmt)
-      (linter shellcheck)
-      (linter treefmt)
-
-      (docs mdbook)
     ]
     ++ lib.optionals (!pkgs.stdenv.buildPlatform.isi686) [
       (devos cachix)

shell/hooks/default.nix

@@ -1,4 +1,6 @@
 {
+  git.hooks = {
     enable = true;
     pre-commit.text = builtins.readFile ./pre-commit.sh;
+  };
 }