Compare commits
6 Commits
bead/nixos
...
bead/nixos
| Author | SHA1 | Date | |
|---|---|---|---|
| b9f56ff57d | |||
| 1d9249ea83 | |||
| 2fdd2d5345 | |||
| 722cb315dc | |||
| e042acff16 | |||
| 4fe531f87f |
File diff suppressed because one or more lines are too long
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,2 +1,3 @@
|
|||||||
result
|
result
|
||||||
thoughts
|
thoughts
|
||||||
|
.beads
|
||||||
|
|||||||
76
flake.lock
generated
76
flake.lock
generated
@@ -21,6 +21,45 @@
|
|||||||
"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": {
|
||||||
@@ -159,6 +198,27 @@
|
|||||||
"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": [
|
||||||
@@ -303,6 +363,7 @@
|
|||||||
"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",
|
||||||
@@ -324,6 +385,21 @@
|
|||||||
"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,6 +47,12 @@
|
|||||||
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
|
||||||
@@ -70,6 +76,7 @@
|
|||||||
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;
|
||||||
@@ -98,6 +105,7 @@
|
|||||||
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;
|
||||||
@@ -129,6 +137,9 @@
|
|||||||
];
|
];
|
||||||
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,7 +14,12 @@
|
|||||||
desktop.enable = true;
|
desktop.enable = true;
|
||||||
tmux.enable = true;
|
tmux.enable = true;
|
||||||
plasma-manager.enable = true;
|
plasma-manager.enable = true;
|
||||||
emacs.enable = true;
|
emacs = {
|
||||||
|
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
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ with lib;
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.home.roles.communication;
|
cfg = config.home.roles.communication;
|
||||||
|
isLinux = pkgs.stdenv.isLinux;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.home.roles.communication = {
|
options.home.roles.communication = {
|
||||||
@@ -12,14 +13,14 @@ in
|
|||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
home.packages = [
|
home.packages = [
|
||||||
# Communication apps
|
# For logging back into google chat (cross-platform)
|
||||||
|
globalInputs.google-cookie-retrieval.packages.${system}.default
|
||||||
|
] ++ optionals isLinux [
|
||||||
|
# Linux-only communication apps (Electron apps don't build on Darwin)
|
||||||
pkgs.element-desktop
|
pkgs.element-desktop
|
||||||
# Re-enabled in 25.11 after security issues were resolved
|
# Re-enabled in 25.11 after security issues were resolved
|
||||||
pkgs.fluffychat
|
pkgs.fluffychat
|
||||||
pkgs.nextcloud-talk-desktop
|
pkgs.nextcloud-talk-desktop
|
||||||
|
|
||||||
# For logging back into google chat
|
|
||||||
globalInputs.google-cookie-retrieval.packages.${system}.default
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ with lib;
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.home.roles.desktop;
|
cfg = config.home.roles.desktop;
|
||||||
|
isLinux = pkgs.stdenv.isLinux;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.home.roles.desktop = {
|
options.home.roles.desktop = {
|
||||||
@@ -12,61 +13,63 @@ in
|
|||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
# Desktop applications
|
# Cross-platform desktop applications
|
||||||
bitwarden-desktop
|
bitwarden-desktop
|
||||||
dunst
|
|
||||||
keepassxc
|
keepassxc
|
||||||
|
xdg-utils # XDG utilities for opening files/URLs with default applications
|
||||||
|
] ++ optionals isLinux [
|
||||||
|
# Linux-only desktop applications
|
||||||
|
dunst
|
||||||
unstable.ghostty
|
unstable.ghostty
|
||||||
|
|
||||||
# Desktop utilities
|
# Linux-only desktop utilities
|
||||||
feh # Image viewer and wallpaper setter for X11
|
feh # Image viewer and wallpaper setter for X11
|
||||||
rofi # Application launcher for X11
|
rofi # Application launcher for X11
|
||||||
solaar # Logitech management software
|
solaar # Logitech management software
|
||||||
waybar
|
waybar
|
||||||
wofi # Application launcher for Wayland
|
wofi # Application launcher for Wayland
|
||||||
xdg-utils # XDG utilities for opening files/URLs with default applications
|
|
||||||
|
# Linux-only system utilities with GUI components
|
||||||
# System utilities with GUI components
|
|
||||||
(snapcast.override { pulseaudioSupport = true; })
|
(snapcast.override { pulseaudioSupport = true; })
|
||||||
|
|
||||||
# KDE tiling window management
|
# KDE tiling window management (Linux-only)
|
||||||
kdePackages.krohnkite # Dynamic tiling extension for KWin 6
|
kdePackages.krohnkite # Dynamic tiling extension for KWin 6
|
||||||
|
|
||||||
# KDE PIM applications for email, calendar, and contacts
|
# KDE PIM applications for email, calendar, and contacts (Linux-only)
|
||||||
kdePackages.kmail
|
kdePackages.kmail
|
||||||
kdePackages.kmail-account-wizard
|
kdePackages.kmail-account-wizard
|
||||||
kdePackages.kmailtransport
|
kdePackages.kmailtransport
|
||||||
kdePackages.korganizer
|
kdePackages.korganizer
|
||||||
kdePackages.kaddressbook
|
kdePackages.kaddressbook
|
||||||
kdePackages.kontact
|
kdePackages.kontact
|
||||||
|
|
||||||
# KDE System components needed for proper integration
|
# KDE System components needed for proper integration (Linux-only)
|
||||||
kdePackages.kded
|
kdePackages.kded
|
||||||
kdePackages.systemsettings
|
kdePackages.systemsettings
|
||||||
kdePackages.kmenuedit
|
kdePackages.kmenuedit
|
||||||
|
|
||||||
# Desktop menu support
|
# Desktop menu support (Linux-only)
|
||||||
kdePackages.plasma-desktop # Contains applications.menu
|
kdePackages.plasma-desktop # Contains applications.menu
|
||||||
|
|
||||||
# KDE Online Accounts support
|
# KDE Online Accounts support (Linux-only)
|
||||||
kdePackages.kaccounts-integration
|
kdePackages.kaccounts-integration
|
||||||
kdePackages.kaccounts-providers
|
kdePackages.kaccounts-providers
|
||||||
kdePackages.signond
|
kdePackages.signond
|
||||||
|
|
||||||
# KDE Mapping
|
# KDE Mapping (Linux-only)
|
||||||
kdePackages.marble # Virtual globe and world atlas
|
kdePackages.marble # Virtual globe and world atlas
|
||||||
|
|
||||||
# KDE Productivity
|
# KDE Productivity (Linux-only)
|
||||||
kdePackages.kate # Advanced text editor with syntax highlighting
|
kdePackages.kate # Advanced text editor with syntax highlighting
|
||||||
kdePackages.okular # Universal document viewer (PDF, ePub, etc.)
|
kdePackages.okular # Universal document viewer (PDF, ePub, etc.)
|
||||||
kdePackages.spectacle # Screenshot capture utility
|
kdePackages.spectacle # Screenshot capture utility
|
||||||
kdePackages.filelight # Visual disk usage analyzer
|
kdePackages.filelight # Visual disk usage analyzer
|
||||||
|
|
||||||
# KDE Multimedia
|
# KDE Multimedia (Linux-only)
|
||||||
kdePackages.gwenview # Image viewer and basic editor
|
kdePackages.gwenview # Image viewer and basic editor
|
||||||
kdePackages.elisa # Music player
|
kdePackages.elisa # Music player
|
||||||
|
|
||||||
# KDE System Utilities
|
# KDE System Utilities (Linux-only)
|
||||||
kdePackages.ark # Archive manager (zip, tar, 7z, etc.)
|
kdePackages.ark # Archive manager (zip, tar, 7z, etc.)
|
||||||
kdePackages.yakuake # Drop-down terminal emulator
|
kdePackages.yakuake # Drop-down terminal emulator
|
||||||
];
|
];
|
||||||
@@ -77,61 +80,66 @@ in
|
|||||||
|
|
||||||
programs.spotify-player.enable = true;
|
programs.spotify-player.enable = true;
|
||||||
|
|
||||||
services.gnome-keyring = {
|
# Linux-only: GNOME keyring service
|
||||||
|
services.gnome-keyring = mkIf isLinux {
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# rbw vault unlock on login and resume from suspend
|
# Linux-only: systemd user services for rbw vault unlock
|
||||||
systemd.user.services.rbw-unlock-on-login = {
|
systemd.user.services = mkIf isLinux {
|
||||||
Unit = {
|
# rbw vault unlock on login
|
||||||
Description = "Unlock rbw vault at login";
|
rbw-unlock-on-login = {
|
||||||
After = [ "graphical-session.target" ];
|
Unit = {
|
||||||
|
Description = "Unlock rbw vault at login";
|
||||||
|
After = [ "graphical-session.target" ];
|
||||||
|
};
|
||||||
|
Service = {
|
||||||
|
Type = "oneshot";
|
||||||
|
ExecStart = "${pkgs.rbw}/bin/rbw unlock";
|
||||||
|
Environment = "RBW_AGENT=${pkgs.rbw}/bin/rbw-agent";
|
||||||
|
# KillMode = "process" prevents systemd from killing the rbw-agent daemon
|
||||||
|
# when this oneshot service completes. The agent is spawned by rbw unlock
|
||||||
|
# and needs to persist after the service exits.
|
||||||
|
KillMode = "process";
|
||||||
|
};
|
||||||
|
Install = {
|
||||||
|
WantedBy = [ "graphical-session.target" ];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
Service = {
|
|
||||||
Type = "oneshot";
|
# rbw vault unlock on resume from suspend
|
||||||
ExecStart = "${pkgs.rbw}/bin/rbw unlock";
|
rbw-unlock-on-resume = {
|
||||||
Environment = "RBW_AGENT=${pkgs.rbw}/bin/rbw-agent";
|
Unit = {
|
||||||
# KillMode = "process" prevents systemd from killing the rbw-agent daemon
|
Description = "Unlock rbw vault after resume from suspend";
|
||||||
# when this oneshot service completes. The agent is spawned by rbw unlock
|
After = [ "suspend.target" ];
|
||||||
# and needs to persist after the service exits.
|
};
|
||||||
KillMode = "process";
|
Service = {
|
||||||
};
|
Type = "oneshot";
|
||||||
Install = {
|
ExecStart = "${pkgs.rbw}/bin/rbw unlock";
|
||||||
WantedBy = [ "graphical-session.target" ];
|
Environment = "RBW_AGENT=${pkgs.rbw}/bin/rbw-agent";
|
||||||
|
# KillMode = "process" prevents systemd from killing the rbw-agent daemon
|
||||||
|
# when this oneshot service completes. The agent is spawned by rbw unlock
|
||||||
|
# and needs to persist after the service exits.
|
||||||
|
KillMode = "process";
|
||||||
|
};
|
||||||
|
Install = {
|
||||||
|
WantedBy = [ "suspend.target" ];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.user.services.rbw-unlock-on-resume = {
|
# Linux-only: KDE environment variables for proper integration
|
||||||
Unit = {
|
home.sessionVariables = mkIf isLinux {
|
||||||
Description = "Unlock rbw vault after resume from suspend";
|
|
||||||
After = [ "suspend.target" ];
|
|
||||||
};
|
|
||||||
Service = {
|
|
||||||
Type = "oneshot";
|
|
||||||
ExecStart = "${pkgs.rbw}/bin/rbw unlock";
|
|
||||||
Environment = "RBW_AGENT=${pkgs.rbw}/bin/rbw-agent";
|
|
||||||
# KillMode = "process" prevents systemd from killing the rbw-agent daemon
|
|
||||||
# when this oneshot service completes. The agent is spawned by rbw unlock
|
|
||||||
# and needs to persist after the service exits.
|
|
||||||
KillMode = "process";
|
|
||||||
};
|
|
||||||
Install = {
|
|
||||||
WantedBy = [ "suspend.target" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# KDE environment variables for proper integration
|
|
||||||
home.sessionVariables = {
|
|
||||||
QT_QPA_PLATFORMTHEME = "kde";
|
QT_QPA_PLATFORMTHEME = "kde";
|
||||||
KDE_SESSION_VERSION = "6";
|
KDE_SESSION_VERSION = "6";
|
||||||
};
|
};
|
||||||
|
|
||||||
xdg = {
|
xdg = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
# Ensure desktop files are made available for discovery
|
# Ensure desktop files are made available for discovery
|
||||||
desktopEntries = {}; # This creates the desktop files directory structure
|
desktopEntries = {}; # This creates the desktop files directory structure
|
||||||
|
|
||||||
mimeApps = {
|
mimeApps = {
|
||||||
enable = true;
|
enable = true;
|
||||||
associations.added = {
|
associations.added = {
|
||||||
@@ -141,13 +149,14 @@ in
|
|||||||
"x-scheme-handler/https" = "firefox.desktop";
|
"x-scheme-handler/https" = "firefox.desktop";
|
||||||
};
|
};
|
||||||
defaultApplications = {
|
defaultApplications = {
|
||||||
# Web browsers
|
# Web browsers (cross-platform)
|
||||||
"text/html" = "firefox.desktop";
|
"text/html" = "firefox.desktop";
|
||||||
"x-scheme-handler/http" = "firefox.desktop";
|
"x-scheme-handler/http" = "firefox.desktop";
|
||||||
"x-scheme-handler/https" = "firefox.desktop";
|
"x-scheme-handler/https" = "firefox.desktop";
|
||||||
"x-scheme-handler/about" = "firefox.desktop";
|
"x-scheme-handler/about" = "firefox.desktop";
|
||||||
"x-scheme-handler/unknown" = "firefox.desktop";
|
"x-scheme-handler/unknown" = "firefox.desktop";
|
||||||
|
} // optionalAttrs isLinux {
|
||||||
|
# Linux-only: KDE application associations
|
||||||
# Documents
|
# Documents
|
||||||
"application/pdf" = "okular.desktop";
|
"application/pdf" = "okular.desktop";
|
||||||
"text/plain" = "kate.desktop";
|
"text/plain" = "kate.desktop";
|
||||||
@@ -155,7 +164,7 @@ in
|
|||||||
"text/x-c" = "kate.desktop";
|
"text/x-c" = "kate.desktop";
|
||||||
"text/x-python" = "kate.desktop";
|
"text/x-python" = "kate.desktop";
|
||||||
"application/x-shellscript" = "kate.desktop";
|
"application/x-shellscript" = "kate.desktop";
|
||||||
|
|
||||||
# Images
|
# Images
|
||||||
"image/png" = "gwenview.desktop";
|
"image/png" = "gwenview.desktop";
|
||||||
"image/jpeg" = "gwenview.desktop";
|
"image/jpeg" = "gwenview.desktop";
|
||||||
@@ -164,25 +173,25 @@ in
|
|||||||
"image/bmp" = "gwenview.desktop";
|
"image/bmp" = "gwenview.desktop";
|
||||||
"image/tiff" = "gwenview.desktop";
|
"image/tiff" = "gwenview.desktop";
|
||||||
"image/webp" = "gwenview.desktop";
|
"image/webp" = "gwenview.desktop";
|
||||||
|
|
||||||
# Archives
|
# Archives
|
||||||
"application/zip" = "ark.desktop";
|
"application/zip" = "ark.desktop";
|
||||||
"application/x-tar" = "ark.desktop";
|
"application/x-tar" = "ark.desktop";
|
||||||
"application/x-compressed-tar" = "ark.desktop";
|
"application/x-compressed-tar" = "ark.desktop";
|
||||||
"application/x-7z-compressed" = "ark.desktop";
|
"application/x-7z-compressed" = "ark.desktop";
|
||||||
"application/x-rar" = "ark.desktop";
|
"application/x-rar" = "ark.desktop";
|
||||||
|
|
||||||
# Audio
|
# Audio
|
||||||
"audio/mpeg" = "elisa.desktop";
|
"audio/mpeg" = "elisa.desktop";
|
||||||
"audio/mp4" = "elisa.desktop";
|
"audio/mp4" = "elisa.desktop";
|
||||||
"audio/flac" = "elisa.desktop";
|
"audio/flac" = "elisa.desktop";
|
||||||
"audio/ogg" = "elisa.desktop";
|
"audio/ogg" = "elisa.desktop";
|
||||||
"audio/wav" = "elisa.desktop";
|
"audio/wav" = "elisa.desktop";
|
||||||
|
|
||||||
# Email
|
# Email
|
||||||
"message/rfc822" = "kmail.desktop";
|
"message/rfc822" = "kmail.desktop";
|
||||||
"x-scheme-handler/mailto" = "kmail.desktop";
|
"x-scheme-handler/mailto" = "kmail.desktop";
|
||||||
|
|
||||||
# Calendar
|
# Calendar
|
||||||
"text/calendar" = "korganizer.desktop";
|
"text/calendar" = "korganizer.desktop";
|
||||||
"application/x-vnd.akonadi.calendar.event" = "korganizer.desktop";
|
"application/x-vnd.akonadi.calendar.event" = "korganizer.desktop";
|
||||||
@@ -190,9 +199,11 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Fix for KDE applications.menu file issue on Plasma 6
|
# Linux-only: Fix for KDE applications.menu file issue on Plasma 6
|
||||||
# KDE still looks for applications.menu but Plasma 6 renamed it to plasma-applications.menu
|
# KDE still looks for applications.menu but Plasma 6 renamed it to plasma-applications.menu
|
||||||
xdg.configFile."menus/applications.menu".source = "${pkgs.kdePackages.plasma-workspace}/etc/xdg/menus/plasma-applications.menu";
|
xdg.configFile."menus/applications.menu" = mkIf isLinux {
|
||||||
|
source = "${pkgs.kdePackages.plasma-workspace}/etc/xdg/menus/plasma-applications.menu";
|
||||||
|
};
|
||||||
|
|
||||||
# Note: modules must be imported at top-level home config
|
# Note: modules must be imported at top-level home config
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -23,9 +23,11 @@ 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 '.notes'
|
bd show [BEAD_ID] --json | jq -r '.[0].notes'
|
||||||
```
|
```
|
||||||
Extract the PR URL (look for lines starting with "PR:" or containing pull request URLs)
|
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 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`
|
||||||
@@ -38,9 +40,10 @@ bd list --status=in_review
|
|||||||
```
|
```
|
||||||
- For Gitea:
|
- For Gitea:
|
||||||
```bash
|
```bash
|
||||||
tea pr view [PR_NUMBER]
|
tea pr list --state=closed
|
||||||
```
|
```
|
||||||
Look for "State: merged" or "State: closed"
|
Look for the PR number in the INDEX column with STATE "merged".
|
||||||
|
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,55 +23,90 @@ 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 {
|
config = mkIf cfg.enable (mkMerge [
|
||||||
home.packages = [
|
# Common configuration for both modes
|
||||||
pkgs.emacs-all-the-icons-fonts
|
{
|
||||||
pkgs.fira-code
|
home.packages = [
|
||||||
pkgs.fontconfig
|
pkgs.emacs-all-the-icons-fonts
|
||||||
pkgs.graphviz
|
pkgs.fira-code
|
||||||
pkgs.isort
|
pkgs.fontconfig
|
||||||
pkgs.nerd-fonts.fira-code
|
pkgs.graphviz
|
||||||
pkgs.nerd-fonts.droid-sans-mono
|
pkgs.isort
|
||||||
pkgs.nil # nix lsp language server
|
pkgs.nerd-fonts.fira-code
|
||||||
pkgs.nixfmt-rfc-style
|
pkgs.nerd-fonts.droid-sans-mono
|
||||||
(pkgs.ripgrep.override {withPCRE2 = true;})
|
pkgs.nil # nix lsp language server
|
||||||
pkgs.pipenv
|
pkgs.nixfmt-rfc-style
|
||||||
pkgs.poetry
|
(pkgs.ripgrep.override {withPCRE2 = true;})
|
||||||
pkgs.python3
|
pkgs.pipenv
|
||||||
];
|
pkgs.poetry
|
||||||
|
pkgs.python3
|
||||||
|
];
|
||||||
|
|
||||||
programs.emacs = {
|
fonts.fontconfig.enable = true;
|
||||||
enable = true;
|
}
|
||||||
package = defaultEmacsPackage;
|
|
||||||
};
|
|
||||||
|
|
||||||
fonts.fontconfig.enable = true;
|
# Standard Doom Emacs mode (requires doom sync at runtime)
|
||||||
|
(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,11 +51,21 @@
|
|||||||
|
|
||||||
;; (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")
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ with lib;
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.home.roles.email;
|
cfg = config.home.roles.email;
|
||||||
|
isLinux = pkgs.stdenv.isLinux;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.home.roles.email = {
|
options.home.roles.email = {
|
||||||
@@ -89,34 +90,38 @@ in
|
|||||||
account default : proton
|
account default : proton
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Systemd service for mail sync
|
# Linux-only: Systemd service for mail sync (Darwin uses launchd instead)
|
||||||
systemd.user.services.mbsync = {
|
systemd.user.services = mkIf isLinux {
|
||||||
Unit = {
|
mbsync = {
|
||||||
Description = "Mailbox synchronization service";
|
Unit = {
|
||||||
After = [ "network-online.target" ];
|
Description = "Mailbox synchronization service";
|
||||||
Wants = [ "network-online.target" ];
|
After = [ "network-online.target" ];
|
||||||
};
|
Wants = [ "network-online.target" ];
|
||||||
Service = {
|
};
|
||||||
Type = "oneshot";
|
Service = {
|
||||||
ExecStart = "${pkgs.bash}/bin/bash -c 'mkdir -p ~/Mail && ${pkgs.isync}/bin/mbsync -a && (${pkgs.mu}/bin/mu info >/dev/null 2>&1 || ${pkgs.mu}/bin/mu init --maildir ~/Mail --personal-address=john@ogle.fyi) && ${pkgs.mu}/bin/mu index'";
|
Type = "oneshot";
|
||||||
Environment = "PATH=${pkgs.rbw}/bin:${pkgs.coreutils}/bin";
|
ExecStart = "${pkgs.bash}/bin/bash -c 'mkdir -p ~/Mail && ${pkgs.isync}/bin/mbsync -a && (${pkgs.mu}/bin/mu info >/dev/null 2>&1 || ${pkgs.mu}/bin/mu init --maildir ~/Mail --personal-address=john@ogle.fyi) && ${pkgs.mu}/bin/mu index'";
|
||||||
StandardOutput = "journal";
|
Environment = "PATH=${pkgs.rbw}/bin:${pkgs.coreutils}/bin";
|
||||||
StandardError = "journal";
|
StandardOutput = "journal";
|
||||||
|
StandardError = "journal";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Systemd timer for automatic sync
|
# Linux-only: Systemd timer for automatic sync
|
||||||
systemd.user.timers.mbsync = {
|
systemd.user.timers = mkIf isLinux {
|
||||||
Unit = {
|
mbsync = {
|
||||||
Description = "Mailbox synchronization timer";
|
Unit = {
|
||||||
};
|
Description = "Mailbox synchronization timer";
|
||||||
Timer = {
|
};
|
||||||
OnBootSec = "2min";
|
Timer = {
|
||||||
OnUnitActiveSec = "5min";
|
OnBootSec = "2min";
|
||||||
Unit = "mbsync.service";
|
OnUnitActiveSec = "5min";
|
||||||
};
|
Unit = "mbsync.service";
|
||||||
Install = {
|
};
|
||||||
WantedBy = [ "timers.target" ];
|
Install = {
|
||||||
|
WantedBy = [ "timers.target" ];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -4,13 +4,15 @@ with lib;
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.home.roles.kdeconnect;
|
cfg = config.home.roles.kdeconnect;
|
||||||
|
isLinux = pkgs.stdenv.isLinux;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.home.roles.kdeconnect = {
|
options.home.roles.kdeconnect = {
|
||||||
enable = mkEnableOption "Enable KDE Connect for device integration";
|
enable = mkEnableOption "Enable KDE Connect for device integration";
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
# KDE Connect services are Linux-only (requires D-Bus and systemd)
|
||||||
|
config = mkIf (cfg.enable && isLinux) {
|
||||||
services.kdeconnect = {
|
services.kdeconnect = {
|
||||||
enable = true;
|
enable = true;
|
||||||
indicator = true;
|
indicator = true;
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ with lib;
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.home.roles.sync;
|
cfg = config.home.roles.sync;
|
||||||
|
isLinux = pkgs.stdenv.isLinux;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.home.roles.sync = {
|
options.home.roles.sync = {
|
||||||
@@ -11,9 +12,10 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
home.packages = with pkgs; [
|
# Linux-only: syncthingtray requires system tray support
|
||||||
|
home.packages = optionals isLinux (with pkgs; [
|
||||||
syncthingtray
|
syncthingtray
|
||||||
];
|
]);
|
||||||
|
|
||||||
services.syncthing = {
|
services.syncthing = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user