Den refactor

.github/workflows/update.yml

@@ -0,0 +1,19 @@
+name: update-flake-lock
+on:
+  workflow_dispatch: # allows manual triggering
+  pull_request: # triggers on every Pull Request
+  #push: # Triggers on every push 
+  schedule:
+    - cron: '0 0 * * SAT' # runs weekly on Saturdays at midnight
+
+jobs:
+  lockfile:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Install Determinate Nix
+        uses: DeterminateSystems/determinate-nix-action@v3
+      - name: Update flake.lock
+        if: ${{ github.event_name != 'pull_request' }}
+        uses: DeterminateSystems/update-flake-lock@main

.github/workflows/workflow.yml

@@ -1,21 +1,28 @@
-name: update-flake-lock
 on:
-  workflow_dispatch: # allows manual triggering
-  pull_request: # triggers on every Pull Request
-  #push: # Triggers on every push 
-  schedule:
-    - cron: '0 0 * * *' # runs daily  at 00:00
-
+  pull_request:
+  push:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 jobs:
-  lockfile:
-    runs-on: ubuntu-latest
+  flake-check:
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+    name: Nix flake check ${{matrix.os}}
+    runs-on: ${{matrix.os}}
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Install Determinate Nix
-        uses: DeterminateSystems/determinate-nix-action@v3
-      - name: Update flake.lock
-        if: ${{ github.event_name != 'pull_request' }}
-        uses: DeterminateSystems/update-flake-lock@main
-
-# Credits: https://github.com/DeterminateSystems/update-flake-lock
+      - uses: wimpysworld/nothing-but-nix@main
+        if: matrix.os == 'ubuntu-latest'
+      - uses: DeterminateSystems/nix-installer-action@main
+      - uses: DeterminateSystems/magic-nix-cache-action@main
+      - uses: actions/checkout@v5
+      - run: nix flake metadata
+      - run: |
+          cat <<-EOF > modules/ci-runtime.nix
+          {
+            _module.args.CI = true;
+          }
+          EOF
+      - run: nix fmt
+      - run: nix flake check

.gitignore

@@ -6,4 +6,6 @@ system/modified
 **/*.env
 **/wpa_*
 secrets/keys.txt
-**/obsolete
+**/obsolete
+*qcow*
+*result*

README.md

@@ -1,105 +1,47 @@
 # dotfiles
 
-This repository hosts my dotfiles and configs for various applications on NixOS. Heavily WIP and continually evolving.
+My dotfiles for NixOS, with a focus on simplicity. Based on [`denful/den`](https://github.com/denful/den). Personalised for gaming, software and scientific development.
 
-I will try to remember to give credits and links where possible but I'll probably forget.
+## Hosts
 
-
-## Screenshots
-
-TBD
-
-## How the repository is structured
-
-This structure was heavily inspired, and was based on [Misterio77's nix-starter-configs](https://github.com/Misterio77/nix-starter-configs). This was extremely helpful in getting me to have a refactored and cleaner NixOS setup.
-
-```
-.
-├── hm/
-│   ├── common/
-│   │   ├── packages/
-│   │   │   └── # A set of common packages I share across my users where no configuration is required
-│   │   └── modules/
-│   │       └── # A set of common configurations for programs I share across my users
-│   ├── chunix/
-│       ├── home.nix
-│       └── ...
-│
-├── overlays # a set of overlays
-├── system/
-│   ├── common/
-│   │   └── # A set of common packages/configurations I share across my systems
-│   ├── yoga # configuration for my Yoga C940
-│   └── legion # Configuration for my Legion 5 Pro Gen 7 (WIP)
-├── docs/
-│   └── ... # website for dotfiles
-├── Pictures/
-│   └── ...
-├── flake.nix
-├── flake.lock
-└── install.sh # OBSOLETE
-```
-
-
-## Installation Instructions
-
-This NixOS setup integrates `home-manager` into the system configuration so that all users can simply be updated with `sudo nixos-rebuild switch .#<hostname>`.
-
-1. Whether you're booting from scratch or not, you need `git` (or just have the repo locally). If you don't have git, you can temporarily invoke it with `nix-shell -p git --run "git clone https://github.com/chpxu/dotfiles"` and it will clone the repo into a folder called `dotfiles` in your present working directory.
-2. Make any necessary changes to the configuration. For example:
-
-   - Secrets and networking. These will be invalid since they depend on SSH keys, so you will want to remove it and the configuration in `system/common/modules/networking.nix`.
-   - Hostnames and usernames.
-   - Installed programs and their settings.
-
-3. Make sure everything is saved. If you are intending to push to a git repo, make sure to `git add .` first. Then you can run `sudo nixos-rebuild switch .#<hostname>` or some variation to build.
-
-You will be successful if everything you wanted installed, installs and is configured appropriately. The home-manager configuration will also be successfully built if you see `home-manager.<user>.service` was successfully (re)started. You can check its status with `systemctl status home-manager.<user>.service`.
-
-## Themes, Icons and Colour Palette
-
-These dotfiles uses the Nord theme.
-
-1. The [Nord colour palette](https://nordtheme.com).
-2. The GTK theme [Nordic](https://www.gnome-look.org/p/1267246/) by @EliverLara.
-   Follow the instructions on the page to use the GTK3/4 theme.
-3. I use the [Fira Code Retina Nerd](https://github.com/ryanoasis/nerd-fonts/tree/master/patched-fonts/FiraCode) and [Source Code Pro](https://github.com/adobe-fonts/source-code-pro) fonts. Both are TTFs.
-4. I use the [Nordzy](https://github.com/alvatip/Nordzy-icon) icon theme.
-5. I use [Nordzy-cursors](https://www.gnome-look.org/p/1571937) as my cursor theme.
+- `saitama`: AMD Ryzen 5600X + RTX 5070
+- `jingliu`: Intel i7-12700H + Nvidia RTX 3070 Ti "Advanced Optimus" laptop
+- `yoga`: Lenovo Yoga C940 (i7-1065G7)
+- `walworth`: work device (WSL)
 
 ## Programs and Applications
 
-These are the main applications and programs I use. Everything has been
-installed from `nixos-unstable` by default unless mentioned otherwise. WIP.
+These are the main applications and programs I use. Everything has been installed from `nixos-unstable` by default unless mentioned otherwise.
 
 ### Applications
 
 - [firefox-dev-edition](https://www.mozilla.org/en-GB/firefox/developer/)
 - [gimp 3.x](https://gimp.org)
 - [inkscape](https://inkscape.org)
-- [vscode-fhs](https://code.visualstudio.com)
-- [discord-canary](https://discord.com)
+- [nix4nvchad](https://nix-community.github.io/nix4nvchad/introduction.html)
+- [vscodium-fhs](https://github.com/VSCodium/vscodium)
+- [vesktop](https://vesktop.dev/) with [system24 nord theme](https://github.com/refact0r/system24)
 - [mpv](https://mpv.io)
 - [imv](https://sr.ht/~exec64/imv/)
-- [rnote](https://github.com/flxzt/rnote)
 - [zathura](https://pwmt.org/projects/zathura/)
 - [libreoffice-fresh](https://libreoffice.org)
 - [zotero](https://zotero.org)
 - [logseq](https://logseq.com)
 - [pdfarranger](https://github.com/pdfarranger/pdfarranger)
 - [thunderbird](https://www.thunderbird.net)
 - [bitwarden](https://bitwarden.com/)
-- [yazi](https://yazi-rs.github.io/)
 - [steam](https://store.steampowered.com/)
 - [Mullvad](https://mullvad.net)
+
 ### Environment programs
 
 Applications or programs which affect my workspace
 
 - [Hyprland](https://hyprland.org)
-   - Plugins: [hyprsplit](https://github.com/shezdy/hyprsplit). [hyprexpo](https://github.com/hyprwm/hyprland-plugins/tree/main/hyprexpo)
-- [wpaperd](https://github.com/danyspin97/wpaperd)
+  - Plugins: [hyprsplit](https://github.com/shezdy/hyprsplit).
+- [awww](https://codeberg.org/LGFae/awww)
 - [waybar](https://github.com/Alexays/Waybar) (built with `-Dexperimental=true`)
+- [yazi](https://yazi-rs.github.io/)
 - [swayidle](https://github.com/swaywm/swayidle)
 - [swaylock-effects](https://github.com/jirutka/swaylock-effects) (jirutka fork)
 - [mako](https://github.com/emersion/mako)
@@ -108,27 +50,18 @@ Applications or programs which affect my workspace
 - [kitty](https://sw.kovidgoyal.net/kitty/)
 - [zsh](https://zsh.org) + [starship](https://starship.rs)
 - [wvkbd](https://github.com/jjsullivan5196/wvkbd) (custom derivation to add theming. See my [repo](https://github.com/chpxu/wvkbd))
-- [nano](https://nano-editor.org)
 - [direnv](https://direnv.net)
 - [dragon-drop](https://github.com/mwh/dragon)
+- [tuigreet](https://github.com/NotAShelf/tuigreet)
 
-<!-- ## Configuration Deep Dive
-
-This section is more information about the configuration, mainly for those who want to extend/use this configuration (though you're probably better off using @Misterio77's boilerplate).
-
-### `flake.nix` structure
+### Other things I use
 
-1. Description. Self-explanatory. Edit it to whatever `string` you want.
-2. `inputs` attribute set contain the flake inputs. Where possible, I have tried to use flake inputs or overlays for as many (environment) programs as possible.
-3. A bunch of `let` bindings. Namely:
-   - `system`, `user`, `pkgs` for some easy reusable keywords
-   - `colour-palette` which is the file containing the RGB hex codes for the Nord theme.
-   - `mkSystemConfiguration` a function which creates a NixOS system with given hostname and users.
-4. `outputs`. What the flake returns and allows you to access.
+- [devflake](https://github.com/chpxu/development-flake)
+- [materials-flake](https://github.com/chpxu/materials-flake)
+- [fufexan/nix-gaming](https://github.com/fufexan/nix-gaming)
+- [CachyOS Kernels](https://github.com/xddxdd/nix-cachyos-kernel)
 
-### `system` folder
-
-- `common` folder contains configuration for hardware and shared system packages across all devices. It contains conditional config for Intel CPU and NVIDIA GPU packages as well as set some environment vairables
-- Each other folder is config for specific hosts (namely a default `configuration.nix` and `hardware-configuration.nix`) as well as any other specific config (e.g. power for my laptops).
+## Screenshots
 
-Rest TBD, may upload onto actual website instead. -->
+![Dev screenshot](docs/img/dev.png)
+![alt text](docs/img/waybar2.png)

docs/index.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <head>
     <title>dotfiles</title>
@@ -29,7 +29,9 @@ <h2>README</h2>
         are clickable and will open a section at the bottom of the page with
         files to download and save.
       </p>
-      <p>There is a further set of instructions for each program below the links.</p>
+      <p>
+        There is a further set of instructions for each program below the links.
+      </p>
     </section>
     <!-- Files section -->
     <section class="category">
@@ -221,10 +223,9 @@ <h2><i id="fa-solid fa-folder"></i> .config</h2>
     </section>
     <div id="file-download" class="show">
       <h3 class="dl-header">Download files</h3>
-      Files will appear here when clicking any of the links in
-      boxes.
+      Files will appear here when clicking any of the links in boxes.
       <!-- We add all the divs containing links and stuff via javascript-->
-      </div>
+    </div>
     <script src="./js/main.js"></script>
   </body>
 </html>

docs/js/main.js

@@ -39,13 +39,12 @@ function generateContent(id, voidPaths, nixPaths, voidFilenames, nixFilenames) {
   generateOSContent(divNix, nixPaths, nixFilenames);
 }
 
-
 // Alacritty
 const alacrittyURLs = [
   [
-    "https://raw.githubusercontent.com/chpxu/dotfiles/void/.config/alacritty/alacritty.yml"
+    "https://raw.githubusercontent.com/chpxu/dotfiles/void/.config/alacritty/alacritty.yml",
   ],
-  [""]
+  [""],
   // [
   //   "https://raw.githubusercontent.com/chpxu/dotfiles/void/.config/alacritty/alacritty.yml"
   // ]
@@ -55,7 +54,7 @@ generateContent(
   alacrittyURLs[0],
   alacrittyURLs[1],
   ["alacritty.yml"],
-  [""]
+  [""],
 );
 
 // Waybar, since it has 3 items
@@ -68,14 +67,12 @@ const waybarURLs = [
     "https://raw.githubusercontent.com/chpxu/dotfiles/nixfiles/.config/waybar/config.jsonc",
     "https://raw.githubusercontent.com/chpxu/dotfiles/nixfiles/.config/waybar/style.css",
     "https://raw.githubusercontent.com/chpxu/dotfiles/nixfiles/.config/waybar/ydotool.sh",
-  ]
+  ],
 ];
 generateContent(
   "waybar",
   waybarURLs[0],
   waybarURLs[1],
   ["void-config.jsonc", "void-style.css"],
-  ["nixos-config.jsonc", "nixos-style.css", "nixos-ydotool.sh"]
+  ["nixos-config.jsonc", "nixos-style.css", "nixos-ydotool.sh"],
 );
-
-