diff --git a/.gitignore b/.gitignore index e9853ad..e820acc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ .hugo_build.lock -src/public -src/voidcruiser.nl +public +voidcruiser.nl .direnv -result diff --git a/.gitmodules b/.gitmodules index 3afb3cb..b030574 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "src/themes"] - path = src/themes - url = gitlab:EternalWanderer/themes.git +[submodule "themes/vugo"] + path = themes/vugo + url = gitlab:EternalWanderer/vugo.git diff --git a/src/archetypes/default.md b/archetypes/default.md similarity index 100% rename from src/archetypes/default.md rename to archetypes/default.md diff --git a/src/archetypes/rambles/default.md b/archetypes/rambles/default.md similarity index 100% rename from src/archetypes/rambles/default.md rename to archetypes/rambles/default.md diff --git a/src/config.toml b/config.toml similarity index 100% rename from src/config.toml rename to config.toml diff --git a/src/content/_index.md b/content/_index.md similarity index 100% rename from src/content/_index.md rename to content/_index.md diff --git a/src/content/about.md b/content/about.md similarity index 100% rename from src/content/about.md rename to content/about.md diff --git a/src/content/ideas.md b/content/ideas.md similarity index 100% rename from src/content/ideas.md rename to content/ideas.md diff --git a/src/content/insanity.md b/content/insanity.md similarity index 100% rename from src/content/insanity.md rename to content/insanity.md diff --git a/src/content/rambles/adblock.md b/content/rambles/adblock.md similarity index 100% rename from src/content/rambles/adblock.md rename to content/rambles/adblock.md diff --git a/src/content/rambles/browsers.md b/content/rambles/browsers.md similarity index 100% rename from src/content/rambles/browsers.md rename to content/rambles/browsers.md diff --git a/src/content/rambles/emergent-mechanics.md b/content/rambles/emergent-mechanics.md similarity index 100% rename from src/content/rambles/emergent-mechanics.md rename to content/rambles/emergent-mechanics.md diff --git a/src/content/rambles/git-server.md b/content/rambles/git-server.md similarity index 100% rename from src/content/rambles/git-server.md rename to content/rambles/git-server.md diff --git a/src/content/rambles/hugo.md b/content/rambles/hugo.md similarity index 100% rename from src/content/rambles/hugo.md rename to content/rambles/hugo.md diff --git a/src/content/rambles/i2p-on-nixos.md b/content/rambles/i2p-on-nixos.md similarity index 100% rename from src/content/rambles/i2p-on-nixos.md rename to content/rambles/i2p-on-nixos.md diff --git a/src/content/rambles/mpd-and-icecast-on-nix.md b/content/rambles/mpd-and-icecast-on-nix.md similarity index 100% rename from src/content/rambles/mpd-and-icecast-on-nix.md rename to content/rambles/mpd-and-icecast-on-nix.md diff --git a/src/content/rambles/nix-home-manager.md b/content/rambles/nix-home-manager.md similarity index 100% rename from src/content/rambles/nix-home-manager.md rename to content/rambles/nix-home-manager.md diff --git a/src/content/rambles/nix-on-other-distros-packagemanagers.md b/content/rambles/nix-on-other-distros-packagemanagers.md similarity index 100% rename from src/content/rambles/nix-on-other-distros-packagemanagers.md rename to content/rambles/nix-on-other-distros-packagemanagers.md diff --git a/src/content/rambles/nixvim.md b/content/rambles/nixvim.md similarity index 100% rename from src/content/rambles/nixvim.md rename to content/rambles/nixvim.md diff --git a/src/content/rambles/orca.md b/content/rambles/orca.md similarity index 100% rename from src/content/rambles/orca.md rename to content/rambles/orca.md diff --git a/src/content/rambles/pwr-switch.md b/content/rambles/pwr-switch.md similarity index 100% rename from src/content/rambles/pwr-switch.md rename to content/rambles/pwr-switch.md diff --git a/src/content/rambles/ssh.md b/content/rambles/ssh.md similarity index 100% rename from src/content/rambles/ssh.md rename to content/rambles/ssh.md diff --git a/src/content/rambles/vim.md b/content/rambles/vim.md similarity index 100% rename from src/content/rambles/vim.md rename to content/rambles/vim.md diff --git a/src/content/rambles/windowmanagers.md b/content/rambles/windowmanagers.md similarity index 100% rename from src/content/rambles/windowmanagers.md rename to content/rambles/windowmanagers.md diff --git a/src/content/rambles/xmonad-prompts.md b/content/rambles/xmonad-prompts.md similarity index 100% rename from src/content/rambles/xmonad-prompts.md rename to content/rambles/xmonad-prompts.md diff --git a/src/content/services.md b/content/services.md similarity index 100% rename from src/content/services.md rename to content/services.md diff --git a/flake.lock b/flake.lock index 886e55b..6ccd9e6 100644 --- a/flake.lock +++ b/flake.lock @@ -20,16 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1707347730, - "narHash": "sha256-0etC/exQIaqC9vliKhc3eZE2Mm2wgLa0tj93ZF/egvM=", + "lastModified": 1696983906, + "narHash": "sha256-L7GyeErguS7Pg4h8nK0wGlcUTbfUMDu+HMf1UcyP72k=", "owner": "NixOs", "repo": "nixpkgs", - "rev": "6832d0d99649db3d65a0e15fa51471537b2c56a6", + "rev": "bd1cde45c77891214131cbbea5b1203e485a9d51", "type": "github" }, "original": { "owner": "NixOs", - "ref": "nixos-23.11", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } @@ -37,8 +37,7 @@ "root": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "themes": "themes" + "nixpkgs": "nixpkgs" } }, "systems": { @@ -55,22 +54,6 @@ "repo": "default", "type": "github" } - }, - "themes": { - "flake": false, - "locked": { - "lastModified": 1707594839, - "narHash": "sha256-VeoBv8LfsTLGSoGpiNlC8gd79xd4InG+bAC6TkBCSHw=", - "owner": "EternalWanderer", - "repo": "themes", - "rev": "53560c95d3bd33362e5552cb9efeaf8234724868", - "type": "gitlab" - }, - "original": { - "owner": "EternalWanderer", - "repo": "themes", - "type": "gitlab" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 139c49c..df41ed1 100644 --- a/flake.nix +++ b/flake.nix @@ -1,13 +1,9 @@ -{ description = "Voidcruiser website"; +{ description = "Website flake"; inputs = { - nixpkgs.url = "github:NixOs/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:NixOs/nixpkgs/nixos-23.05"; flake-utils.url = "github:numtide/flake-utils"; - themes = { - url = "gitlab:EternalWanderer/themes"; - flake = false; - }; }; - outputs = { self, nixpkgs, flake-utils, themes }: + outputs = { self, nixpkgs, flake-utils }: flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; @@ -17,12 +13,12 @@ pname = "voidcruiser"; version = "1.3"; - src = ./src; + src = ./.; buildInputs = [ pkgs.hugo ]; buildPhase = '' - hugo --themesDir="${themes.outPath}" + hugo ''; installPhase = '' diff --git a/src/layouts/_default/index.html b/layouts/_default/index.html similarity index 100% rename from src/layouts/_default/index.html rename to layouts/_default/index.html diff --git a/src/layouts/partials/footer.html b/layouts/partials/footer.html similarity index 100% rename from src/layouts/partials/footer.html rename to layouts/partials/footer.html diff --git a/src/layouts/partials/stickers.html b/layouts/partials/stickers.html similarity index 100% rename from src/layouts/partials/stickers.html rename to layouts/partials/stickers.html diff --git a/src/layouts/shortcodes/about.html b/layouts/shortcodes/about.html similarity index 100% rename from src/layouts/shortcodes/about.html rename to layouts/shortcodes/about.html diff --git a/src/content/rambles/xmonad-bits.md b/src/content/rambles/xmonad-bits.md deleted file mode 100644 index 9f492fe..0000000 --- a/src/content/rambles/xmonad-bits.md +++ /dev/null @@ -1,91 +0,0 @@ ---- -title: "Xmonad Configuration Bits" -date: "2023-09-13T16:47:48+02:00" -author: "$HUMANOID" -tags: ["xmonad", "haskell"] -description: "A few interesting things I've done with my XMonad config" ---- - -So the other day I was hacking some more on my XMonad config and came across a -few quirks that I don't think I've seen other people implement in their configs. -Though truth be told, I haven't really looked at a lot of other people's config -files. - -> "Where is your config file anyway?" - -Haven't published it yet as it's still a huge mess of half baked Haskell -snippets. - -## Complex terminal sessions - -I use [Kitty](https://sw.kovidgoyal.net/kitty/) as my terminal. It's amazing and -probably warrants its own article one day. One of the really cool features is -that it allows you to override options on launch with the `-o` or `--override` -parameter. This allows you to change any of the values in your `kitty.conf`, -this includes the font and colour pallet. - -I've been using this to start terminals with -[BQN](https://mlochbaum.github.io/BQN/) compatible font. - -```sh -kitty -o font_size=17 -o font_family='BQN386 Unicode' -e bqn -``` - -This works great and I assigned it to a keybinding for a while. However, some -time later I decided to check out [R](https://www.r-project.org/) and wanted to -have a similar keybinding with slightly different options. Here it dawned on me -that it would be silly to copy-paste the BQN keybinding and change a few things, -so I abstracted that away into a function that takes a list of options and feeds -that to Kitty. - -```haskell -runInKittyWithOpts :: [String] -> String -> X () -runInKittyWithOpts opts executable = spawn $ "kitty " - ++ (unwords . map ("-o " ++)) opts - ++ " -e " ++ executable -``` - -If I now want to start a kitty session with a BQN font and R repl, I can add -something like the following to a keybinding: -```haskell -runInKittyWithOpts rOptions "R" - where rOptions = [ "font_size=17" - , "font_family='BQN386 Unicode'" - ] -``` - -Since I write quite a bit, I also have a kitty session with a giant margin left -and right of the "terminal" section of the window as that empty space helps me -concentrate. All this is, is the previous function without the `-e` parameter: -```haskell -kittyWithOpts :: [String] -> X () -kittyWithOpts opts = spawn $ "kitty " - ++ (unwords . map ("-o " ++)) opts -``` -Though I didn't let that stop me from golfing it down to a point free version: -```haskell -kittyWithOpts :: [String] -> X () -kittyWithOpts = spawn . ("kitty " ++) . (unwords . map ("-o " ++)) -``` -My prefered settings for a "text hole" terminal. -```haskell -kittyWithOpts [ "font_family='BQN386 Unicode'" - , "font_size=14" - , "single_window_margin_width='5 200'" - ] -``` - -If I were to implement this properly, I would make a kitty module with all -options in DataType. But alas, I'm not patient/bored enough for that... yet. - -## Mouse bindings - -I thought it would be neat to be able to scroll up and down while holding my -modifier key to change my screen brightness and audio levels. The basic concept -here was quite simple; us a lambda function that chucks whatever data it gets -onto the ground because the type signature for mousebindings forces you to deal -with a focussed window. - -```haskell -, ((modMask, button4), \_ -> safeSpawn "pulsemixer" ["--change-volume","+1"]) -``` diff --git a/src/themes b/src/themes deleted file mode 160000 index 53560c9..0000000 --- a/src/themes +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 53560c95d3bd33362e5552cb9efeaf8234724868 diff --git a/src/static/audio/aaaaanvil.flac b/static/audio/aaaaanvil.flac similarity index 100% rename from src/static/audio/aaaaanvil.flac rename to static/audio/aaaaanvil.flac diff --git a/src/static/audio/insanity.wav b/static/audio/insanity.wav similarity index 100% rename from src/static/audio/insanity.wav rename to static/audio/insanity.wav diff --git a/src/static/audio/orca/climb.flac b/static/audio/orca/climb.flac similarity index 100% rename from src/static/audio/orca/climb.flac rename to static/audio/orca/climb.flac diff --git a/src/static/audio/orca/fall.flac b/static/audio/orca/fall.flac similarity index 100% rename from src/static/audio/orca/fall.flac rename to static/audio/orca/fall.flac diff --git a/src/static/audio/orca/plinkinator.flac b/static/audio/orca/plinkinator.flac similarity index 100% rename from src/static/audio/orca/plinkinator.flac rename to static/audio/orca/plinkinator.flac diff --git a/src/static/audio/orca/varied_plinkinator.flac b/static/audio/orca/varied_plinkinator.flac similarity index 100% rename from src/static/audio/orca/varied_plinkinator.flac rename to static/audio/orca/varied_plinkinator.flac diff --git a/src/static/images/config_length.png b/static/images/config_length.png similarity index 100% rename from src/static/images/config_length.png rename to static/images/config_length.png diff --git a/src/static/images/graphs/radio.png b/static/images/graphs/radio.png similarity index 100% rename from src/static/images/graphs/radio.png rename to static/images/graphs/radio.png diff --git a/src/static/images/xkcd/borrow_your_laptop.png b/static/images/xkcd/borrow_your_laptop.png similarity index 100% rename from src/static/images/xkcd/borrow_your_laptop.png rename to static/images/xkcd/borrow_your_laptop.png diff --git a/src/static/keys/alpine@voidcruiser.nl.rsa.pub b/static/keys/alpine@voidcruiser.nl.rsa.pub similarity index 100% rename from src/static/keys/alpine@voidcruiser.nl.rsa.pub rename to static/keys/alpine@voidcruiser.nl.rsa.pub diff --git a/src/static/keys/gpg.asc b/static/keys/gpg.asc similarity index 100% rename from src/static/keys/gpg.asc rename to static/keys/gpg.asc diff --git a/src/static/stickers/4nobody.gif b/static/stickers/4nobody.gif similarity index 100% rename from src/static/stickers/4nobody.gif rename to static/stickers/4nobody.gif diff --git a/src/static/stickers/80x15.png b/static/stickers/80x15.png similarity index 100% rename from src/static/stickers/80x15.png rename to static/stickers/80x15.png diff --git a/src/static/stickers/cc4.png b/static/stickers/cc4.png similarity index 100% rename from src/static/stickers/cc4.png rename to static/stickers/cc4.png diff --git a/src/static/stickers/edited-with-vim_banner.gif b/static/stickers/edited-with-vim_banner.gif similarity index 100% rename from src/static/stickers/edited-with-vim_banner.gif rename to static/stickers/edited-with-vim_banner.gif diff --git a/src/static/stickers/nonazis.png b/static/stickers/nonazis.png similarity index 100% rename from src/static/stickers/nonazis.png rename to static/stickers/nonazis.png diff --git a/src/static/stickers/notoweb3.gif b/static/stickers/notoweb3.gif similarity index 100% rename from src/static/stickers/notoweb3.gif rename to static/stickers/notoweb3.gif diff --git a/src/static/stickers/same-shit-different-asshole_banner.gif b/static/stickers/same-shit-different-asshole_banner.gif similarity index 100% rename from src/static/stickers/same-shit-different-asshole_banner.gif rename to static/stickers/same-shit-different-asshole_banner.gif diff --git a/src/static/stickers/wiby.gif b/static/stickers/wiby.gif similarity index 100% rename from src/static/stickers/wiby.gif rename to static/stickers/wiby.gif diff --git a/themes/vugo b/themes/vugo new file mode 160000 index 0000000..8a0e6fc --- /dev/null +++ b/themes/vugo @@ -0,0 +1 @@ +Subproject commit 8a0e6fc8f845ea5cf6115a9100893e82e64cc3f3