diff --git a/.drone.yml b/.drone.yml index f49242b..d0541de 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,7 +8,7 @@ trigger: - main steps: - - name: docker + - name: docker-default image: plugins/docker settings: registry: git.riksolo.com @@ -18,4 +18,30 @@ steps: - latest - ${DRONE_COMMIT} password: - from_secret: dockertoken \ No newline at end of file + from_secret: dockertoken + + - name: docker-rblicht + image: plugins/docker + settings: + registry: git.riksolo.com + username: riksolo + repo: git.riksolo.com/${DRONE_REPO,,} + build_args: + - SITE=rblicht + tags: + - latest-rblicht + - ${DRONE_COMMIT}-rblicht + password: + from_secret: dockertoken + + - name: trigger docker-compose release + image: plugins/downstream + settings: + server: https://drone.riksolo.com + token: + from_secret: drone_token + repositories: + - RikSolo/docker-compose + depends_on: + - docker-default + - docker-rblicht \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 781c554..5b64798 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,9 @@ FROM node:22 WORKDIR /usr/src/app +ARG SITE=default +ENV SITE=$SITE + COPY package*.json ./ RUN npm install ADD . . diff --git a/content/_data/site.js b/content/_data/site.js new file mode 100644 index 0000000..e6bccc5 --- /dev/null +++ b/content/_data/site.js @@ -0,0 +1,8 @@ +export default function () { + return { + title: "Rik Berkelder", + url: process.env.site == "rblicht" ? "https://rblicht.nl" : "https://riksolo.com", + author: "Rik Berkelder", + site: process.env.SITE || 'default' + }; +} \ No newline at end of file diff --git a/content/blogposts/blogposts.11tydata.js b/content/blogposts/blogposts.11tydata.js index 51c301b..dd1cae7 100644 --- a/content/blogposts/blogposts.11tydata.js +++ b/content/blogposts/blogposts.11tydata.js @@ -1,5 +1,5 @@ const conf = { - tags: "blogposts", + tags: "blogpost", layout: "blogpost.njk", eleventyComputed: { permalink(data) { diff --git a/content/includes/highlights.njk b/content/includes/highlights.njk new file mode 100644 index 0000000..6097482 --- /dev/null +++ b/content/includes/highlights.njk @@ -0,0 +1,11 @@ + \ No newline at end of file diff --git a/content/includes/navbar.njk b/content/includes/navbar.njk new file mode 100644 index 0000000..56eaef6 --- /dev/null +++ b/content/includes/navbar.njk @@ -0,0 +1,31 @@ +{% macro navItem(title, url, hyphen=true, target='_self') %} + + {{title}} + {% if hyphen %} - {% endif %} + +{% endmacro %} + +
+
+ +
+
+ {{navItem("Home", "/")}} + {%if site.site != "rblicht" %} + {{navItem("Blog", "/blog")}} + {%endif%} + {{navItem("Portfolio", "/portfolio", false)}} +
+
+ | + {% if site.site != "rblicht" %} + {{navItem("Mastodon", "https://dook.business/@RikSolo")}} + {% endif %} + {{navItem("Instagram", "https://instagram.com/RikBerkelder", false)}} +
+
+
+
\ No newline at end of file diff --git a/content/includes/skills.njk b/content/includes/skills.njk new file mode 100644 index 0000000..838979f --- /dev/null +++ b/content/includes/skills.njk @@ -0,0 +1,21 @@ +
+
+ Lighting & AV + +
+
+ Software & IT + +
+
\ No newline at end of file diff --git a/content/layouts/base-nonav.njk b/content/layouts/base-nonav.njk new file mode 100644 index 0000000..b206e33 --- /dev/null +++ b/content/layouts/base-nonav.njk @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + {%if tags.includes("blogpost")%} + + {%if description %} + + + {% endif %} + + + + + {%endif%} + + + {% if title %}{{title}} | {% endif %}{{site.title}} + + + + + {{content | safe}} + + + + + + + + + \ No newline at end of file diff --git a/content/layouts/base.njk b/content/layouts/base.njk index 0744101..e1f9f3c 100644 --- a/content/layouts/base.njk +++ b/content/layouts/base.njk @@ -1,82 +1,7 @@ -{% macro navItem(title, url, hyphen=true, target='_self') %} - - {{title}} - {% if hyphen %} - {% endif %} - -{% endmacro %} +--- +layout: 'base-nonav.njk' +--- - - +{%include "navbar.njk"%} - - - - - - - - - - - - - - - - - - {%if tags.includes("blogpost")%} - - {%if description %} - - - {% endif %} - - - - - {%endif%} - - {% if title %}{{title}} | {% endif %}{{site.title}} - - - -
-
- -
-
- {{navItem("Home", "/")}} - {{navItem("Blog", "/blog")}} - {{navItem("Portfolio", "/portfolio", false)}} -
-
- | - {{navItem("Mastodon", "https://dook.business/@RikSolo")}} - {{navItem("Instagram", "https://instagram.com/RikBerkelder", false)}} -
-
-
-
- - {{content | safe}} - - - - - - - - \ No newline at end of file +{{content | safe}} \ No newline at end of file diff --git a/content/layouts/portfolio.njk b/content/layouts/portfolio.njk index f4db953..48d2aeb 100644 --- a/content/layouts/portfolio.njk +++ b/content/layouts/portfolio.njk @@ -14,7 +14,7 @@ layout: base.njk
{% for image in data.images %} - + {% if image.caption %}
{{image.caption}} diff --git a/content/pages/blog.njk b/content/pages/blog.njk index d2a5794..14e4a25 100644 --- a/content/pages/blog.njk +++ b/content/pages/blog.njk @@ -4,7 +4,7 @@ permalink: "/blog/" ---

Blog

-{% for post in collections.blogposts | reverse %} +{% for post in collections.blogpost | reverse %}
{{post.data.date | dateLocale}} - {{post.data.title}}
diff --git a/content/pages/cv.njk b/content/pages/cv.njk new file mode 100644 index 0000000..3c2054d --- /dev/null +++ b/content/pages/cv.njk @@ -0,0 +1,43 @@ +--- +title: CV +permalink: "/cv/" +layout: 'base-nonav.njk' +draft: true +--- +
+

Rik Berkelder

+ Lighting Designer/Technician | Software Engineer | Nerd + +

About

+ +

+ I am a freelance lighting designer, technician, and systems specialist with a focus on touring productions and live + performance. Since 2018, I have worked freelance, initially alongside a career in IT and software engineering and + full time since 2022, bringing together technical precision, creative design, and a strong respect for the craft and + crew. +

+ +

+ I have designed lighting for touring shows that require both creative adaptability and practical problem solving on + the road. As a house and systems technician in a variety of venues, I regularly support international acts and + crews, adapting to varied + setups and workflows. My theatre and festival touring experience has also strengthened my ability to communicate + clearly with local teams and deliver consistent, high quality results in dynamic environments. +

+ +

+ A perfectionist by nature, I value preparation, attention to detail, and reliability while staying flexible and + collaborative to meet the demands of live production. My background in IT and network management supports + increasingly complex lighting and control systems, ensuring stable and efficient operation across all types of + venues. +

+ +

Skills

+ {%include "skills.njk" %} + +

Highlighted work

+ {%include "highlights.njk" %} + +

Contact

+ rik@rblicht.nl / +31 6 37 27 17 91 +
\ No newline at end of file diff --git a/content/pages/index.njk b/content/pages/index.njk index 5af5b8f..d1c53c0 100644 --- a/content/pages/index.njk +++ b/content/pages/index.njk @@ -6,45 +6,37 @@ permalink: "/"

Rik Berkelder

Lighting Designer | Software Engineer | Nerd -

Skills

-
+{%if site.site == "rblicht" %} +

About

+

+ I am a freelance stage lighting technician, lighting designer, and lighting systems technician with a passion for the + intersection of technical precision and creative expression. My journey in lighting began in primary school, driven by + a fascination with how light shapes space and mood. Since 2018, I’ve been freelancing alongside a career in software + engineering and IT, transitioning to full-time freelance work in 2022. +

-
- Lighting & AV -
    -
  • GrandMA2/3, Avolites, Hog4, Obsidian Onyx
    • -
  • Capture, Vectorworks
    • -
  • ATEM, Resolume, VMix, OBS
    • -
  • Timecode, Remote Production, System Integration
    • -
-
-
- Software -
    -
  • Typescript, GraphQL
    • -
  • React (Native), Angular, NodeJS, Electron
    • -
  • Git, Docker, Gitlab CI, GitHub Actions, DroneCI
    • -
  • Sass/SCSS, Tailwind, Bootstrap
    • -
-
-
+

+ A perfectionist by nature, I value preparation, attention to detail, and reliability while staying flexible and + collaborative to meet the demands of live production. I strive bring professionalism, technical expertise, and a deep + commitment to elevating every production I work on, blending methodical planning with a love for creative + problem-solving and thinking on my feet when necessary. +

+{%endif%} + +

Skills

+{%include "skills.njk" %}

Highlighted Projects/Clients

- +{%include "highlights.njk" %}

Contact

-mail@riksolo.com / rik@rblicht.nl +{% if site.site != "rblicht" %}mail@riksolo.com / {% endif %}rik@rblicht.nl

Find me elsewhere