jawz/NixOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

variables and dotfile configs

Browse Source
This commit is contained in:
Danilo Reyes 2024-12-21 12:35:37 -06:00
parent 882fe52852
commit 02044b2af1
4 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
base.nix
View File

@ -166,9 +166,6 @@
WLR_NO_HARDWARE_CURSORS = 1; WLR_NO_HARDWARE_CURSORS = 1;
NIXOS_OZONE_WL = 1; NIXOS_OZONE_WL = 1;
# Themes
# WEBKIT_DISABLE_COMPOSITING_MODE = "1";
PATH = [ "\${HOME}/.local/bin" ]; PATH = [ "\${HOME}/.local/bin" ];
}; };
}; };

3
home-manager.nix
View File

@ -44,10 +44,9 @@
templates = "${config.xdg.dataHome}/Templates"; templates = "${config.xdg.dataHome}/Templates";
videos = "${config.home.homeDirectory}/Videos"; videos = "${config.home.homeDirectory}/Videos";
}; };
configFile."wgetrc".text = "hsts-file=\${XDG_CACHE_HOME}/wget-hsts"; configFile.wgetrc.text = "hsts-file=\${XDG_CACHE_HOME}/wget-hsts";
}; };
programs = { programs = {
alacritty.enable = true;
direnv = { direnv = {
enable = true; enable = true;
enableBashIntegration = true; enableBashIntegration = true;

4
jawz.nix
View File

@ -28,8 +28,8 @@ in
group = "users"; group = "users";
overrideDevices = true; overrideDevices = true;
overrideFolders = true; overrideFolders = true;
key = "${config.sops.secrets."syncthing_keys/${hostName}".path}"; key = config.sops.secrets."syncthing_keys/${hostName}".path;
cert = "${config.sops.secrets."syncthing_certs/${hostName}".path}"; cert = config.sops.secrets."syncthing_certs/${hostName}".path;
settings = { settings = {
devices = { devices = {
server.id = "BG6PF7S-KATABWO-7WAZFMX-6YO7IS3-WQTMR3M-VSOSV7V-HFFMNNH-BFX2EQ4"; server.id = "BG6PF7S-KATABWO-7WAZFMX-6YO7IS3-WQTMR3M-VSOSV7V-HFFMNNH-BFX2EQ4";

33
modules/dev/emacs.nix
View File

@ -1,5 +1,4 @@
{ {
inputs,
config, config,
lib, lib,
pkgs, pkgs,
@ -10,40 +9,33 @@
config = lib.mkIf config.my.emacs.enable { config = lib.mkIf config.my.emacs.enable {
home-manager.users.jawz = { home-manager.users.jawz = {
services.lorri.enable = true; services.lorri.enable = true;
programs.bash = { programs.bash.shellAliases = {
initExtra = '' edit = "emacsclient -t";
emacs-sqlite-fix () { e = "edit";
nix-shell -p cmake sqlite --command "doom sync &&
sc restart emacs &&
emacsclient -e '(org-roam-db-sync)'" &&
doom sync
}
'';
shellAliases = {
edit = "emacsclient -t";
e = "edit";
};
}; };
}; };
services.emacs = { services.emacs = {
enable = true; enable = true;
package = pkgs.emacsWithDoom { package = pkgs.emacsWithDoom {
doomDir = ../../dotfiles/doom; doomDir = ../../dotfiles/doom;
doomLocalDir = "~/.local/share/nix-doom"; doomLocalDir = "$HOME/.local/share/nix-doom";
emacs = pkgs.emacs-gtk; emacs = pkgs.emacs-gtk;
extraPackages = extraPackages =
epkgs: epkgs:
let let
extraPackages = config.home-manager.users.jawz.programs.emacs.extraPackages epkgs; inherit (config.home-manager.users.jawz.programs.emacs)
extraPackages
extraConfig
;
extra = extraPackages epkgs;
in in
extraPackages extra
++ [ ++ [
(epkgs.trivialBuild { (epkgs.trivialBuild {
pname = "stylix-theme"; pname = "stylix-theme";
# add config from doom's ui/doom module src = pkgs.writeText "stylix-theme.el" extraConfig;
src = pkgs.writeText "stylix-theme.el" config.home-manager.users.jawz.programs.emacs.extraConfig;
version = "0.1.0"; version = "0.1.0";
packageRequires = extraPackages; packageRequires = extra;
}) })
]; ];
extraBinPackages = builtins.attrValues { extraBinPackages = builtins.attrValues {
@ -72,7 +64,6 @@
}; };
}; };
defaultEditor = true; defaultEditor = true;
# extraPackages = [ pkgs.base16-stylix-theme ];
}; };
environment.variables.PATH = [ "\${XDG_CONFIG_HOME}/emacs/bin" ]; environment.variables.PATH = [ "\${XDG_CONFIG_HOME}/emacs/bin" ];
}; };