From ca8ef5df01aad8ac3b2c7dc874c3a1133d36beef Mon Sep 17 00:00:00 2001 From: atagen Date: Mon, 21 Jul 2025 13:51:35 +1000 Subject: [PATCH 1/5] fix up fish aliases/abbrs --- common/terminal.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/common/terminal.nix b/common/terminal.nix index fc1a6a1..8df638b 100644 --- a/common/terminal.nix +++ b/common/terminal.nix @@ -1,11 +1,9 @@ { pkgs, inputs, - config, ... }: let - inherit (config) rice; inherit (pkgs) fish; in { @@ -26,8 +24,13 @@ in "gap" = "git commit -a --amend --no-edit && git push --force"; "gl" = "git pull"; "ga" = "git add"; - "l" = "eza -lg --icons=always --colour=always | culr"; - "la" = "eza -lg --icons=always --colour=always | culr"; + "gcam" = "git commit -am"; + }; + shellAliases = { + "l" = "eza -lg --icons=always --colour=always $argv | culr"; + "la" = "eza -lg --icons=always --colour=always $argv | culr"; + "p" = "ps $argv | culr"; + "mnt" = "mount | culr"; }; interactiveShellInit = '' ${./rice/header.sh} From b41fb6a2e48d78cbbca736fc78c4e270ee8a4cfa Mon Sep 17 00:00:00 2001 From: atagen Date: Mon, 21 Jul 2025 13:51:49 +1000 Subject: [PATCH 2/5] update meat --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index a788687..fc5440d 100644 --- a/flake.lock +++ b/flake.lock @@ -462,11 +462,11 @@ "unf": "unf" }, "locked": { - "lastModified": 1752989803, - "narHash": "sha256-KusN7z80ZuWFdPu/U086MIodHyazY1J8vroZmuU+21Y=", + "lastModified": 1753059450, + "narHash": "sha256-WsGRRQGNnPu0Bv5QPhbnouAWjdsmCuE9VzgZN7U+EQY=", "ref": "refs/heads/master", - "rev": "6b4a286da4884242b6a62e4cd0c9f95bba0b3721", - "revCount": 37, + "rev": "de951b227223ee924c37c7aa282bade34686bf83", + "revCount": 38, "type": "git", "url": "https://git.atagen.co/atagen/meat" }, From cd1d027e49162536c00c5ead93572b3a3b1a0c1b Mon Sep 17 00:00:00 2001 From: atagen Date: Mon, 21 Jul 2025 14:36:04 +1000 Subject: [PATCH 3/5] add yazi --- common/cli.nix | 16 ++++++++++++++++ pkg/fr-yazi.nix | 14 ++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 pkg/fr-yazi.nix diff --git a/common/cli.nix b/common/cli.nix index 9782eab..68d1ef7 100644 --- a/common/cli.nix +++ b/common/cli.nix @@ -1,5 +1,6 @@ { pkgs, + userPkgs, ... }: { @@ -22,4 +23,19 @@ ouch ; }; + programs.yazi = { + enable = true; + plugins = { + inherit (pkgs.yaziPlugins) + lazygit + chmod + diff + mediainfo + smart-enter + full-border + wl-clipboard + ; + fr = pkgs.callPackage userPkgs.fr-yazi { }; + }; + }; } diff --git a/pkg/fr-yazi.nix b/pkg/fr-yazi.nix new file mode 100644 index 0000000..7a72a91 --- /dev/null +++ b/pkg/fr-yazi.nix @@ -0,0 +1,14 @@ +{ + pkgs, + ... +}: +pkgs.yaziPlugins.mkYaziPlugin { + pname = "fr.yazi"; + version = "dirty-15-07-2025"; + src = pkgs.fetchFromGitHub { + owner = "lpnh"; + repo = "fr.yazi"; + rev = "3d32e55b7367334abaa91f36798ef723098d0a6b"; + hash = "sha256-CrKwFMaiEK+TNW6GRZzyt9MfOmjIb3vw0hBpBXyn16k="; + }; +} From 7f59c3301b245a42b1f3e9a9990bb203785ab7be Mon Sep 17 00:00:00 2001 From: atagen Date: Mon, 21 Jul 2025 14:50:01 +1000 Subject: [PATCH 4/5] create readme --- README.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..25b3a4a --- /dev/null +++ b/README.md @@ -0,0 +1,19 @@ +# a nixos config + +## mission statement + +this config attempts to follow the [synaptic standard](https://github.com/llakala/synaptic-standard/), and is built in an effort to achieve **semantic colocation**. + +ideally, our modules are categorised by the purpose they hope to fulfil, and contain all the information necessary to achieve that within their context. + +this is in contrast to many configuration styles which may be structured in a way that is beholden to mechanical details (implementations, module systems, or other scope they may carry). + +here, *we do not build our dreams of concrete*. + +## mechanism + +recursive imports and module aliasing bend the module system/s to our will. + +this allows us to create freeform sets of modules which realise broad purposes while cross-cutting module system concerns, all with a single toplevel import point. + +you can see [entry.nix](./entry.nix) and [util/create.nix](util/create.nix) for the explicit details of how this is done. From f4475f87a3a4bc97ac6275ba69990a093d61dbf5 Mon Sep 17 00:00:00 2001 From: atagen Date: Mon, 21 Jul 2025 16:43:12 +1000 Subject: [PATCH 5/5] add obisidian --- graphical/documents.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/graphical/documents.nix b/graphical/documents.nix index 1fb700f..18aca39 100644 --- a/graphical/documents.nix +++ b/graphical/documents.nix @@ -4,6 +4,7 @@ inherit (pkgs) libreoffice thunderbird + obsidian ; }; }