From 0eeb94b65c57980c6c688f0c4355b79981596227 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Thu, 7 Aug 2025 10:45:00 +1000 Subject: [PATCH 01/72] re-add nimble to lang pkgs --- hosts/lolcathost/default.nix | 1 + hosts/myputer/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index e6d03fd..c8479f5 100755 --- a/hosts/lolcathost/default.nix +++ b/hosts/lolcathost/default.nix @@ -231,6 +231,7 @@ in { rustc # Nim nim + nimble # Go go diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index 486c59d..369fc20 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -232,6 +232,7 @@ in { rustc # Nim nim + nimble # Go go From ee7e38e7bacae4d21a50b968fa1c05031a9aa3e5 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 8 Aug 2025 11:28:11 +1000 Subject: [PATCH 02/72] add git aliases --- homes/modules/git.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/homes/modules/git.nix b/homes/modules/git.nix index 3e0cfb0..82d0f1e 100755 --- a/homes/modules/git.nix +++ b/homes/modules/git.nix @@ -5,6 +5,19 @@ }: { programs.git = { enable = true; + lfs.enable = true; + + userName = "Emile Clark-Boman"; + userEmail = "eclarkboman@gmail.com"; + + aliases = { + s = "status"; + d = "diff"; + l = "log"; + c = "commit"; + p = "push"; + }; + extraConfig = { color.ui = true; core.editor = "hx"; @@ -22,8 +35,5 @@ }; }; }; - - userName = "Emile Clark-Boman"; - userEmail = "eclarkboman@gmail.com"; }; } From 0129fe2b9740db4a37a1fad0daa49d4b3645edb3 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 8 Aug 2025 14:08:50 +1000 Subject: [PATCH 03/72] renamed TODO -> +.md --- TODO => TODO.md | 1 - 1 file changed, 1 deletion(-) rename TODO => TODO.md (98%) diff --git a/TODO b/TODO.md similarity index 98% rename from TODO rename to TODO.md index bb8e65c..6b9f235 100644 --- a/TODO +++ b/TODO.md @@ -1,5 +1,4 @@ ## Next Up -0. Rename TODO -> TODO.md 1. Rename user "ae" to "cry" or "vps" 2. Add 404 page to nginx on hyrule 3. Add a user called "mirror" that stores important mirrors (inspiration: https://git.gay/mirror) From d3a642fafbea6285533db3d734879fecc3e0872d Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 8 Aug 2025 20:13:51 +1000 Subject: [PATCH 04/72] add "box" script for managing temp directories --- scripts/box | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100755 scripts/box diff --git a/scripts/box b/scripts/box new file mode 100755 index 0000000..7f69cb0 --- /dev/null +++ b/scripts/box @@ -0,0 +1,44 @@ +#!/usr/bin/env bash +USAGE="Usage: box [--enter]" + +# ===== Configuration ===== # +DATA_DIR="$HOME/.data/box" +# ========================= # + +function setup { + mkdir -p "$DATA_DIR" &>/dev/null +} + +function box { + mktemp -d + # TODO: use a custom name instead +} + +set -euo pipefail + +ENTER=false +for arg in $@; do + case "$arg" in + -e|--enter) + ENTER=true + shift + ;; + -h|--help) + echo "$USAGE" + ;; + -*) + echo "[!] Unknown opt \"$arg\"" >&2 + ;; + *) + echo "[!] Unknown arg \"$arg\"" >&2 + ;; + esac +done + +setup + +BOX=$(box) + +if [[ "$ENTER" == true ]]; then + cd "$BOX" +fi From d68132b8fb4fc76cab1e86a6c9c929e2e1889c48 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 8 Aug 2025 20:14:52 +1000 Subject: [PATCH 05/72] make fish dotfiles more verbose + add gitignore function to generate .gitignore files --- homes/modules/fish.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/homes/modules/fish.nix b/homes/modules/fish.nix index eaca566..8fdcc4b 100755 --- a/homes/modules/fish.nix +++ b/homes/modules/fish.nix @@ -12,6 +12,14 @@ config = { programs.fish = { enable = true; + generateCompletions = true; + + vendor = { + config.enable = true; + functions.enable = true; + completions.enable = true; + }; + interactiveShellInit = '' # add dotnet completions if it exists (ie we're in a virtual environment) if type -q dotnet @@ -27,8 +35,13 @@ echo -n $greetings[(random 1 (count $greetings))] end + function gitignore -a type + curl -sL "https://www.gitignore.io/api/$type" + end + set -g fish_greeting (rand_greet) ''; + plugins = [ { name = "grc"; From 7ab29bfe07261abc7c9b05c868303577489e01f2 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 8 Aug 2025 20:15:44 +1000 Subject: [PATCH 06/72] add custom huggingface_hub packages (learning from hf-cli's authentication workflow) --- hosts/packages/huggingface_hub/flake.nix | 35 +++++++++++ hosts/packages/huggingface_hub/hf-xet.nix | 56 +++++++++++++++++ .../huggingface_hub/huggingface_hub.nix | 62 +++++++++++++++++++ 3 files changed, 153 insertions(+) create mode 100644 hosts/packages/huggingface_hub/flake.nix create mode 100644 hosts/packages/huggingface_hub/hf-xet.nix create mode 100644 hosts/packages/huggingface_hub/huggingface_hub.nix diff --git a/hosts/packages/huggingface_hub/flake.nix b/hosts/packages/huggingface_hub/flake.nix new file mode 100644 index 0000000..37814d9 --- /dev/null +++ b/hosts/packages/huggingface_hub/flake.nix @@ -0,0 +1,35 @@ +# Template: https://nixos-and-flakes.thiscute.world/development/intro +{ + description = "Humanity's Last Exam - Devshell"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; + }; + + outputs = {nixpkgs, ...}: let + system = "x86_64-linux"; + pkgs = import nixpkgs { + inherit system; + }; + python = pkgs.python312.override { + self = python; + packageOverrides = pyfinal: pyprev: { + huggingface-hub = pyfinal.callPackage ./huggingface_hub.nix {}; + hf-xet = pyfinal.callPackage ./hf-xet.nix {}; + }; + }; + in { + devShells."${system}".default = pkgs.mkShell { + packages = [ + (python.withPackages (pypkgs: [ + pypkgs.huggingface-hub + ])) + ]; + + shell = "${pkgs.bash}/bin/bash"; + shellHook = '' + alias hf=huggingface-cli + ''; + }; + }; +} diff --git a/hosts/packages/huggingface_hub/hf-xet.nix b/hosts/packages/huggingface_hub/hf-xet.nix new file mode 100644 index 0000000..0f4c631 --- /dev/null +++ b/hosts/packages/huggingface_hub/hf-xet.nix @@ -0,0 +1,56 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pkg-config, + rustPlatform, + openssl, +}: +buildPythonPackage rec { + pname = "hf-xet"; + version = "1.1.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "huggingface"; + repo = "xet-core"; + tag = "v${version}"; + hash = "sha256-udjZcXTH+Mc4Gvj6bSPv1xi4MyXrLeCYav+7CzKWyhY="; + }; + + sourceRoot = "${src.name}/hf_xet"; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit + pname + version + src + sourceRoot + ; + hash = "sha256-PTzYubJHFvhq6T3314R4aqBAJlwehOqF7SbpLu4Jo6E="; + }; + + nativeBuildInputs = [ + pkg-config + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + buildInputs = [ + openssl + ]; + + env.OPENSSL_NO_VENDOR = 1; + + pythonImportsCheck = ["hf_xet"]; + + # No tests (yet?) + doCheck = false; + + meta = { + description = "Xet client tech, used in huggingface_hub"; + homepage = "https://github.com/huggingface/xet-core/tree/main/hf_xet"; + changelog = "https://github.com/huggingface/xet-core/releases/tag/v${version}"; + license = lib.licenses.asl20; + }; +} diff --git a/hosts/packages/huggingface_hub/huggingface_hub.nix b/hosts/packages/huggingface_hub/huggingface_hub.nix new file mode 100644 index 0000000..02b03b7 --- /dev/null +++ b/hosts/packages/huggingface_hub/huggingface_hub.nix @@ -0,0 +1,62 @@ +/* +* WARNING: Just use `pkgs.python312Packages.huggingface-hub` (or change python version) +* WARNING: I didn't realise it existed when I packaged this. +* +* Nix Resources: +* 1. https://wiki.nixos.org/wiki/Python +* 2. https://nixos.org/manual/nixpkgs/unstable/#developing-with-python +* +* Hugging Face Resources: +* 1. https://github.com/huggingface/huggingface_hub +* 2. https://huggingface.co/docs/huggingface_hub/main/en/guides/cli +*/ +{ + lib, + buildPythonPackage, + fetchPypi, + # build time dependencies + setuptools, + # runtime dependencies + filelock, + fsspec, + hf-xet, + pyyaml, + requests, + tqdm, + typing-extensions, +}: +buildPythonPackage rec { + pname = "huggingface_hub"; + version = "0.34.3"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-1YEw/VqnQISAaBR1SRwKvX6DVEIIL7w+9NRbbDn4OFM="; + }; + + pyproject = true; + doCheck = false; # skip unit testing + pythonImportsCheck = ["huggingface_hub"]; + + # buildtime dependencies + build-system = [ + setuptools + ]; + # runtime dependencies + dependencies = [ + filelock + fsspec + hf-xet + pyyaml + requests + tqdm + typing-extensions + ]; + + meta = rec { + description = "The official Python client for the Huggingface Hub."; + homepage = "https://github.com/huggingface/huggingface_hub"; + changelog = "${homepage}/releases/tag/v${version}"; + license = lib.licenses.asl20; # Apache License 2.0 + }; +} From 63e8a31e7fbe95355e753eaa9e95c086a9559243 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 8 Aug 2025 20:20:13 +1000 Subject: [PATCH 07/72] add fish function for file name searching --- homes/modules/fish.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/homes/modules/fish.nix b/homes/modules/fish.nix index 8fdcc4b..bf496db 100755 --- a/homes/modules/fish.nix +++ b/homes/modules/fish.nix @@ -39,6 +39,11 @@ curl -sL "https://www.gitignore.io/api/$type" end + # ripgrep on files + function rgf + rg --files | rg $args + end + set -g fish_greeting (rand_greet) ''; From 7069840beb9a5a1fea4aca3fe094137c58cf3b35 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Tue, 12 Aug 2025 21:11:08 +1000 Subject: [PATCH 08/72] add gwenview + libreoffice apps --- hosts/myputer/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index 369fc20..e120f67 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -208,6 +208,8 @@ in { hyprpicker qbittorrent signal-desktop + kdePackages.gwenview # image viewer + libreoffice (callPackage ../sddm-theme-corners.nix {}).sddm-theme-corners # dependencies for my sddm theme: From 60a6b07c9dc20f93669516892bbcb27c32700762 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Tue, 12 Aug 2025 21:11:38 +1000 Subject: [PATCH 09/72] comment programs.fish.vendor.* --- homes/modules/fish.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/homes/modules/fish.nix b/homes/modules/fish.nix index bf496db..0728abc 100755 --- a/homes/modules/fish.nix +++ b/homes/modules/fish.nix @@ -14,11 +14,11 @@ enable = true; generateCompletions = true; - vendor = { - config.enable = true; - functions.enable = true; - completions.enable = true; - }; + # vendor = { + # config.enable = true; + # functions.enable = true; + # completions.enable = true; + # }; interactiveShellInit = '' # add dotnet completions if it exists (ie we're in a virtual environment) From dc12ab717b99149d19d3b7b07aa5919da51f2be2 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Sun, 31 Aug 2025 14:54:59 +1000 Subject: [PATCH 10/72] remove gamescope.desktop entry, add GE Proton --- hosts/modules/steam.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hosts/modules/steam.nix b/hosts/modules/steam.nix index 07f3ae1..5c72185 100644 --- a/hosts/modules/steam.nix +++ b/hosts/modules/steam.nix @@ -14,11 +14,15 @@ programs = { steam = { enable = true; - gamescopeSession.enable = true; + gamescopeSession.enable = false; # .desktop entry for gamescope remotePlay.openFirewall = true; dedicatedServer.openFirewall = true; localNetworkGameTransfers.openFirewall = true; + + extraCompatPackages = with pkgs; [ + proton-ge-bin + ]; }; gamemode.enable = true; From 7ecf75bef5268933a2cc05e66184e2a2a991d127 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Sun, 31 Aug 2025 14:55:27 +1000 Subject: [PATCH 11/72] add hypr screenshot utility --- hosts/myputer/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index e120f67..87cd7f9 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -206,6 +206,7 @@ in { bluetui wl-clipboard # clipboard for wayland hyprpicker + hyprshot # screenshot utility qbittorrent signal-desktop kdePackages.gwenview # image viewer From 186c0c741afad6d24c03af111919145019fc7821 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Sun, 31 Aug 2025 14:56:01 +1000 Subject: [PATCH 12/72] add binary debug utils --- hosts/myputer/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index 87cd7f9..bb00197 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -223,10 +223,11 @@ in { shellcheck grc # colorise command outputs - # Systems Emulation + # Systems Programming & Compilation qemu # Fellice Bellard's Quick Emulator - # Make gnumake + strace + ltrace # C Family gcc clang From 98244e7ecfbdf9e6d0e92384e909e57abe640ce1 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Sun, 31 Aug 2025 14:56:23 +1000 Subject: [PATCH 13/72] (test) openvas on myputer --- hosts/myputer/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index bb00197..af7b5c8 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -212,6 +212,11 @@ in { kdePackages.gwenview # image viewer libreoffice + # TEST: WARNING + # ospd-openvas + # openvas-scanner + # openvas-smb + (callPackage ../sddm-theme-corners.nix {}).sddm-theme-corners # dependencies for my sddm theme: pkgs.libsForQt5.qt5.qtgraphicaleffects From db0a34ebbd1d68d2fa31fa7fa4486cf476a7ca38 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Sun, 31 Aug 2025 15:19:51 +1000 Subject: [PATCH 14/72] ltrace/strace for lolcathost --- hosts/lolcathost/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index ef23633..1452d6e 100755 --- a/hosts/lolcathost/default.nix +++ b/hosts/lolcathost/default.nix @@ -235,6 +235,8 @@ in { # GNU Utils gnumake binutils + strace + ltrace # C Family gcc clang From 99a0adb621c1b7505c0baaabec4818d2fb8bb2ab Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Sun, 31 Aug 2025 23:23:10 +1000 Subject: [PATCH 15/72] add list syscalls script --- scripts/lsyscalls | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100755 scripts/lsyscalls diff --git a/scripts/lsyscalls b/scripts/lsyscalls new file mode 100755 index 0000000..5cbd744 --- /dev/null +++ b/scripts/lsyscalls @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +# USAGE: lsyscalls | sort [-nk2] + +echo -e '#include '\ + | cpp -dM \ + | grep "#define __NR_.*[0-9]$" \ + | cut -d_ -f 4- From 1f35c727ed4fe1e76d5c82d4d923926e74a2dfa1 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Sun, 31 Aug 2025 23:25:25 +1000 Subject: [PATCH 16/72] progress home-manager --- hosts/myputer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index 7ca8449..a8f1629 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -7,7 +7,7 @@ }: let home-manager = builtins.fetchTarball { url = "https://github.com/nix-community/home-manager/archive/release-25.05.tar.gz"; - sha256 = "026rvynmzmpigax9f8gy9z67lsl6dhzv2p6s8wz4w06v3gjvspm1"; + sha256 = "1wl2plp37a8qw26h6cj3ah6rq8bd3awl2938h5cm9b8ncxn4s1k8"; }; in { imports = [ From a33e8a0147b4baf1778a000062ed7196eb3a6d1e Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Sun, 31 Aug 2025 23:26:08 +1000 Subject: [PATCH 17/72] provide nixpkgs-unstable to homemanager (myputer) --- hosts/myputer/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index a8f1629..316463a 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -1,6 +1,7 @@ { lib, pkgs, + pkgs-unstable, inputs, config, ... @@ -183,6 +184,7 @@ in { home-manager = { users.me = import ../../homes/me; + extraSpecialArgs = {inherit inputs pkgs pkgs-unstable;}; sharedModules = [ inputs.ags.homeManagerModules.default ]; From 95bf9fe6adc2cc3ac85f5e7499087a1df812ddfd Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Sun, 31 Aug 2025 23:26:30 +1000 Subject: [PATCH 18/72] add nasm pkg --- hosts/lolcathost/default.nix | 3 +++ hosts/myputer/default.nix | 3 +++ 2 files changed, 6 insertions(+) diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index 1452d6e..753ab1b 100755 --- a/hosts/lolcathost/default.nix +++ b/hosts/lolcathost/default.nix @@ -234,9 +234,12 @@ in { qemu # Fellice Bellard's Quick Emulator # GNU Utils gnumake + # Binaries binutils strace ltrace + # ASM + nasm # C Family gcc clang diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index 316463a..528c87d 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -235,9 +235,12 @@ in { qemu # Fellice Bellard's Quick Emulator # GNU Utils gnumake + # Binaries binutils strace ltrace + # ASM + nasm # C Family gcc clang From eb02262ae67189936485a7310bc0f821e353cb3f Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Sun, 31 Aug 2025 23:27:08 +1000 Subject: [PATCH 19/72] add x86-manpages derivation (ISA manpages) --- hosts/lolcathost/default.nix | 1 + hosts/myputer/default.nix | 1 + hosts/packages/x86-manpages/default.nix | 32 +++++++++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 hosts/packages/x86-manpages/default.nix diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index 753ab1b..be4c996 100755 --- a/hosts/lolcathost/default.nix +++ b/hosts/lolcathost/default.nix @@ -240,6 +240,7 @@ in { ltrace # ASM nasm + (callPackage ../packages/x86-manpages {}) # C Family gcc clang diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index 528c87d..b0c8f6c 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -241,6 +241,7 @@ in { ltrace # ASM nasm + (callPackage ../packages/x86-manpages {}) # C Family gcc clang diff --git a/hosts/packages/x86-manpages/default.nix b/hosts/packages/x86-manpages/default.nix new file mode 100644 index 0000000..b687422 --- /dev/null +++ b/hosts/packages/x86-manpages/default.nix @@ -0,0 +1,32 @@ +{pkgs, ...}: +pkgs.stdenv.mkDerivation { + pname = "x86-manpages"; + version = "0.0.1"; + + src = pkgs.fetchFromGitHub { + owner = "ttmo-O"; + repo = "x86-manpages"; + + ## Recommended + # rev = "0e199a8b4d90be7eb715291c21cf41de8527beac"; + # sha256 = "0im596j0pf90npg933gkq6wpw23c47fcwv0n64qfqn5mcy92qbcb"; + rev = "94902f9c45de0efe803c32b6c3e88d6623881866"; + sha256 = "0k6nsfabzqwnhjiyw2kyg0z49nzrsxn515f6dcjh1rn7bzih5562"; + }; + + installPhase = '' + mkdir -p $out/man/man7 + + shopt -u nullglob + for m in man7/*.7; do + install -m 644 "$m" "$out/man/man7" + done + ''; + + meta = with pkgs.lib; { + description = "Manpages for x86 instructions"; + homepage = "https://github.com/ttmo-O/x86-manpages"; + license = licenses.mit; + platforms = platforms.all; + }; +} From 364efb25ead548c72746508070e5d4f5d520baf1 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Wed, 3 Sep 2025 00:24:41 +1000 Subject: [PATCH 20/72] dbus sucks i wanna cry :( --- hosts/lolcathost/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index be4c996..2450c55 100755 --- a/hosts/lolcathost/default.nix +++ b/hosts/lolcathost/default.nix @@ -121,11 +121,11 @@ in { ); }; - dbus = { - # NOTE: programs.uwsm.enable sets implementation to dbus-broker, - # NOTE: however this seems to break dbus - implementation = lib.mkForce "dbus"; - }; + # dbus = { + # # NOTE: programs.uwsm.enable sets implementation to dbus-broker, + # # NOTE: however this seems to break dbus + # implementation = lib.mkForce "dbus"; + # }; # Multimedia Framework # With backwards compatability for alsa/pulseaudio/jack From 6fbaf7fe893a53e277ebaa70dfdf43e8da687ce7 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Wed, 3 Sep 2025 00:37:55 +1000 Subject: [PATCH 21/72] add haskell support --- homes/modules/editor/helix.nix | 10 ++++++++++ hosts/lolcathost/default.nix | 3 +++ hosts/myputer/default.nix | 3 +++ 3 files changed, 16 insertions(+) diff --git a/homes/modules/editor/helix.nix b/homes/modules/editor/helix.nix index e7d6003..3c1443d 100755 --- a/homes/modules/editor/helix.nix +++ b/homes/modules/editor/helix.nix @@ -136,6 +136,12 @@ formatter.command = "${pkgs.clang-tools}/bin/clang-format"; language-servers = ["clangd"]; } + { + name = "haskell"; + auto-format = true; + formatter.command = "${pkgs.ormolu}/bin/ormolu"; + language-servers = ["haskell-language-server"]; + } ]; language-server = { @@ -149,6 +155,10 @@ clangd = { command = "${pkgs.clang-tools}/bin/clangd"; }; + + haskell-language-server = { + command = "${pkgs.haskell-language-server}/bin/haskell-language-server-wrapper"; + }; }; }; }; diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index 2450c55..765118b 100755 --- a/hosts/lolcathost/default.nix +++ b/hosts/lolcathost/default.nix @@ -253,6 +253,9 @@ in { nimble # Go go + # Haskell + ghc + ghcid # Python python312 # I use 3.12 since it's in a pretty stable state now diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index b0c8f6c..dc525f9 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -254,6 +254,9 @@ in { nimble # Go go + # Haskell + ghc + ghcid # Python python312 # I use 3.12 since it's in a pretty stable state now From a35cedeecbaa5f12f99a4ed6d77225897aaa1378 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Wed, 3 Sep 2025 03:24:39 +1000 Subject: [PATCH 22/72] add haskell lsp + formatter --- hosts/lolcathost/default.nix | 2 ++ hosts/myputer/default.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index 765118b..12125e5 100755 --- a/hosts/lolcathost/default.nix +++ b/hosts/lolcathost/default.nix @@ -256,6 +256,8 @@ in { # Haskell ghc ghcid + haskell-language-server + ormolu # Python python312 # I use 3.12 since it's in a pretty stable state now diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index dc525f9..ea5710a 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -257,6 +257,8 @@ in { # Haskell ghc ghcid + haskell-language-server + ormolu # Python python312 # I use 3.12 since it's in a pretty stable state now From eaea98a362a2f2d54e6ce6c22a4afb4c99286370 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Wed, 3 Sep 2025 03:27:12 +1000 Subject: [PATCH 23/72] add hyprsunset (its 3am and im going blind............) --- hosts/modules/wm/hyprland.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hosts/modules/wm/hyprland.nix b/hosts/modules/wm/hyprland.nix index f2960ed..c83caa1 100644 --- a/hosts/modules/wm/hyprland.nix +++ b/hosts/modules/wm/hyprland.nix @@ -1,4 +1,8 @@ -{...}: { +{pkgs, ...}: { + environment.defaultPackages = with pkgs; [ + hyprsunset + ]; + programs = { hyprland = { enable = true; From c94e75bb0210cd61e40186d2a9ad19c5f923a50d Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Wed, 3 Sep 2025 11:13:13 +1000 Subject: [PATCH 24/72] mark all dev outputs for install --- hosts/lolcathost/default.nix | 15 ++++++++++----- hosts/myputer/default.nix | 15 ++++++++++----- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index 12125e5..02bd30f 100755 --- a/hosts/lolcathost/default.nix +++ b/hosts/lolcathost/default.nix @@ -198,12 +198,17 @@ in { }; # ---- ENVIRONMENT VARIABLES ---- - environment.sessionVariables = { - # folder names with capitalisation look awful! - XDG_DOWNLOAD_DIR = "$HOME/downloads"; + environment = { + # always install "dev" derivation outputs + extraOutputsToInstall = ["dev"]; - # Hint Electrons apps to use Wayland - NIXOS_OZONE_WL = "1"; + sessionVariables = { + # folder names with capitalisation look awful! + XDG_DOWNLOAD_DIR = "$HOME/downloads"; + + # Hint Electrons apps to use Wayland + NIXOS_OZONE_WL = "1"; + }; }; # ---- SYSTEM PACKAGES ----- diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index ea5710a..ce1c838 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -191,12 +191,17 @@ in { }; # ---- ENVIRONMENT VARIABLES ---- - environment.sessionVariables = { - # folder names with capitalisation look awful! - XDG_DOWNLOAD_DIR = "$HOME/downloads"; + environment = { + # always install "dev" derivation outputs + extraOutputsToInstall = ["dev"]; - # Hint Electrons apps to use Wayland - NIXOS_OZONE_WL = "1"; + sessionVariables = { + # folder names with capitalisation look awful! + XDG_DOWNLOAD_DIR = "$HOME/downloads"; + + # Hint Electrons apps to use Wayland + NIXOS_OZONE_WL = "1"; + }; }; # ---- SYSTEM PACKAGES ----- From 75751e308505c5d7330fd410879b784dca356a60 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Thu, 18 Sep 2025 19:48:07 +1000 Subject: [PATCH 25/72] always install derivation "man" ouputs --- hosts/lolcathost/default.nix | 2 +- hosts/myputer/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index 02bd30f..b154d3c 100755 --- a/hosts/lolcathost/default.nix +++ b/hosts/lolcathost/default.nix @@ -200,7 +200,7 @@ in { # ---- ENVIRONMENT VARIABLES ---- environment = { # always install "dev" derivation outputs - extraOutputsToInstall = ["dev"]; + extraOutputsToInstall = ["dev" "man"]; sessionVariables = { # folder names with capitalisation look awful! diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index ce1c838..16df2cf 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -193,7 +193,7 @@ in { # ---- ENVIRONMENT VARIABLES ---- environment = { # always install "dev" derivation outputs - extraOutputsToInstall = ["dev"]; + extraOutputsToInstall = ["dev" "man"]; sessionVariables = { # folder names with capitalisation look awful! From cb6f98406565b7f6331ce329e5d0e6b1c450b17a Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Wed, 24 Sep 2025 13:30:20 +1000 Subject: [PATCH 26/72] add pkgs.moreutils --- hosts/lolcathost/default.nix | 1 + hosts/myputer/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index b154d3c..e0bfcb1 100755 --- a/hosts/lolcathost/default.nix +++ b/hosts/lolcathost/default.nix @@ -234,6 +234,7 @@ in { fish shellcheck grc # colorise command outputs + moreutils # Systems Emulation qemu # Fellice Bellard's Quick Emulator diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index 16df2cf..2749192 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -235,6 +235,7 @@ in { fish shellcheck grc # colorise command outputs + moreutils # Systems Programming & Compilation qemu # Fellice Bellard's Quick Emulator From 81c7c25c6f90cf9d43d91d2230edb775e4edc4f7 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 26 Sep 2025 23:18:45 +1000 Subject: [PATCH 27/72] add hexyl, timg, and other --- hosts/lolcathost/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index e0bfcb1..54efd89 100755 --- a/hosts/lolcathost/default.nix +++ b/hosts/lolcathost/default.nix @@ -244,6 +244,7 @@ in { binutils strace ltrace + hexyl # ASM nasm (callPackage ../packages/x86-manpages {}) @@ -265,6 +266,14 @@ in { haskell-language-server ormolu + # Nix + # TODO: once upgraded past Nix-24.07 this line won't be necessary (I think) + # helix will support nixd by default + # SOURCE: https://github.com/nix-community/nixd/blob/main/nixd/docs/editor-setup.md#Helix + nixd # lsp for nix + nix-prefetch-git + nix-index + # Python python312 # I use 3.12 since it's in a pretty stable state now python314 # also 3.14 for latest features @@ -288,23 +297,18 @@ in { zoxide doggo tldr - # btop + btop eza yazi lazygit ripgrep viddy # modern `watch` command thefuck - - # TODO: once upgraded past Nix-24.07 this line won't be necessary (I think) - # helix will support nixd by default - # SOURCE: https://github.com/nix-community/nixd/blob/main/nixd/docs/editor-setup.md#Helix - nixd # lsp for nix + timg # terminal image (sixel) viewer # Pretty necessary git git-filter-repo - nix-prefetch-git brightnessctl acpi # upower From bf22bfbcf48a0a1c5ee8b1f1b3f02bbd9e7a1865 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Mon, 6 Oct 2025 09:18:26 +1000 Subject: [PATCH 28/72] enable NIX_SHELL_PRESERVE_PROMPT --- homes/me/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/homes/me/default.nix b/homes/me/default.nix index fac7454..194d568 100755 --- a/homes/me/default.nix +++ b/homes/me/default.nix @@ -35,6 +35,10 @@ man = "batman"; # bat + man }; + sessionVariables = { + NIX_SHELL_PRESERVE_PROMPT = 1; + }; + pointerCursor = { gtk.enable = true; # x11.enable = true # dont enable since im on hyprland From f9df463872f4dd0d811d7d157485393f4e21fdf2 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Mon, 6 Oct 2025 09:20:37 +1000 Subject: [PATCH 29/72] add dotnet9 --- hosts/lolcathost/default.nix | 5 +++++ hosts/myputer/default.nix | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index 54efd89..86ef3d5 100755 --- a/hosts/lolcathost/default.nix +++ b/hosts/lolcathost/default.nix @@ -281,6 +281,11 @@ in { # Sage sageWithDoc # SageMath + HTML Documentation + # .NET + dotnetCorePackages.dotnet_9.sdk + dotnetCorePackages.dotnet_9.aspnetcore + dotnetCorePackages.dotnet_9.runtime + openvpn inetutils diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index 2749192..d51934f 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -273,6 +273,11 @@ in { # Sage sageWithDoc # SageMath + HTML Documentation + # .NET + dotnetCorePackages.dotnet_9.sdk + dotnetCorePackages.dotnet_9.aspnetcore + dotnetCorePackages.dotnet_9.runtime + openvpn inetutils From 3e1d10617908897f4af7be482f927025fc160d9f Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Mon, 6 Oct 2025 09:21:56 +1000 Subject: [PATCH 30/72] add pstree + lz4 --- hosts/lolcathost/default.nix | 2 ++ hosts/myputer/default.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index 86ef3d5..be8db92 100755 --- a/hosts/lolcathost/default.nix +++ b/hosts/lolcathost/default.nix @@ -325,8 +325,10 @@ in { file wget tree + pstree unzip unrar-free + lz4 man-pages man-pages-posix diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index d51934f..d424817 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -323,8 +323,10 @@ in { file wget tree + pstree unzip unrar-free + lz4 man-pages man-pages-posix From 120b753882a49ba484e587e91a18a858a90cd452 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Mon, 6 Oct 2025 09:24:16 +1000 Subject: [PATCH 31/72] (attempt) fix dbus service for bluetui manually configure resolvd with CloudFlare's WARP+ DNS --- hosts/lolcathost/default.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index be8db92..376140e 100755 --- a/hosts/lolcathost/default.nix +++ b/hosts/lolcathost/default.nix @@ -100,10 +100,30 @@ in { networkmanager.enable = true; firewall.enable = false; + + # Use CloudFlare's WARP+ 1.1.1.1 DNS service + nameservers = [ + "1.1.1.1#one.one.one.one" + "1.0.0.1#one.one.one.one" + ]; }; # ----- SERVICES ----- services = { + # systemd-resolved provides network name resolution + # to local processes via a D-Bus interface. + resolved = { + enable = true; + dnssec = "true"; + domains = ["~."]; + # Use CloudFlare's WARP+ 1.1.1.1 DNS service + fallbackDns = [ + "1.1.1.1#one.one.one.one" + "1.0.0.1#one.one.one.one" + ]; + dnsovertls = "true"; + }; + # Set display manager (login screen) displayManager = { # sddm relies on pkgs.libsForQt5.qt5.qtgraphicaleffects From 70ed4a9a38ddef2c8b6378a7457d54af2281368c Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Mon, 6 Oct 2025 09:30:18 +1000 Subject: [PATCH 32/72] add hosts/modules/bashistrans.nix --- hosts/lolcathost/default.nix | 18 ++---------------- hosts/modules/bashistrans.nix | 23 +++++++++++++++++++++++ hosts/myputer/default.nix | 2 ++ 3 files changed, 27 insertions(+), 16 deletions(-) create mode 100644 hosts/modules/bashistrans.nix diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index 376140e..dbdaba0 100755 --- a/hosts/lolcathost/default.nix +++ b/hosts/lolcathost/default.nix @@ -15,6 +15,8 @@ in { ./hardware-configuration.nix (import "${home-manager}/nixos") + ../modules/bashistrans.nix + ../modules/wm/hyprland.nix # ../modules/wm/river.nix ../modules/wm/crywl.nix @@ -375,22 +377,6 @@ in { nix-ld.enable = true; - # I want to use fish as my login shell but it always goes terrible - # cause it isn't POSIX compliant, so instead Bash is my login and - # will just exec fish (^-^) - bash = { - blesh.enable = false; # ble.sh replacement for GNU readline - completion.enable = true; - - interactiveShellInit = '' - if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] - then - shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION="" - exec ${pkgs.fish}/bin/fish $LOGIN_OPTION - fi - ''; - }; - # Thunar also uses: `services.tumbler` & `services.gvfs` thunar = { enable = true; diff --git a/hosts/modules/bashistrans.nix b/hosts/modules/bashistrans.nix new file mode 100644 index 0000000..d3b285c --- /dev/null +++ b/hosts/modules/bashistrans.nix @@ -0,0 +1,23 @@ +{pkgs, ...}: { + # I want to use fish as my login shell but it always goes terrible + # cause it isn't POSIX compliant, so instead Bash is my login and + # will just exec fish (^-^) + programs.bash = { + blesh.enable = false; # ble.sh replacement for GNU readline + completion.enable = true; + + interactiveShellInit = '' + # help bash transition into a beautiful fish! + if [[ -z $CRY_BASH_IS_TRANS ]] + then + if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] + then + shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION="" + exec ${pkgs.fish}/bin/fish $LOGIN_OPTION + fi + fi + # bash is trans now! (no more transitioning required) + export CRY_BASH_IS_TRANS=true + ''; + }; +} diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index d424817..6844dcc 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -15,6 +15,8 @@ in { ./hardware-configuration.nix (import "${home-manager}/nixos") + ../modules/bashistrans.nix + ../modules/wm/hyprland.nix ../modules/steam.nix From 5c955e52322b331420371c85023a5136963c451a Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Mon, 6 Oct 2025 09:40:21 +1000 Subject: [PATCH 33/72] (attempt) package CrazyCraft void launcher for my partner lol --- hosts/myputer/default.nix | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index 6844dcc..b43fa6c 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -30,6 +30,13 @@ in { "nix-command" "flakes" ]; + # nixpkgs.overlays = [ + # (self: super: { + # jdk17 = super.jdk17.override (prev: { + # enableJavaFX = true; + # }); + # }) + # ]; nixpkgs.config.allowUnfreePredicate = let whitelist = map lib.getName [ @@ -268,6 +275,18 @@ in { haskell-language-server ormolu + # Java + # jdk17 + # (jre8.overrideAttrs + # (oldAttrs: { + # enableJavaFX = true; + # })) + # (jdk8.overrideAttrs + # (oldAttrs: { + # enableJavaFX = true; + # })) + visualvm + # Python python312 # I use 3.12 since it's in a pretty stable state now python314 # also 3.14 for latest features @@ -404,6 +423,18 @@ in { # mozilla's email client thunderbird.enable = true; + + java = let + # XXX: WARNING: TEST :WARNING: XXX + # Test for CrazyCraft VoidLauncher + myjdk = pkgs.jdk17.override { + enableJavaFX = true; + # openjfx_jdk = pkgs.openjfx17.override {withWebKit = true;}; + }; + in { + enable = true; + package = myjdk; + }; }; # ----- FONTS ----- From c05db6797455b031c9bc6e8eb2a17f1d7fbf72e4 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Mon, 6 Oct 2025 09:40:54 +1000 Subject: [PATCH 34/72] progress hyrule home-manager --- hosts/hyrule/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/hyrule/default.nix b/hosts/hyrule/default.nix index 6ac57a5..e0da1d6 100755 --- a/hosts/hyrule/default.nix +++ b/hosts/hyrule/default.nix @@ -7,7 +7,7 @@ }: let home-manager = builtins.fetchTarball { url = "https://github.com/nix-community/home-manager/archive/release-25.05.tar.gz"; - sha256 = "026rvynmzmpigax9f8gy9z67lsl6dhzv2p6s8wz4w06v3gjvspm1"; + sha256 = "0d41gr0c89a4y4lllzdgmbm54h9kn9fjnmavwpgw0w9xwqwnzpax"; }; in { imports = [ From a04641fc9dc6c05fe1132a2cbeae4e03f02b4eb3 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Mon, 6 Oct 2025 09:41:20 +1000 Subject: [PATCH 35/72] (temp) disable hyrule's minecraft server --- hosts/hyrule/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hosts/hyrule/default.nix b/hosts/hyrule/default.nix index e0da1d6..325e467 100755 --- a/hosts/hyrule/default.nix +++ b/hosts/hyrule/default.nix @@ -14,8 +14,9 @@ in { ./hardware-configuration.nix (import "${home-manager}/nixos") - ./mailserver.nix # TEMP: location - ./minecraft-server.nix # TEMP: location + # ./mailserver.nix # TEMP: location + # ./minecraft-server.nix # TEMP: location + #../modules/server/nginx.nix #../modules/server/ssh.nix #../modules/server/fail2ban.nix From 2da00759924a82edbcaaaaa8e09cf8db57ab9da2 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Mon, 6 Oct 2025 09:43:26 +1000 Subject: [PATCH 36/72] add radare2, gdb, perf-tools --- hosts/lolcathost/default.nix | 8 ++++++-- hosts/myputer/default.nix | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index dbdaba0..9075286 100755 --- a/hosts/lolcathost/default.nix +++ b/hosts/lolcathost/default.nix @@ -266,6 +266,9 @@ in { binutils strace ltrace + perf-tools # ftrace + perf + radare2 + gdb hexyl # ASM nasm @@ -273,15 +276,16 @@ in { # C Family gcc clang + clang-tools # Rust cargo rustc + # Go + go # Nim nim nimble - # Go - go # Haskell ghc ghcid diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index b43fa6c..ef640c7 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -254,6 +254,9 @@ in { binutils strace ltrace + perf-tools # ftrace + perf + radare2 + gdb # ASM nasm (callPackage ../packages/x86-manpages {}) @@ -261,14 +264,15 @@ in { gcc clang clang-tools + # Rust cargo rustc + # Go + go # Nim nim nimble - # Go - go # Haskell ghc ghcid From 2dde0450c410e2ca1a6101b8ecce1480a8043df4 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Mon, 6 Oct 2025 09:43:40 +1000 Subject: [PATCH 37/72] add discord --- hosts/myputer/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index ef640c7..af9b257 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -46,6 +46,7 @@ in { pkgs.steamcmd pkgs.steam-unwrapped pkgs.dwarf-fortress + pkgs.discord ]; in pkg: builtins.elem (lib.getName pkg) whitelist; From d094fbb26fed01902193574491afbdc14a39244f Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Mon, 6 Oct 2025 21:19:26 +1000 Subject: [PATCH 38/72] helix now supports C# LSP --- homes/modules/editor/helix.nix | 21 +++++++++++++++++++++ hosts/myputer/default.nix | 1 + 2 files changed, 22 insertions(+) diff --git a/homes/modules/editor/helix.nix b/homes/modules/editor/helix.nix index 3c1443d..8d6e22c 100755 --- a/homes/modules/editor/helix.nix +++ b/homes/modules/editor/helix.nix @@ -142,6 +142,22 @@ formatter.command = "${pkgs.ormolu}/bin/ormolu"; language-servers = ["haskell-language-server"]; } + # { + # name = "c-sharp"; + # source = "source.cs"; + # file-types = ["cs"]; + # indent = { + # tab-width = 4; + # unit = " "; + # }; + # block-comment-tokens = { + # start = "/*"; + # end = "*/"; + # }; + # # auto-format = false; + # # formatter.command = "${pkgs.omnisharp-roslyn}/bin/OmniSharp"; + # # language-servers = ["OmniSharp"]; + # } ]; language-server = { @@ -159,6 +175,11 @@ haskell-language-server = { command = "${pkgs.haskell-language-server}/bin/haskell-language-server-wrapper"; }; + + # C# language services + OmniSharp = { + command = "${pkgs.omnisharp-roslyn}/bin/OmniSharp"; + }; }; }; }; diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index af9b257..5a866c2 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -303,6 +303,7 @@ in { dotnetCorePackages.dotnet_9.sdk dotnetCorePackages.dotnet_9.aspnetcore dotnetCorePackages.dotnet_9.runtime + omnisharp-roslyn openvpn inetutils From 8ec227aa10fc739f61a3b85c4ba0b9a03e691f23 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Mon, 6 Oct 2025 21:19:37 +1000 Subject: [PATCH 39/72] add cute lil banner --- banner | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 banner diff --git a/banner b/banner new file mode 100644 index 0000000..67e1bd9 --- /dev/null +++ b/banner @@ -0,0 +1,6 @@ + .------------. + | oh my | + '------------' + ^ (\_(\ + '----- ( -.-) + o_(")(") From 328c628291d010eddebc3ff2def75ed1aaa6bc71 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Mon, 6 Oct 2025 21:19:53 +1000 Subject: [PATCH 40/72] (temp) add notes on screensharing --- SCREENSHARING | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 SCREENSHARING diff --git a/SCREENSHARING b/SCREENSHARING new file mode 100644 index 0000000..d3046f6 --- /dev/null +++ b/SCREENSHARING @@ -0,0 +1,11 @@ +Excellent Resource +https://gist.github.com/brunoanc/2dea6ddf6974ba4e5d26c3139ffb7580#install-xdg-desktop-portal-and-friends + +Hyprland official page on screensharing +https://wiki.hyprland.org/Useful-Utilities/Screen-Sharing/ + + +Multiple sources seem to think that use xdg-desktop-portal-wlr works (but I can't stream individual applications) +but I suppose that's better than nothing? + +Also check out xwaylandvideobridge From 4e615703a66fa03770e9afd837fd0a2d586d2651 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Mon, 6 Oct 2025 21:21:28 +1000 Subject: [PATCH 41/72] i dont need this anymore --- flake.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/flake.nix b/flake.nix index 382bca6..3d40a53 100644 --- a/flake.nix +++ b/flake.nix @@ -5,11 +5,6 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; - #home-manager = { - # url = "github:nix-community/home-manager"; - # inputs.nixpkgs.follows = "nixpkgs"; - #}; - grub2-themes.url = "github:vinceliuice/grub2-themes"; ags.url = "github:Aylur/ags"; From d26b8af26f622bc48e74c57612491f619dd8f642 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Tue, 7 Oct 2025 12:49:56 +1000 Subject: [PATCH 42/72] add work conditional .gitconfig --- homes/modules/git.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/homes/modules/git.nix b/homes/modules/git.nix index 82d0f1e..c2578a8 100755 --- a/homes/modules/git.nix +++ b/homes/modules/git.nix @@ -35,5 +35,12 @@ }; }; }; + + includes = [ + { + path = "/home/me/agribit/.gitconfig"; + condition = "gitdir:/home/me/agribit/"; + } + ]; }; } From c46d9665a180447bfb62fc89149129465ca2854c Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Wed, 8 Oct 2025 10:39:41 +1000 Subject: [PATCH 43/72] fix conditional .gitconfig --- homes/modules/git.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/homes/modules/git.nix b/homes/modules/git.nix index c2578a8..fdf6afb 100755 --- a/homes/modules/git.nix +++ b/homes/modules/git.nix @@ -33,13 +33,19 @@ "github:" ]; }; + "https://gitlab.com/" = { + insteadOf = [ + "gl:" + "gitlab:" + ]; + }; }; }; includes = [ { path = "/home/me/agribit/.gitconfig"; - condition = "gitdir:/home/me/agribit/"; + condition = "gitdir:/home/me/agribit/**"; } ]; }; From 78c75ea740abd19744adb5967105d742aaaa879a Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Wed, 8 Oct 2025 10:59:14 +1000 Subject: [PATCH 44/72] add NetCoreDbg for helix --- hosts/myputer/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index 5a866c2..50d3bf6 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -8,7 +8,7 @@ }: let home-manager = builtins.fetchTarball { url = "https://github.com/nix-community/home-manager/archive/release-25.05.tar.gz"; - sha256 = "1wl2plp37a8qw26h6cj3ah6rq8bd3awl2938h5cm9b8ncxn4s1k8"; + sha256 = "0q3lv288xlzxczh6lc5lcw0zj9qskvjw3pzsrgvdh8rl8ibyq75s"; }; in { imports = [ @@ -304,6 +304,7 @@ in { dotnetCorePackages.dotnet_9.aspnetcore dotnetCorePackages.dotnet_9.runtime omnisharp-roslyn + netcoredbg openvpn inetutils From f51ac822e0eb26112c7b137b081182969ff7038f Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Wed, 8 Oct 2025 11:15:21 +1000 Subject: [PATCH 45/72] enable vscodium --- homes/me/default.nix | 4 +--- homes/modules/editor/vscodium.nix | 12 ++++++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/homes/me/default.nix b/homes/me/default.nix index 194d568..86b4c0b 100755 --- a/homes/me/default.nix +++ b/homes/me/default.nix @@ -12,12 +12,10 @@ ../modules/bat.nix ../modules/fish.nix ../modules/editor/helix.nix - # ../modules/editor/vscodium.nix + ../modules/editor/vscodium.nix ../modules/btop.nix - ../modules/term/ghostty.nix ../modules/term/foot.nix - # ../modules/term/rio.nix ../modules/firefox.nix #../modules/wm/hypr/hypridle.nix diff --git a/homes/modules/editor/vscodium.nix b/homes/modules/editor/vscodium.nix index c5daf64..5309bf7 100644 --- a/homes/modules/editor/vscodium.nix +++ b/homes/modules/editor/vscodium.nix @@ -1,9 +1,17 @@ {pkgs, ...}: { + # REF: https://home-manager-options.extranix.com/?query=vscode&release=release-25.05 programs.vscode = { enable = true; package = pkgs.vscodium; - extensions = with pkgs.vscode-extensions; [ - ]; + mutableExtensionsDir = true; + + profiles.default = { + enableUpdateCheck = false; + enableExtensionUpdateCheck = false; + extensions = with pkgs.vscode-extensions; [ + dracula-theme.theme-dracula + ]; + }; }; } From a29c66e35d5a52a57682080b4a2747cf557a0554 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 24 Oct 2025 11:44:02 +1000 Subject: [PATCH 46/72] add mako notification daemon --- config.temp/hyprland.conf | 1 + homes/me/default.nix | 1 + homes/modules/mako.nix | 54 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 homes/modules/mako.nix diff --git a/config.temp/hyprland.conf b/config.temp/hyprland.conf index 864b184..7243478 100755 --- a/config.temp/hyprland.conf +++ b/config.temp/hyprland.conf @@ -40,6 +40,7 @@ $colorpicker = hyprpicker | head -c 7 | wl-copy # exec-once = nm-applet & # exec-once = waybar & hyprpaper & firefox exec-once = swww-daemon & +exec-once = mako & # TODO: or do I do `swww init` or `swww restore`? # █▀▀ █▄░█ █░█   █░█ ▄▀█ █▀█ diff --git a/homes/me/default.nix b/homes/me/default.nix index 86b4c0b..46b2de6 100755 --- a/homes/me/default.nix +++ b/homes/me/default.nix @@ -22,6 +22,7 @@ ../modules/wm/hypr/hyprlock.nix ../modules/kanshi.nix ../modules/ags + ../modules/mako.nix ]; home = { diff --git a/homes/modules/mako.nix b/homes/modules/mako.nix new file mode 100644 index 0000000..762cd96 --- /dev/null +++ b/homes/modules/mako.nix @@ -0,0 +1,54 @@ +{...}: let + dracula = rec { + background = "#282A36"; + border = cyan; + + cyan = "#8BE9FD"; + yellow = "#F1FA8C"; + red = "#FF5555"; + }; + + theme = dracula; +in { + # notification daemon for Wayland + services.mako = { + enable = true; + settings = { + actions = true; + anchor = "top-right"; + layer = "overlay"; + sort = "-time"; + + height = 100; + width = 300; + margin = 50; + background-color = theme.background; + border-color = theme.border; + border-radius = 20; + border-size = 4; + font = "monospace 10"; + + markup = true; + icons = true; + max-icon-size = 64; + + default-timeout = 5000; + ignore-timeout = false; + + "actionable=true" = { + anchor = "top-left"; + }; + + "urgency=low" = { + border-color = theme.border; + }; + "urgency=normal" = { + border-color = theme.yellow; + }; + "urgency=high" = { + default-timeout = 0; + border-color = theme.red; + }; + }; + }; +} From 8e2aad53be8b8bd11f601993a5795ca859c22a10 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 24 Oct 2025 11:45:00 +1000 Subject: [PATCH 47/72] customise vscodium --- homes/modules/editor/vscodium.nix | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/homes/modules/editor/vscodium.nix b/homes/modules/editor/vscodium.nix index 5309bf7..ecde271 100644 --- a/homes/modules/editor/vscodium.nix +++ b/homes/modules/editor/vscodium.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: { +{ + lib, + pkgs, + ... +}: { # REF: https://home-manager-options.extranix.com/?query=vscode&release=release-25.05 programs.vscode = { enable = true; @@ -9,9 +13,25 @@ profiles.default = { enableUpdateCheck = false; enableExtensionUpdateCheck = false; + # extension format: USER.PACKAGENAME extensions = with pkgs.vscode-extensions; [ + # .NET + ms-dotnettools.csharp + ms-dotnettools.csdevkit + ms-dotnettools.vscode-dotnet-runtime + # ms-dotnettools.vscode-dotnet-pack + # ms-dotnettools.dotnet-maui + + # Colors & Themes dracula-theme.theme-dracula + catppuccin.catppuccin-vsc + catppuccin.catppuccin-vsc-icons + mvllow.rose-pine ]; + + userSettings = { + "workbench.colorTheme" = "Dracula Theme"; + }; }; }; } From 1600fd2885695126d64aac7bb166ac83eeb34599 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 24 Oct 2025 11:46:08 +1000 Subject: [PATCH 48/72] fix bashistrans (myputer) --- hosts/myputer/default.nix | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index 50d3bf6..244f5eb 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -403,21 +403,6 @@ in { }; }; - # I want to use fish as my login shell but it always goes terrible - # cause it isn't POSIX compliant, so instead Bash is my login and - # will just exec fish (^-^) - bash = { - completion.enable = true; - - interactiveShellInit = '' - if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] - then - shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION="" - exec ${pkgs.fish}/bin/fish $LOGIN_OPTION - fi - ''; - }; - # Thunar also (optionally) requires: `services.tumbler` & `services.gvfs` thunar = { enable = true; From 1d54b413477480c64ff7e980a6cf4f202dcf50f8 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 24 Oct 2025 11:47:20 +1000 Subject: [PATCH 49/72] replace vscodium -> vscode --- homes/me/default.nix | 9 ++- homes/modules/editor/vscode.nix | 134 ++++++++++++++++++++++++++++++++ 2 files changed, 141 insertions(+), 2 deletions(-) create mode 100644 homes/modules/editor/vscode.nix diff --git a/homes/me/default.nix b/homes/me/default.nix index 46b2de6..ac87870 100755 --- a/homes/me/default.nix +++ b/homes/me/default.nix @@ -6,13 +6,13 @@ pkgs, pkgs-unstable, ... -}: { +} @ args: { imports = [ ../modules/git.nix ../modules/bat.nix ../modules/fish.nix ../modules/editor/helix.nix - ../modules/editor/vscodium.nix + (import ../modules/editor/vscode.nix args) ../modules/btop.nix ../modules/term/foot.nix @@ -25,6 +25,11 @@ ../modules/mako.nix ]; + nixpkgs.config.allowUnfreePredicate = pkg: + builtins.elem (lib.GetName pkg) [ + "vscode-extension-ms-dotnettools-csharp" + ]; + home = { username = "me"; homeDirectory = "/home/me"; diff --git a/homes/modules/editor/vscode.nix b/homes/modules/editor/vscode.nix new file mode 100644 index 0000000..f824b1c --- /dev/null +++ b/homes/modules/editor/vscode.nix @@ -0,0 +1,134 @@ +{ + config, + lib, + pkgs, + vscodium ? false, + secret-service ? "gnome-libsecret", + vscode-argv ? ".vscode/argv.json", + ... +}: { + nixpkgs.overlays = [ + ( + self: super: { + vscode-extensions = super.vscode-extensions.overrideAttrs (prev: let + mkVscMarketplaceExtension = { + publisher, + name, + version, + hash, + description ? "", + homepage ? null, + changelog ? null, + license ? null, + maintainers ? [lib.maintainers.emileclarkb], + }: + with pkgs.vscode-utils.buildVscodeMarketplaceExtension; { + ${publisher}.${name} = buildVscodeMarketplaceExtension { + mktplcRef = { + inherit + publisher + name + version + hash + ; + }; + + meta = { + inherit + ( + if license != null + then {license = license;} + else {} + ) + description + homepage + maintainers + ; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=${publisher}.${name}"; + changelog = + if changelog != null + then changelog + else "https://marketplace.visualstudio.com/items/${publisher}.${name}/changelog"; + }; + }; + }; + in + lib.mergeAttrsList [ + (mkVscMarketplaceExtension { + publisher = "ms-dotnettools"; + name = "dotnet-maui"; + version = "1.11.14"; + hash = lib.fakeHash; + + description = "Extend C# Dev Kit with tools for building .NET Multi-platform App UI (MAUI) apps"; + homepage = "https://github.com/microsoft/vscode-dotnettools"; + license = lib.licenses.unfree; + }) + ]); + } + ) + ]; + + # REF: https://home-manager-options.extranix.com/?query=vscode&release=release-25.05 + programs.vscode = { + enable = true; + # TODO: clean up + package = + ( + if vscodium + then pkgs.vscodium + else pkgs.vscode + ).overrideAttrs (oldAttrs: { + # runtimeDependencies = oldAttrs.runtimeDependencies ++ [] + }); + + mutableExtensionsDir = true; + + profiles.default = { + enableUpdateCheck = false; + enableExtensionUpdateCheck = false; + # extension format: USER.PACKAGENAME + extensions = with pkgs.vscode-extensions; [ + # .NET + ms-dotnettools.csharp + ms-dotnettools.csdevkit + ms-dotnettools.vscode-dotnet-runtime + # TODO: these extensions aren't packaged :( + # deitry.solution-syntax + # ms-dotnettools.vscode-dotnet-pack + # ms-dotnettools.dotnet-maui + + # Python + ms-python.python + + # GitLens by GitKraken + eamodio.gitlens + ms-azuretools.vscode-docker + + github.copilot + github.copilot-chat + + # Colors & Themes + dracula-theme.theme-dracula + catppuccin.catppuccin-vsc + catppuccin.catppuccin-vsc-icons + mvllow.rose-pine + ]; + + userSettings = { + "workbench.colorTheme" = "Dracula Theme"; + "github.copilot.nextEditSuggestions.enabled" = true; + }; + }; + }; + + # TODO: this is super ugly, make sure the JSON is formatted!! + home.file.${vscode-argv}.text = builtins.toJSON { + password-store = secret-service; + + disable-hardware-acceleration = false; + disable-color-correct-rendering = false; + enable-crash-reporter = false; + # crash-report-id = ...; + }; +} From ce3eb7a6d80546318e052b27c8cdb5890a25639c Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 24 Oct 2025 11:47:58 +1000 Subject: [PATCH 50/72] vscode requires an OS keyring daemon --- homes/me/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/homes/me/default.nix b/homes/me/default.nix index ac87870..d37a8e9 100755 --- a/homes/me/default.nix +++ b/homes/me/default.nix @@ -50,6 +50,12 @@ name = "Bibata-Modern-Ice"; size = 16; }; + + packages = with pkgs; [ + # for services.gnome-keyring + pkgs.gcr # provides org.gnome.keyring.SystemPrompter + seahorse # gui + ]; }; gtk = { @@ -144,8 +150,12 @@ }; }; - # enable OpenSSH private key agent - services.ssh-agent.enable = true; + services = { + # enable OpenSSH private key agent + ssh-agent.enable = true; + + gnome-keyring.enable = true; + }; # the ssh-agent won't set this for itself... systemd.user.sessionVariables.SSH_AUTH_SOCK = "$XDG_RUNTIME_DIR/ssh-agent"; # Nicely reload system units when changing configs From 63c1f112d4b27287be3af8088d83a1be9f699657 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 24 Oct 2025 11:48:49 +1000 Subject: [PATCH 51/72] (temp) hide chameleonultra+flipperzero to improve build time --- hosts/myputer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index 244f5eb..72b1e7d 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -22,8 +22,8 @@ in { ../modules/steam.nix ../modules/obsidian.nix - ../modules/flipperzero.nix - ../modules/chameleonultragui.nix + #../modules/flipperzero.nix + #../modules/chameleonultragui.nix ]; nix.settings.experimental-features = [ From 1ee0ba1a4ca55b0c62ba12a1a586760a642a4025 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 24 Oct 2025 11:50:00 +1000 Subject: [PATCH 52/72] fix vscode plugins not whitelisted --- hosts/myputer/default.nix | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index 72b1e7d..df47254 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -39,15 +39,26 @@ in { # ]; nixpkgs.config.allowUnfreePredicate = let - whitelist = map lib.getName [ - pkgs.obsidian - pkgs.gitkraken - pkgs.steam - pkgs.steamcmd - pkgs.steam-unwrapped - pkgs.dwarf-fortress - pkgs.discord - ]; + whitelist = let + vscext = pkgs.vscode-extensions; + in + with pkgs; + map lib.getName [ + discord + steam + steamcmd + steam-unwrapped + dwarf-fortress + + obsidian + gitkraken + + vscode + vscext.ms-dotnettools.csharp + vscext.ms-dotnettools.csdevkit + vscext.github.copilot + vscext.github.copilot-chat + ]; in pkg: builtins.elem (lib.getName pkg) whitelist; From 892a1ae877b27b88aa0af16ff7c5f107d8d054a5 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 24 Oct 2025 11:51:49 +1000 Subject: [PATCH 53/72] add MicroTik WinBox --- hosts/modules/apps/winbox.nix | 6 ++++++ hosts/myputer/default.nix | 14 +++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 hosts/modules/apps/winbox.nix diff --git a/hosts/modules/apps/winbox.nix b/hosts/modules/apps/winbox.nix new file mode 100644 index 0000000..eaf8b7c --- /dev/null +++ b/hosts/modules/apps/winbox.nix @@ -0,0 +1,6 @@ +{...}: { + programs.winbox = { + enable = true; + openFirewall = false; # port: 5678 + }; +} diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index df47254..2ba674d 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -20,7 +20,9 @@ in { ../modules/wm/hyprland.nix ../modules/steam.nix + ../modules/obsidian.nix + ../modules/apps/winbox.nix #../modules/flipperzero.nix #../modules/chameleonultragui.nix @@ -50,6 +52,8 @@ in { steam-unwrapped dwarf-fortress + winbox + obsidian gitkraken @@ -118,7 +122,15 @@ in { hostName = "myputer"; networkmanager.enable = true; - firewall.enable = true; + firewall = { + enable = true; + allowedTCPPorts = [ + 22 # SSH + 80 # HTTP + 443 # HTTPS + 5678 # MikroTik WinBox + ]; + }; }; # ----- SERVICES ----- From fd48d6af9a3eaf7a12bb8560048161d849b4d2b0 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 24 Oct 2025 11:52:08 +1000 Subject: [PATCH 54/72] add Mozilla Thunderbird --- homes/me/default.nix | 1 + homes/modules/apps/thunderbird.nix | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100644 homes/modules/apps/thunderbird.nix diff --git a/homes/me/default.nix b/homes/me/default.nix index d37a8e9..227ae21 100755 --- a/homes/me/default.nix +++ b/homes/me/default.nix @@ -17,6 +17,7 @@ ../modules/btop.nix ../modules/term/foot.nix ../modules/firefox.nix + ../modules/apps/thunderbird.nix #../modules/wm/hypr/hypridle.nix ../modules/wm/hypr/hyprlock.nix diff --git a/homes/modules/apps/thunderbird.nix b/homes/modules/apps/thunderbird.nix new file mode 100644 index 0000000..dd4f861 --- /dev/null +++ b/homes/modules/apps/thunderbird.nix @@ -0,0 +1,10 @@ +{...}: { + programs.thunderbird = { + enable = true; + profiles = { + "me" = { + isDefault = true; + }; + }; + }; +} From 596fcd5389f45bbc79e13e7a78631cb9625d37e9 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 24 Oct 2025 11:52:24 +1000 Subject: [PATCH 55/72] add Tor Browser --- homes/me/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/homes/me/default.nix b/homes/me/default.nix index 227ae21..f264790 100755 --- a/homes/me/default.nix +++ b/homes/me/default.nix @@ -56,6 +56,7 @@ # for services.gnome-keyring pkgs.gcr # provides org.gnome.keyring.SystemPrompter seahorse # gui + tor-browser ]; }; From 46ed0778136576b1dbb33e8d7fe9934b2214f3b3 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 24 Oct 2025 11:52:46 +1000 Subject: [PATCH 56/72] open minecraft server port 25565 (myputer) --- hosts/myputer/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index 2ba674d..17bdc86 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -129,6 +129,7 @@ in { 80 # HTTP 443 # HTTPS 5678 # MikroTik WinBox + 25565 # Minecraft LAN ]; }; }; From 17807752e57ef6f56d552e5cda553a8ca19daf87 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 24 Oct 2025 11:53:42 +1000 Subject: [PATCH 57/72] packaging JetBrains Rider (UNSTABLE) --- hosts/modules/apps/rider.nix | 47 ++++++++++++++++++++++++++++++++++++ hosts/myputer/default.nix | 8 ++++++ 2 files changed, 55 insertions(+) create mode 100644 hosts/modules/apps/rider.nix diff --git a/hosts/modules/apps/rider.nix b/hosts/modules/apps/rider.nix new file mode 100644 index 0000000..cf54c66 --- /dev/null +++ b/hosts/modules/apps/rider.nix @@ -0,0 +1,47 @@ +{ + pkgs, + pkgs-unstable, + ... +}: { + nixpkgs.overlays = [ + (self: super: { + # rider-override = super.jetbrains.rider.overrideAttrs ( + # final: prev: { + # # XXX: DEBUG + # buildInputs = prev.buildInputs ++ [pkgs.icu]; + # } + # ); + + # rider-fhs = super.buildFHSEnv { + # name = "rider-fhs"; + + # targetPkgs = pkgs: + # with pkgs; [ + # jetbrains.rider + # icu + # ]; + + # runScript = ''${super.jetbrains.rider}/bin/rider''; + + # profile = '' + # export DOTNET_CLI_TELEMETRY_OPTOUT=1 + # ''; + # }; + }) + ]; + + environment.systemPackages = [ + # rider-fhs + # rider-override + + # Unsure latest "stable" version + # pkgs-unstable.jetbrains.rider + ]; + + programs.nix-ld = { + enable = true; + libraries = with pkgs; [ + icu + ]; + }; +} diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index 17bdc86..753899f 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -22,6 +22,7 @@ in { ../modules/steam.nix ../modules/obsidian.nix + ../modules/apps/rider.nix ../modules/apps/winbox.nix #../modules/flipperzero.nix @@ -62,6 +63,12 @@ in { vscext.ms-dotnettools.csdevkit vscext.github.copilot vscext.github.copilot-chat + + # XXX: DEBUG + # rider-override + # XXX: DEBUG + + # jetbrains.rider ]; in pkg: builtins.elem (lib.getName pkg) whitelist; @@ -327,6 +334,7 @@ in { dotnetCorePackages.dotnet_9.sdk dotnetCorePackages.dotnet_9.aspnetcore dotnetCorePackages.dotnet_9.runtime + mono omnisharp-roslyn netcoredbg From 09db1c47e18c2c79ba5960c91249884b8b65a55e Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 24 Oct 2025 17:22:27 +1000 Subject: [PATCH 58/72] progress flake inputs to latest --- flake.lock | 80 +++++++++++++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index 4785725..14e353a 100644 --- a/flake.lock +++ b/flake.lock @@ -2,15 +2,15 @@ "nodes": { "ags": { "inputs": { - "nixpkgs": "nixpkgs", - "systems": "systems" + "astal": "astal", + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1728326430, - "narHash": "sha256-tV1ABHuA1HItMdCTuNdA8fMB+qw7LpjvI945VwMSABI=", + "lastModified": 1761132437, + "narHash": "sha256-ODNtCB3BHSv0EEA6AT3YDCELPeFX1n8e9lU1yL+s+Hk=", "owner": "Aylur", "repo": "ags", - "rev": "60180a184cfb32b61a1d871c058b31a3b9b0743d", + "rev": "63df72508c7d334c8f9f65d2e80e9db02838378b", "type": "github" }, "original": { @@ -19,6 +19,27 @@ "type": "github" } }, + "astal": { + "inputs": { + "nixpkgs": [ + "ags", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1761075011, + "narHash": "sha256-gQFgsJz2RQUMFdaHrbqRPYackAZYF3chcsZp8rUctVU=", + "owner": "aylur", + "repo": "astal", + "rev": "c8df34d0e5fc4f3a36f72bae7dfc5ecf0000e1c8", + "type": "github" + }, + "original": { + "owner": "aylur", + "repo": "astal", + "type": "github" + } + }, "colmena": { "inputs": { "flake-compat": "flake-compat", @@ -78,11 +99,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1730004881, - "narHash": "sha256-8xVIqIW25o2uCL0fxAmP4Sj9sdebarQXmd1+64yMe8o=", + "lastModified": 1757136219, + "narHash": "sha256-tKU+vq34KHu/A2wD7WdgP5A4/RCmSD8hB0TyQAUlixA=", "owner": "vinceliuice", "repo": "grub2-themes", - "rev": "42c232dfb46bf93c17506cbc1a574e5e89b5e09f", + "rev": "80dd04ddf3ba7b284a7b1a5df2b1e95ee2aad606", "type": "github" }, "original": { @@ -114,15 +135,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1725634671, - "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", - "owner": "NixOS", + "lastModified": 1760878510, + "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -130,11 +151,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1753939845, - "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=", + "lastModified": 1761114652, + "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "94def634a20494ee057c76998843c015909d6311", + "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", "type": "github" }, "original": { @@ -162,11 +183,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1730808093, - "narHash": "sha256-oOenwoxpzQsBNi7KltgnXqq6e0+CxlfNXKn3k27w6cQ=", + "lastModified": 1761269590, + "narHash": "sha256-yTr+PCi4wGbOEidrm8XyXBobLxLMqIBsbUyhwsN6wrc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c1a390f74b2c93f69a6805142f11a215a689cec1", + "rev": "d792a6e0cd4ba35c90ea787b717d72410f56dc40", "type": "github" }, "original": { @@ -178,11 +199,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1752620740, - "narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=", + "lastModified": 1761016216, + "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e", + "rev": "481cf557888e05d3128a76f14c76397b7d7cc869", "type": "github" }, "original": { @@ -216,21 +237,6 @@ "repo": "nixpkgs", "type": "github" } - }, - "systems": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } } }, "root": "root", From 11b4c920fc22c6c8fc50c4fc45c2cee79592cb78 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 24 Oct 2025 17:23:28 +1000 Subject: [PATCH 59/72] patch mbedtls_2 now labelled insecure occurred due to flake.lock progression --- hosts/modules/steam.nix | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/hosts/modules/steam.nix b/hosts/modules/steam.nix index 5c72185..e554441 100644 --- a/hosts/modules/steam.nix +++ b/hosts/modules/steam.nix @@ -3,13 +3,25 @@ lib, ... }: { - nixpkgs.config.allowUnfreePredicate = pkg: - builtins.elem (lib.getName pkg) [ - "steam" - "steam-original" - "steam-unwrapped" - "steam-run" - ]; + # nixpkgs.config.allowUnfreePredicate = pkg: + # builtins.elem (lib.getName pkg) [ + # "steam" + # "steam-original" + # "steam-unwrapped" + # "steam-run" + # ]; + nixpkgs.overlays = [ + (self: super: { + lutris = super.lutris.overrideAttrs (final: prev: { + # WARNING: pkgs.mbedtls_2 is marked insecure! + # Replace pkgs.mbedtls_2 (v2.28.10) with pkgs.mbedtls (v3.6.4) + targetPkgs = pkgs: ( + (builtins.filter (p: p != pkgs.mbedtls_2) (prev.targetPkgs pkgs)) + ++ [pkgs.mbedtls] + ); + }); + }) + ]; programs = { steam = { @@ -33,7 +45,12 @@ mangohud protonup-qt - lutris + + # XXX: DEBUG: disable lutris + # XXX: NOTE: pkgs.lutris depends on pkgs.mbedtls_2 which is marked insecure! + # XXX: NOTE: Use the provided overlay to patch pkgs.mbedtls_2 -> pkgs.mbedtls + # lutris + bottles heroic ]; From 2fb9171d923761168d24776f855a6cb487bf6820 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 24 Oct 2025 17:24:11 +1000 Subject: [PATCH 60/72] replace ags -> fuzzel ags usage changed after flake.lock progression --- config.temp/hyprland.conf | 5 +++-- homes/me/default.nix | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/config.temp/hyprland.conf b/config.temp/hyprland.conf index 7243478..4876e8a 100755 --- a/config.temp/hyprland.conf +++ b/config.temp/hyprland.conf @@ -25,8 +25,9 @@ monitor=eDP-1, highres@highrr, auto, 1.0 # Set programs that you use $terminal = ghostty #rio $fileManager = thunar -#$menu = wofi --show drun -$menu = ags -t "applauncher" +# $menu = wofi --show drun +# $menu = ags -t "applauncher" +$menu = fuzzel $colorpicker = hyprpicker | head -c 7 | wl-copy ################# diff --git a/homes/me/default.nix b/homes/me/default.nix index f264790..6df442b 100755 --- a/homes/me/default.nix +++ b/homes/me/default.nix @@ -56,7 +56,10 @@ # for services.gnome-keyring pkgs.gcr # provides org.gnome.keyring.SystemPrompter seahorse # gui + tor-browser + + fuzzel ]; }; From ffb9b35d46342e71fba5150dd4da0004ba5859c0 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 24 Oct 2025 17:24:58 +1000 Subject: [PATCH 61/72] clean rider install + progress to latest on pkgs-unstable --- hosts/modules/apps/rider.nix | 43 +++++++++++------------------------- hosts/myputer/default.nix | 8 ------- 2 files changed, 13 insertions(+), 38 deletions(-) diff --git a/hosts/modules/apps/rider.nix b/hosts/modules/apps/rider.nix index cf54c66..94ac874 100644 --- a/hosts/modules/apps/rider.nix +++ b/hosts/modules/apps/rider.nix @@ -3,39 +3,22 @@ pkgs-unstable, ... }: { - nixpkgs.overlays = [ - (self: super: { - # rider-override = super.jetbrains.rider.overrideAttrs ( - # final: prev: { - # # XXX: DEBUG - # buildInputs = prev.buildInputs ++ [pkgs.icu]; - # } - # ); + environment.systemPackages = with pkgs; [ + # Ensure latest stable Rider version (not necessarily stable on NixOS) + pkgs-unstable.jetbrains.rider - # rider-fhs = super.buildFHSEnv { - # name = "rider-fhs"; + # .NET + dotnetCorePackages.dotnet_9.sdk + dotnetCorePackages.dotnet_9.aspnetcore + dotnetCorePackages.dotnet_9.runtime - # targetPkgs = pkgs: - # with pkgs; [ - # jetbrains.rider - # icu - # ]; + # Mono + mono + msbuild - # runScript = ''${super.jetbrains.rider}/bin/rider''; - - # profile = '' - # export DOTNET_CLI_TELEMETRY_OPTOUT=1 - # ''; - # }; - }) - ]; - - environment.systemPackages = [ - # rider-fhs - # rider-override - - # Unsure latest "stable" version - # pkgs-unstable.jetbrains.rider + # .NET Framework Tools/Services + omnisharp-roslyn + netcoredbg ]; programs.nix-ld = { diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index 753899f..7121aeb 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -330,14 +330,6 @@ in { # Sage sageWithDoc # SageMath + HTML Documentation - # .NET - dotnetCorePackages.dotnet_9.sdk - dotnetCorePackages.dotnet_9.aspnetcore - dotnetCorePackages.dotnet_9.runtime - mono - omnisharp-roslyn - netcoredbg - openvpn inetutils From 728f933f394bfe32f1ebcbc72e4ad114e698dcbd Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 24 Oct 2025 17:25:15 +1000 Subject: [PATCH 62/72] increase nix.settings.download-buffer-size --- hosts/myputer/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index 7121aeb..0ffa5d5 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -29,10 +29,13 @@ in { #../modules/chameleonultragui.nix ]; - nix.settings.experimental-features = [ - "nix-command" - "flakes" - ]; + nix.settings = { + experimental-features = [ + "nix-command" + "flakes" + ]; + download-buffer-size = 524288000; # 500 MiB + }; # nixpkgs.overlays = [ # (self: super: { # jdk17 = super.jdk17.override (prev: { From e2f641e5535342db34fefb07bb261a32f626c1a5 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 24 Oct 2025 17:31:23 +1000 Subject: [PATCH 63/72] use pkgs-unstable.msbuild pkgs.msbuild use .NET6 (marked insecure), pkgs-unstable.msbuild uses .NET8 --- hosts/modules/apps/rider.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hosts/modules/apps/rider.nix b/hosts/modules/apps/rider.nix index 94ac874..d7b3a1c 100644 --- a/hosts/modules/apps/rider.nix +++ b/hosts/modules/apps/rider.nix @@ -14,7 +14,9 @@ # Mono mono - msbuild + # NOTE: nixpkgs-unstable uses .NET8 SDK + # WARNING: nixpkgs-25.05 uses .NET6 SDK (now marked insecure) + pkgs-unstable.msbuild # .NET Framework Tools/Services omnisharp-roslyn From c8d3fe1e6b552a697ff2de3f198c9d1057227b97 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 24 Oct 2025 23:39:00 +1000 Subject: [PATCH 64/72] add tmux --- homes/me/default.nix | 8 +++++--- homes/modules/tmux.nix | 5 +++++ 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 homes/modules/tmux.nix diff --git a/homes/me/default.nix b/homes/me/default.nix index 6df442b..5f4c039 100755 --- a/homes/me/default.nix +++ b/homes/me/default.nix @@ -8,14 +8,16 @@ ... } @ args: { imports = [ + ../modules/fish.nix + ../modules/btop.nix + ../modules/tmux.nix + ../modules/term/foot.nix ../modules/git.nix ../modules/bat.nix - ../modules/fish.nix + ../modules/editor/helix.nix (import ../modules/editor/vscode.nix args) - ../modules/btop.nix - ../modules/term/foot.nix ../modules/firefox.nix ../modules/apps/thunderbird.nix diff --git a/homes/modules/tmux.nix b/homes/modules/tmux.nix new file mode 100644 index 0000000..e5946c0 --- /dev/null +++ b/homes/modules/tmux.nix @@ -0,0 +1,5 @@ +{...}: { + programs.tmux = { + enable = true; + }; +} From ca3fd4093f9d25d6966bdc98f5bcbaa6dc60e696 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 24 Oct 2025 23:44:56 +1000 Subject: [PATCH 65/72] fix ugly nixpkgs.config.allowUnfreePredicate --- hosts/myputer/default.nix | 44 +++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index 0ffa5d5..8b5079b 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -45,34 +45,32 @@ in { # ]; nixpkgs.config.allowUnfreePredicate = let - whitelist = let - vscext = pkgs.vscode-extensions; - in - with pkgs; - map lib.getName [ - discord - steam - steamcmd - steam-unwrapped - dwarf-fortress + vscext = pkgs.vscode-extensions; + whitelist = with pkgs; + map lib.getName [ + discord + steam + steamcmd + steam-unwrapped + dwarf-fortress - winbox + winbox - obsidian - gitkraken + obsidian + gitkraken - vscode - vscext.ms-dotnettools.csharp - vscext.ms-dotnettools.csdevkit - vscext.github.copilot - vscext.github.copilot-chat + vscode + vscext.ms-dotnettools.csharp + vscext.ms-dotnettools.csdevkit + vscext.github.copilot + vscext.github.copilot-chat - # XXX: DEBUG - # rider-override - # XXX: DEBUG + # XXX: DEBUG + # rider-override + # XXX: DEBUG - # jetbrains.rider - ]; + # jetbrains.rider + ]; in pkg: builtins.elem (lib.getName pkg) whitelist; From 8f222f454ad6c49ca2b67e6de33ae63471b13e66 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 24 Oct 2025 23:45:29 +1000 Subject: [PATCH 66/72] add vscode + extensions to lolcathost nixpkgs allowed unfree --- hosts/lolcathost/default.nix | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index 9075286..b09a29c 100755 --- a/hosts/lolcathost/default.nix +++ b/hosts/lolcathost/default.nix @@ -35,14 +35,32 @@ in { ]; nixpkgs.config.allowUnfreePredicate = let - whitelist = map lib.getName [ - pkgs.obsidian - pkgs.gitkraken - pkgs.steam - pkgs.steamcmd - pkgs.steam-unwrapped - pkgs.dwarf-fortress - ]; + vscext = pkgs.vscode-extensions; + whitelist = with pkgs; + map lib.getName [ + discord + steam + steamcmd + steam-unwrapped + dwarf-fortress + + winbox + + obsidian + gitkraken + + vscode + vscext.ms-dotnettools.csharp + vscext.ms-dotnettools.csdevkit + vscext.github.copilot + vscext.github.copilot-chat + + # XXX: DEBUG + # rider-override + # XXX: DEBUG + + # jetbrains.rider + ]; in pkg: builtins.elem (lib.getName pkg) whitelist; From 8a14f7e2fc78d40dddb499a79d088f2b8896b3b9 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Fri, 24 Oct 2025 23:46:17 +1000 Subject: [PATCH 67/72] remove dwarf-fortress & mindustry --- hosts/lolcathost/default.nix | 3 --- hosts/myputer/default.nix | 1 - 2 files changed, 4 deletions(-) diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index b09a29c..dbf965d 100755 --- a/hosts/lolcathost/default.nix +++ b/hosts/lolcathost/default.nix @@ -42,7 +42,6 @@ in { steam steamcmd steam-unwrapped - dwarf-fortress winbox @@ -382,8 +381,6 @@ in { libargon2 # Games - mindustry - dwarf-fortress prismlauncher # minecraft ]; diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index 8b5079b..6986a31 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -52,7 +52,6 @@ in { steam steamcmd steam-unwrapped - dwarf-fortress winbox From 8f7a725fd591ac63a5dec2f27826e88f5136a5da Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Sat, 1 Nov 2025 12:08:58 +1000 Subject: [PATCH 68/72] JetBrains Rider requires Chromium browser --- hosts/modules/apps/rider.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hosts/modules/apps/rider.nix b/hosts/modules/apps/rider.nix index d7b3a1c..adf8885 100644 --- a/hosts/modules/apps/rider.nix +++ b/hosts/modules/apps/rider.nix @@ -7,6 +7,10 @@ # Ensure latest stable Rider version (not necessarily stable on NixOS) pkgs-unstable.jetbrains.rider + # NOTE: Blazor requires a Chromium-based browser + chromium + # arc-browser + # .NET dotnetCorePackages.dotnet_9.sdk dotnetCorePackages.dotnet_9.aspnetcore From 91afb320497611681ed4fffa5d33b0008f8f867c Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Sat, 1 Nov 2025 12:09:28 +1000 Subject: [PATCH 69/72] add speedtest-cli --- homes/me/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/homes/me/default.nix b/homes/me/default.nix index 5f4c039..6998e63 100755 --- a/homes/me/default.nix +++ b/homes/me/default.nix @@ -62,6 +62,8 @@ tor-browser fuzzel + + speedtest-cli ]; }; From a03ea35af7cf5a8c50deec0bacf4b091f897ebc2 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Sat, 1 Nov 2025 12:27:00 +1000 Subject: [PATCH 70/72] begin working on my nib library <3 --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 31f728a..81b47aa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ ISSUES/ secrets/ +nib/ result rebuild*.log From 540fd9c2a99e1317375a0849b4de670d76c086bf Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Sat, 1 Nov 2025 13:21:32 +1000 Subject: [PATCH 71/72] begin migrating hyprland config to home-manager --- homes/modules/wm/hypr/hyprland.nix | 41 ++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/homes/modules/wm/hypr/hyprland.nix b/homes/modules/wm/hypr/hyprland.nix index 40a1d99..b9ca1f7 100755 --- a/homes/modules/wm/hypr/hyprland.nix +++ b/homes/modules/wm/hypr/hyprland.nix @@ -1,2 +1,43 @@ # NOTE: hyprland must be enabled in BOTH your host config (for running hyprland) # and your home-manager config (for managing hyprland's config files) +{ + pkgs, + pkgs-unstable, + inputs, + config, + lib, + ... +}: { + options.hyprland = { + enable = lib.mkEnableOption "Hyprland"; + }; + + config = lib.mkIf config.hyprland.enable { + wayland.windowManager.hyprland = { + enable = true; + package = pkgs.hyprland; # pkgs-unstable.hyprland; + + xwayland.enable = true; + + systemd = { + enable = true; + # enable autostart of applications + # REF: `man 8 systemd-xdg-autostart-generator` + enableXdgAutostart = true; + }; + + plugins = with inputs; [ + split-monitor-workspaces.packages.${pkgs.system}.split + ]; + }; + + xdg.portal = { + enable = true; + extraPortals = with pkgs; [ + xdg-desktop-portal-gtk + ]; + }; + + # TODO: finish this + }; +} From f0c7f565c3435cedd17859dfce0acdb1d7da0f03 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Sat, 1 Nov 2025 13:21:55 +1000 Subject: [PATCH 72/72] remove flake.nix:inputs.ags --- flake.lock | 75 +++++++----------------------------------------------- flake.nix | 6 ++--- 2 files changed, 11 insertions(+), 70 deletions(-) diff --git a/flake.lock b/flake.lock index 14e353a..e1ab303 100644 --- a/flake.lock +++ b/flake.lock @@ -1,51 +1,11 @@ { "nodes": { - "ags": { - "inputs": { - "astal": "astal", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1761132437, - "narHash": "sha256-ODNtCB3BHSv0EEA6AT3YDCELPeFX1n8e9lU1yL+s+Hk=", - "owner": "Aylur", - "repo": "ags", - "rev": "63df72508c7d334c8f9f65d2e80e9db02838378b", - "type": "github" - }, - "original": { - "owner": "Aylur", - "repo": "ags", - "type": "github" - } - }, - "astal": { - "inputs": { - "nixpkgs": [ - "ags", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1761075011, - "narHash": "sha256-gQFgsJz2RQUMFdaHrbqRPYackAZYF3chcsZp8rUctVU=", - "owner": "aylur", - "repo": "astal", - "rev": "c8df34d0e5fc4f3a36f72bae7dfc5ecf0000e1c8", - "type": "github" - }, - "original": { - "owner": "aylur", - "repo": "astal", - "type": "github" - } - }, "colmena": { "inputs": { "flake-compat": "flake-compat", "flake-utils": "flake-utils", "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "stable": "stable" }, "locked": { @@ -96,7 +56,7 @@ }, "grub2-themes": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1757136219, @@ -135,15 +95,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760878510, - "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", - "owner": "nixos", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -166,22 +126,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1734119587, - "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1761269590, "narHash": "sha256-yTr+PCi4wGbOEidrm8XyXBobLxLMqIBsbUyhwsN6wrc=", @@ -197,7 +141,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1761016216, "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=", @@ -215,10 +159,9 @@ }, "root": { "inputs": { - "ags": "ags", "colmena": "colmena", "grub2-themes": "grub2-themes", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable" } }, diff --git a/flake.nix b/flake.nix index 3d40a53..e339ce6 100644 --- a/flake.nix +++ b/flake.nix @@ -5,11 +5,9 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; - grub2-themes.url = "github:vinceliuice/grub2-themes"; - - ags.url = "github:Aylur/ags"; - colmena.url = "github:zhaofengli/colmena/?rev=47b6414d800c8471e98ca072bc0835345741a56a"; + + grub2-themes.url = "github:vinceliuice/grub2-themes"; }; outputs = {