.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,24 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: AdisonCavani
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. Ubuntu 20.10]
+ - Resolution [e.g. 1920 x 1080]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,46 +0,0 @@
-name: Issue / bug
-description: File a bug/issue
-title: "bug: <title>"
-labels: [bug]
-body:
-- type: checkboxes
-  attributes:
-    label: Is there an existing issue for this?
-    description: Please search to see if an issue already exists for the bug you encountered.
-    options:
-    - label: I have searched the existing issues
-      required: true
-- type: textarea
-  attributes:
-    label: Current Behavior
-    description: A concise description of what you're experiencing.
-  validations:
-    required: false
-- type: textarea
-  attributes:
-    label: Expected Behavior
-    description: A concise description of what you expected to happen.
-  validations:
-    required: false
-- type: textarea
-  attributes:
-    label: Environment
-    description: |
-      examples:
-        - **OS**: Ubuntu 20.04
-        - **Resolution**: 1920x1080
-    value: |
-        - OS: 
-        - Resolution: 
-    render: markdown
-  validations:
-    required: false
-- type: textarea
-  attributes:
-    label: Anything else?
-    description: |
-      Links? References? Anything that will give us more context about the issue you are encountering!
-
-      Tip: You can attach screenshots or log files by clicking this area to highlight it and then dragging files in.
-  validations:
-    required: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,23 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: AdisonCavani
+
+---
+
+**Is your feature request related to a problem? Please describe.**  
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**  
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**  
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**  
+Add any other context or screenshots about the feature request here.
+
+**Contributing**
+- [ ] I'm willing to open a pull-request and implement this feature myself

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,42 +0,0 @@
-name: Feature request
-description: Suggest an idea for this project
-title: "feat: <title>"
-labels: [feature-request]
-body:
-- type: textarea
-  attributes:
-    label: Is your feature request related to a problem? Please describe
-    description: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-  validations:
-    required: false
-- type: textarea
-  attributes:
-    label: Describe the solution you'd like
-    description: A clear and concise description of what you want to happen
-  validations:
-    required: false
-- type: textarea
-  attributes:
-    label: Describe alternatives you've considered
-    description: A clear and concise description of any alternative solutions or features you've considered
-  validations:
-    required: false
-- type: textarea
-  attributes:
-    label: Additional context
-    description: Add any other context or screenshots about the feature request here
-  validations:
-    required: false
-- type: dropdown
-  attributes:
-    label: Contributing
-    multiple: false
-    options:
-      - "No, I am afraid I cannot help regarding this"
-      - "Yes, I am willing to help implement this feature in a PR"
-  validations:
-    required: true
-- type: markdown
-  attributes:
-    value: |
-      It takes a lot of work and time maintaining this project; any contribution is welcomed

.github/PULL_REQUEST_TEMPLATE.md

@@ -16,5 +16,6 @@ Please delete options that are not relevant.
 # Checklist:
 
 - [ ] My code follows the style guidelines of this project (correct file and folder structure)
-- [ ] The background image for theme follows naming convention: `theme_name.png`
-- [ ] I updated [`themes.json`](https://github.com/AdisonCavani/distro-grub-themes/blob/master/themes.json) file (JSON database)
+- [ ] The background image for theme is called ``background.png``
+- [ ] ``theme.txt`` has correct *'desktop-image: "background.png"'* attribute
+- [ ] I updated `themes.json` file (JSON database)

.github/workflows/nix.yml

@@ -1,57 +0,0 @@
-name: Check nix packages
-on:
-    pull_request:
-      paths:
-        - "./*.nix"
-        - ".github/workflows/nix.yml"
-        - "assets/**"
-        - "customize/**"
-    push:
-        branches: [master]
-        paths:
-          - "./*.nix"
-          - ".github/workflows/nix.yml"
-          - "assets/**"
-          - "customize/**"
-jobs:
-    flake:
-        name: Check flake
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v4
-            - name: Check Nix flake inputs
-              uses: DeterminateSystems/flake-checker-action@v5
-              with:
-                send-statistics: false
-                fail-mode: true
-            - name: Install Nix
-              uses: DeterminateSystems/nix-installer-action@v9
-            - name: Check repository
-              run: nix flake check
-    matrix:
-        name: Generate build matrix
-        runs-on: ubuntu-latest
-        outputs:
-            themes: ${{ steps.generate-matrix.outputs.themes }}
-        steps:
-            - uses: actions/checkout@v4
-            - name: Generate matrix
-              id: generate-matrix
-              run: |
-                THEMES=$(ls assets/backgrounds/ | sed 's/\.png$//g' | jq --raw-input | jq --slurp -c)
-                echo "themes=$THEMES" >> $GITHUB_OUTPUT
-    build:
-        name: Check nix build for theme ${{ matrix.theme }}
-        runs-on: ubuntu-latest
-        needs:
-            - matrix
-        strategy:
-            matrix: 
-                theme: ${{ fromJSON(needs.matrix.outputs.themes) }}
-        steps:
-            - uses: actions/checkout@v4
-            - name: Install Nix
-              uses: DeterminateSystems/nix-installer-action@v9
-            - name: Build package
-              run: nix build .#${{ matrix.theme }}-grub-theme
-

.github/workflows/update-content.yml

@@ -1,7 +1,6 @@
 name: Update changes on commit
 
 on:
-  workflow_dispatch:
   push:
     branches: [master]
     paths:
@@ -14,38 +13,16 @@ jobs:
 
     steps:
       - uses: actions/checkout@master
-      - name: 📂 Create temp folder
+      - name: 🖼️	Update icons
         run: |
-          mkdir temp
-      - name: 🖼️ Add backgrounds
+          for dest in customize/* ; do cp -rv assets/icons "$dest"; done
+      - name: 📇 Update fonts
         run: |
-          for file in assets/backgrounds/*.png ; do
-            filename=$(basename "$file" .png)
-            mkdir "temp/$filename"
-            cp "$file" "temp/$filename/background.png"
-          done
-      - name: 🎨 Add icons
+          for dest in customize/* ; do cp -rva assets/fonts/. "$dest"; done
+      - name: 💼 Update archives
         run: |
-          for dest in temp/* ; do cp -rv assets/icons "$dest"; done
-      - name: 📇 Add fonts
-        run: |
-          for dest in temp/* ; do cp -rva assets/fonts/. "$dest"; done
-      - name: 🌿 Add menu
-        run: |
-          for dest in temp/* ; do cp -rva assets/menu/. "$dest"; done
-      - name: 📃 Add theme
-        run: |
-          for dest in temp/* ; do cp -rv assets/theme.txt "$dest"; done
-      - name: 🗑️ Cleanup old themes
-        run: |
-          rm -rf themes/*
-      - name: 💼 Create archives
-        run: |
-          cd temp;
+          cd customize;
           for dest in * ; do find "$dest" -printf "%P\n" | tar -vcf ../themes/"$dest".tar --no-recursion -C "$dest" -T -; done
-      - name: Remove artifacts
-        run: |
-          rm -r temp
       - name: 🔥 Commit changes
         run: |
           git config user.name github-actions

.gitignore

@@ -1,4 +0,0 @@
-.envrc
-.direnv
-.vscode
-result

CONTRIBUTING.md

@@ -11,11 +11,9 @@ To get an overview of the project, read the [README](README.md) and [wiki page](
 ```
 .
 ├── assets                       - assets for creating background images
-|   ├── backgrounds              - backgrounds used in each theme
-|   ├── fonts                    - fonts
-|   ├── icons                    - icons
-|   ├── menu                     - menu parts
-|   └── theme.txt                - theme configuration file
+|   ├── fonts                    - fonts used in each theme
+|   └── icons                    - icons that get copied to icons folder in every theme
+├── customize                    - non-compressed themes
 ├── docs                         - documentation markdown files
 ├── preview                      - preview images for README.md
 ├── themes                       - compressed themes ready to install in .tar format
@@ -42,7 +40,7 @@ You can track your workflows [here](https://github.com/AdisonCavani/distro-grub-
 
 ### Frequently Asked Questions
 **Q**: Where are `psd` templates located?  
-**A**: Templates are located in [`templates branch`](https://github.com/AdisonCavani/distro-grub-themes/tree/templates).
+**A**: Templates are located in [`templates`](https://github.com/AdisonCavani/distro-grub-themes/tree/templates) branch.
 
 **Q**: How can I edit `psd` template? I don't have Photoshop  
 **A**: You can import `psd` into GIMP, however this might cause to lose some Photoshop related data. I recommend to use [Photopea](https://www.photopea.com/) - free web-based Photoshop alternative.

README.md

@@ -10,9 +10,8 @@ It aims to replace the default GRUB look, with a nice and colorful theme.
 
 ## Get started
 
-- **Theme preview** is available at [k1ng.dev/distro-grub-themes/preview](https://k1ng.dev/distro-grub-themes/preview).  
-- **Documentation** is available at [k1ng.dev/distro-grub-themes](https://k1ng.dev/distro-grub-themes).  
-- Raw markdown files are located in [`/docs`](./docs) folder.
+Documentation is available at [k1ng.dev/distro-grub-themes](https://k1ng.dev/distro-grub-themes).  
+Raw markdown files are located in [`/docs`](./docs) folder.
 
 ## Funding
 I put a lot of effort and my free time into maintaining this project.  

build/default.nix

@@ -1,28 +0,0 @@
-{ stdenvNoCC, lib, theme }:
-let
-  themes = builtins.map (theme: (builtins.head (lib.strings.splitString "." theme))) (builtins.attrNames (builtins.readDir ./../assets/backgrounds));
-in
-assert builtins.any (x: x == theme) themes;
-
-stdenvNoCC.mkDerivation {
-  name = "distro-grub-themes";
-  src = ./../.;
-
-  installPhase = ''
-    mkdir -p $out
-    cp ./assets/backgrounds/${theme}.png $out/background.png
-    cp ./assets/splash_image.jpg $out/splash_image.jpg
-    cp -r ./assets/icons $out
-    cp -r ./assets/fonts/. $out
-    cp -r ./assets/menu/. $out
-    cp -r ./assets/theme.txt $out
-  '';
-
-  meta = with lib; {
-    homepage = "https://github.com/AdisonCavani/distro-grub-themes";
-    description = "A pack of GRUB2 themes for each Linux distribution";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ zakuciael ];
-    platforms = platforms.linux;
-  };
-}

build/module.nix

@@ -1,28 +0,0 @@
-{ pkgs, lib, config, ... }:
-with lib;
-let
-  cfg = config.distro-grub-themes;
-  themes = builtins.map (theme: (builtins.head (lib.strings.splitString "." theme))) (builtins.attrNames (builtins.readDir ./../assets/backgrounds));
-in
-{
-  options.distro-grub-themes = {
-    enable = mkEnableOption "Enable Distro Grub Theme";
-    theme = mkOption {
-      type = types.enum themes;
-      default = "nixos";
-      example = "arch-linux";
-      description = ''
-        Selected theme name.
-        IMPORTANT! Theme name must be the same as in assert/backgrounds directory without the extension
-      '';
-    };
-  };
-
-  config = mkIf (cfg.enable)
-    {
-      boot.loader.grub = {
-        theme = pkgs.callPackage ./default.nix { theme = cfg.theme; };
-        splashImage = ./../assets/splash_image.jpg;
-      };
-    };
-}