Compare commits
1 Commits
bead/nixos
...
bead/nixos
| Author | SHA1 | Date | |
|---|---|---|---|
| 6441352ed9 |
26
.beads/sync_base.jsonl
Normal file
26
.beads/sync_base.jsonl
Normal file
File diff suppressed because one or more lines are too long
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,3 +1,2 @@
|
|||||||
result
|
result
|
||||||
thoughts
|
thoughts
|
||||||
.beads
|
|
||||||
|
|||||||
76
flake.lock
generated
76
flake.lock
generated
@@ -21,45 +21,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"doomemacs": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1767773143,
|
|
||||||
"narHash": "sha256-QL/t9v2kFNxBDyNJb/s411o3mxujan+QX5IZglTdpTk=",
|
|
||||||
"owner": "doomemacs",
|
|
||||||
"repo": "doomemacs",
|
|
||||||
"rev": "3e15fb36d7f94f0a218bda977be4d3f5da983a71",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "doomemacs",
|
|
||||||
"repo": "doomemacs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"emacs-overlay": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"nix-doom-emacs-unstraightened"
|
|
||||||
],
|
|
||||||
"nixpkgs-stable": [
|
|
||||||
"nix-doom-emacs-unstraightened"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1768011937,
|
|
||||||
"narHash": "sha256-SnU2XTo34vwVaijs+4VwcXTNwMWO4nwzzs08N39UagA=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "emacs-overlay",
|
|
||||||
"rev": "79abf71d9897cf3b5189f7175cda1b1102abc65c",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "emacs-overlay",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
@@ -198,27 +159,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nix-doom-emacs-unstraightened": {
|
|
||||||
"inputs": {
|
|
||||||
"doomemacs": "doomemacs",
|
|
||||||
"emacs-overlay": "emacs-overlay",
|
|
||||||
"nixpkgs": [],
|
|
||||||
"systems": "systems_2"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1768034604,
|
|
||||||
"narHash": "sha256-62pIZMvGHhYJmMiiBsxHqZt/dFyENPcFHlJq5NJF3Sw=",
|
|
||||||
"owner": "marienz",
|
|
||||||
"repo": "nix-doom-emacs-unstraightened",
|
|
||||||
"rev": "9b3b8044fe4ccdcbb2d6f733d7dbe4d5feea18bc",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "marienz",
|
|
||||||
"repo": "nix-doom-emacs-unstraightened",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nix-github-actions": {
|
"nix-github-actions": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@@ -363,7 +303,6 @@
|
|||||||
"home-manager-unstable": "home-manager-unstable",
|
"home-manager-unstable": "home-manager-unstable",
|
||||||
"jovian": "jovian",
|
"jovian": "jovian",
|
||||||
"nix-darwin": "nix-darwin",
|
"nix-darwin": "nix-darwin",
|
||||||
"nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened",
|
|
||||||
"nixos-wsl": "nixos-wsl",
|
"nixos-wsl": "nixos-wsl",
|
||||||
"nixpkgs": "nixpkgs_2",
|
"nixpkgs": "nixpkgs_2",
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||||
@@ -385,21 +324,6 @@
|
|||||||
"repo": "default",
|
"repo": "default",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"systems_2": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1681028828,
|
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|||||||
11
flake.nix
11
flake.nix
@@ -47,12 +47,6 @@
|
|||||||
url = "github:steveyegge/beads";
|
url = "github:steveyegge/beads";
|
||||||
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||||
};
|
};
|
||||||
|
|
||||||
nix-doom-emacs-unstraightened = {
|
|
||||||
url = "github:marienz/nix-doom-emacs-unstraightened";
|
|
||||||
# Don't follow nixpkgs to avoid rebuild issues with emacs-overlay
|
|
||||||
inputs.nixpkgs.follows = "";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, nixpkgs-unstable, nixos-wsl, ... } @ inputs: let
|
outputs = { self, nixpkgs, nixpkgs-unstable, nixos-wsl, ... } @ inputs: let
|
||||||
@@ -76,7 +70,6 @@
|
|||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
home-manager.sharedModules = [
|
home-manager.sharedModules = [
|
||||||
inputs.plasma-manager.homeModules.plasma-manager
|
inputs.plasma-manager.homeModules.plasma-manager
|
||||||
inputs.nix-doom-emacs-unstraightened.homeModule
|
|
||||||
];
|
];
|
||||||
home-manager.extraSpecialArgs = {
|
home-manager.extraSpecialArgs = {
|
||||||
globalInputs = inputs;
|
globalInputs = inputs;
|
||||||
@@ -105,7 +98,6 @@
|
|||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
home-manager.sharedModules = [
|
home-manager.sharedModules = [
|
||||||
inputs.plasma-manager-unstable.homeModules.plasma-manager
|
inputs.plasma-manager-unstable.homeModules.plasma-manager
|
||||||
inputs.nix-doom-emacs-unstraightened.homeModule
|
|
||||||
];
|
];
|
||||||
home-manager.extraSpecialArgs = {
|
home-manager.extraSpecialArgs = {
|
||||||
globalInputs = inputs;
|
globalInputs = inputs;
|
||||||
@@ -137,9 +129,6 @@
|
|||||||
];
|
];
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
home-manager.sharedModules = [
|
|
||||||
inputs.nix-doom-emacs-unstraightened.homeModule
|
|
||||||
];
|
|
||||||
home-manager.extraSpecialArgs = {
|
home-manager.extraSpecialArgs = {
|
||||||
globalInputs = inputs;
|
globalInputs = inputs;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -14,12 +14,7 @@
|
|||||||
desktop.enable = true;
|
desktop.enable = true;
|
||||||
tmux.enable = true;
|
tmux.enable = true;
|
||||||
plasma-manager.enable = true;
|
plasma-manager.enable = true;
|
||||||
emacs = {
|
emacs.enable = true;
|
||||||
enable = true;
|
|
||||||
# Use pre-built Doom Emacs - all packages built at nix build time
|
|
||||||
# This means no doom sync is needed after booting the live USB
|
|
||||||
prebuiltDoom = true;
|
|
||||||
};
|
|
||||||
i3_sway.enable = true;
|
i3_sway.enable = true;
|
||||||
starship.enable = true;
|
starship.enable = true;
|
||||||
# development.enable = false; # Not needed for live USB
|
# development.enable = false; # Not needed for live USB
|
||||||
|
|||||||
@@ -23,11 +23,9 @@ bd list --status=in_review
|
|||||||
|
|
||||||
1. **Get the PR URL from bead notes**:
|
1. **Get the PR URL from bead notes**:
|
||||||
```bash
|
```bash
|
||||||
bd show [BEAD_ID] --json | jq -r '.[0].notes'
|
bd show [BEAD_ID] --json | jq -r '.notes'
|
||||||
```
|
```
|
||||||
Note: `bd show --json` returns an array, so use `.[0]` to access the first element.
|
Extract the PR URL (look for lines starting with "PR:" or containing pull request URLs)
|
||||||
Extract the PR URL (look for lines starting with "PR:" or containing pull request URLs).
|
|
||||||
Extract the PR number: `echo "$NOTES" | grep -oP '/pulls/\K\d+'`
|
|
||||||
|
|
||||||
2. **Detect hosting provider**:
|
2. **Detect hosting provider**:
|
||||||
- Run `git remote get-url origin`
|
- Run `git remote get-url origin`
|
||||||
@@ -40,10 +38,9 @@ bd list --status=in_review
|
|||||||
```
|
```
|
||||||
- For Gitea:
|
- For Gitea:
|
||||||
```bash
|
```bash
|
||||||
tea pr list --state=closed
|
tea pr view [PR_NUMBER]
|
||||||
```
|
```
|
||||||
Look for the PR number in the INDEX column with STATE "merged".
|
Look for "State: merged" or "State: closed"
|
||||||
Note: `tea pr view [PR_NUMBER]` lists all PRs, not a specific one. Use `tea pr list --state=closed` and look for your PR number in the results.
|
|
||||||
|
|
||||||
### Step 3: Close merged beads
|
### Step 3: Close merged beads
|
||||||
|
|
||||||
|
|||||||
@@ -23,90 +23,55 @@ let
|
|||||||
if pkgs.stdenv.isDarwin
|
if pkgs.stdenv.isDarwin
|
||||||
then pkgs.emacs-macport.pkgs.withPackages emacsPackages
|
then pkgs.emacs-macport.pkgs.withPackages emacsPackages
|
||||||
else pkgs.emacs.pkgs.withPackages emacsPackages;
|
else pkgs.emacs.pkgs.withPackages emacsPackages;
|
||||||
|
|
||||||
# Path to doom config directory (relative to this file)
|
|
||||||
doomConfigDir = ./doom;
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.home.roles.emacs = {
|
options.home.roles.emacs = {
|
||||||
enable = mkEnableOption "Doom Emacs with vterm and tree-sitter support";
|
enable = mkEnableOption "Doom Emacs with vterm and tree-sitter support";
|
||||||
|
|
||||||
prebuiltDoom = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = false;
|
|
||||||
description = ''
|
|
||||||
Use nix-doom-emacs-unstraightened to pre-build all Doom packages at
|
|
||||||
nix build time. This eliminates the need to run `doom sync` after
|
|
||||||
first boot, making it ideal for live USB images or immutable systems.
|
|
||||||
|
|
||||||
When enabled, the doom configuration is read-only (stored in nix store).
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable (mkMerge [
|
config = mkIf cfg.enable {
|
||||||
# Common configuration for both modes
|
home.packages = [
|
||||||
{
|
pkgs.emacs-all-the-icons-fonts
|
||||||
home.packages = [
|
pkgs.fira-code
|
||||||
pkgs.emacs-all-the-icons-fonts
|
pkgs.fontconfig
|
||||||
pkgs.fira-code
|
pkgs.graphviz
|
||||||
pkgs.fontconfig
|
pkgs.isort
|
||||||
pkgs.graphviz
|
pkgs.nerd-fonts.fira-code
|
||||||
pkgs.isort
|
pkgs.nerd-fonts.droid-sans-mono
|
||||||
pkgs.nerd-fonts.fira-code
|
pkgs.nil # nix lsp language server
|
||||||
pkgs.nerd-fonts.droid-sans-mono
|
pkgs.nixfmt-rfc-style
|
||||||
pkgs.nil # nix lsp language server
|
(pkgs.ripgrep.override {withPCRE2 = true;})
|
||||||
pkgs.nixfmt-rfc-style
|
pkgs.pipenv
|
||||||
(pkgs.ripgrep.override {withPCRE2 = true;})
|
pkgs.poetry
|
||||||
pkgs.pipenv
|
pkgs.python3
|
||||||
pkgs.poetry
|
];
|
||||||
pkgs.python3
|
|
||||||
];
|
|
||||||
|
|
||||||
fonts.fontconfig.enable = true;
|
programs.emacs = {
|
||||||
}
|
enable = true;
|
||||||
|
package = defaultEmacsPackage;
|
||||||
|
};
|
||||||
|
|
||||||
# Standard Doom Emacs mode (requires doom sync at runtime)
|
fonts.fontconfig.enable = true;
|
||||||
(mkIf (!cfg.prebuiltDoom) {
|
|
||||||
programs.emacs = {
|
|
||||||
enable = true;
|
|
||||||
package = defaultEmacsPackage;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Mount emacs and tree-sitter grammars from nix store
|
# Mount emacs and tree-sitter grammars from nix store
|
||||||
home.file = {
|
home.file = {
|
||||||
"${config.xdg.configHome}/emacs".source = doomEmacs;
|
"${config.xdg.configHome}/emacs".source = doomEmacs;
|
||||||
};
|
};
|
||||||
|
|
||||||
home.sessionPath = [
|
home.sessionPath = [
|
||||||
"${config.xdg.configHome}/emacs/bin"
|
"${config.xdg.configHome}/emacs/bin"
|
||||||
];
|
];
|
||||||
|
|
||||||
home.sessionVariables = {
|
home.sessionVariables = {
|
||||||
DOOMDIR = "${config.xdg.configHome}/doom";
|
DOOMDIR = "${config.xdg.configHome}/doom";
|
||||||
DOOMLOCALDIR = "${config.xdg.dataHome}/doom";
|
DOOMLOCALDIR = "${config.xdg.dataHome}/doom";
|
||||||
};
|
};
|
||||||
|
|
||||||
# TODO: Use mkOutOfStoreSymlink instead?
|
# TODO: Use mkOutOfStoreSymlink instead?
|
||||||
home.activation.doomConfig = lib.hm.dag.entryAfter ["writeBoundary"] ''
|
home.activation.doomConfig = lib.hm.dag.entryAfter ["writeBoundary"] ''
|
||||||
# Always remove and recreate the symlink to ensure it points to the source directory
|
# Always remove and recreate the symlink to ensure it points to the source directory
|
||||||
rm -rf "${config.xdg.configHome}/doom"
|
rm -rf "${config.xdg.configHome}/doom"
|
||||||
ln -sf "${config.home.homeDirectory}/nixos-configs/home/roles/emacs/doom" "${config.xdg.configHome}/doom"
|
ln -sf "${config.home.homeDirectory}/nixos-configs/home/roles/emacs/doom" "${config.xdg.configHome}/doom"
|
||||||
'';
|
'';
|
||||||
})
|
};
|
||||||
|
|
||||||
# Pre-built Doom Emacs mode (no doom sync needed - ideal for live USB)
|
|
||||||
(mkIf cfg.prebuiltDoom {
|
|
||||||
programs.doom-emacs = {
|
|
||||||
enable = true;
|
|
||||||
doomDir = doomConfigDir;
|
|
||||||
doomLocalDir = "${config.xdg.dataHome}/doom";
|
|
||||||
# Add extra packages that aren't part of Doom but needed for our config
|
|
||||||
extraPackages = epkgs: [
|
|
||||||
epkgs.vterm
|
|
||||||
epkgs.treesit-grammars.with-all-grammars
|
|
||||||
];
|
|
||||||
};
|
|
||||||
})
|
|
||||||
]);
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -51,21 +51,11 @@
|
|||||||
|
|
||||||
;; (package! org-caldav)
|
;; (package! org-caldav)
|
||||||
|
|
||||||
;; Note: Packages with custom recipes must be pinned for nix-doom-emacs-unstraightened
|
|
||||||
;; to build deterministically. Update pins when upgrading packages.
|
|
||||||
|
|
||||||
(package! gptel :recipe (:nonrecursive t))
|
(package! gptel :recipe (:nonrecursive t))
|
||||||
|
|
||||||
(package! claude-code-ide
|
(package! claude-code-ide
|
||||||
:recipe (:host github :repo "manzaltu/claude-code-ide.el")
|
:recipe (:host github :repo "manzaltu/claude-code-ide.el"))
|
||||||
:pin "760240d7f03ff16f90ede9d4f4243cd94f3fed73")
|
|
||||||
|
|
||||||
(package! gptel-tool-library
|
(package! gptel-tool-library
|
||||||
:recipe (:host github :repo "aard-fi/gptel-tool-library"
|
:recipe (:host github :repo "aard-fi/gptel-tool-library"
|
||||||
:files ("*.el"))
|
:files ("*.el")))
|
||||||
:pin "baffc3b0d74a2b7cbda0d5cd6dd7726d6ccaca83")
|
|
||||||
|
|
||||||
(package! beads
|
|
||||||
:recipe (:type git :repo "https://codeberg.org/ctietze/beads.el.git"
|
|
||||||
:files ("lisp/*.el"))
|
|
||||||
:pin "f40a6461d3c0fa0969311bbb6a1e30d1bba86c88")
|
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
|
vulkanHDRLayer = pkgs.callPackage ./vulkan-hdr-layer {};
|
||||||
tea-rbw = pkgs.callPackage ./tea-rbw {};
|
tea-rbw = pkgs.callPackage ./tea-rbw {};
|
||||||
app-launcher-server = pkgs.callPackage ./app-launcher-server {};
|
app-launcher-server = pkgs.callPackage ./app-launcher-server {};
|
||||||
claude-code = pkgs.callPackage ./claude-code {};
|
claude-code = pkgs.callPackage ./claude-code {};
|
||||||
|
|||||||
34
packages/vulkan-hdr-layer/default.nix
Normal file
34
packages/vulkan-hdr-layer/default.nix
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
{ lib, stdenv, fetchFromGitHub, meson, pkg-config, vulkan-loader, ninja, writeText, vulkan-headers, vulkan-utility-libraries, jq, libX11, libXrandr, libxcb, wayland, wayland-scanner }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "vulkan-hdr-layer";
|
||||||
|
version = "63d2eec";
|
||||||
|
|
||||||
|
src = (fetchFromGitHub {
|
||||||
|
owner = "Zamundaaa";
|
||||||
|
repo = "VK_hdr_layer";
|
||||||
|
rev = "869199cd2746e7f69cf19955153080842b6dacfc";
|
||||||
|
fetchSubmodules = true;
|
||||||
|
hash = "sha256-xfVYI+Aajmnf3BTaY2Ysg5fyDO6SwDFGyU0L+F+E3is=";
|
||||||
|
}).overrideAttrs (_: {
|
||||||
|
GIT_CONFIG_COUNT = 1;
|
||||||
|
GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf";
|
||||||
|
GIT_CONFIG_VALUE_0 = "git@github.com:";
|
||||||
|
});
|
||||||
|
|
||||||
|
nativeBuildInputs = [ vulkan-headers meson ninja pkg-config jq ];
|
||||||
|
|
||||||
|
buildInputs = [ vulkan-headers vulkan-loader vulkan-utility-libraries libX11 libXrandr libxcb wayland wayland-scanner ];
|
||||||
|
|
||||||
|
# Help vulkan-loader find the validation layers
|
||||||
|
setupHook = writeText "setup-hook" ''
|
||||||
|
addToSearchPath XDG_DATA_DIRS @out@/share
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Layers providing Vulkan HDR";
|
||||||
|
homepage = "https://github.com/Zamundaaa/VK_hdr_layer";
|
||||||
|
platforms = platforms.linux;
|
||||||
|
license = licenses.mit;
|
||||||
|
};
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user