aciceri/nixfleet
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Compare commits

base: aciceri:dd626c2fc05b4d108cee10edbdd84b32614ef407
Branches Tags
aciceri:master
aciceri:update-flake-lock
aciceri:aaa
aciceri:wip
aciceri:test
..
compare: aciceri:5fe4764f01822479214a7aca9a3c49402b6013bc
Branches Tags
aciceri:update-flake-lock
aciceri:master
aciceri:aaa
aciceri:wip
aciceri:test

No commits in common. "dd626c2fc05b4d108cee10edbdd84b32614ef407" and "5fe4764f01822479214a7aca9a3c49402b6013bc" have entirely different histories.
dd626c2fc0 ... 5fe4764f01

7 changed files with 26 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

36
hmModules/emacs/default.nix
View file

@ -51,23 +51,23 @@ in
en_US-large en_US-large
it_IT it_IT
]); ]);
home.activation.cloneCcrEmacsFlake = home.activation = {
let cloneCcrEmacsFlake = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
path = lib.makeBinPath ( PATH=$PATH:${
with pkgs; lib.makeBinPath (
[ with pkgs;
git [
openssh git
] openssh
); ]
in )
lib.hm.dag.entryAfter [ "writeBoundary" ] '' }
PATH=$PATH:${path} if [ ! -d "$HOME/.config/emacs" ]; then
if [ ! -d "$HOME/.config/emacs" ]; then mkdir "$HOME/.config/emacs"
mkdir "$HOME/.config/emacs" $DRY_RUN_CMD ln -s "$HOME/projects/aciceri/nixfleet/hmModules/emacs/init.el" "$HOME/.config/emacs/init.el"
$DRY_RUN_CMD ln -s "$HOME/projects/aciceri/nixfleet/hmModules/emacs/init.el" "$HOME/.config/emacs/init.el" $DRY_RUN_CMD ln -s "$HOME/.config/emacs" "$HOME/emacs"
$DRY_RUN_CMD ln -s "$HOME/.config/emacs" "$HOME/emacs" fi
fi $DRY_RUN_CMD ln -sfn ${treesitGrammars} "$HOME/.config/emacs/tree-sitter"
$DRY_RUN_CMD ln -sfn ${treesitGrammars} "$HOME/.config/emacs/tree-sitter"
''; '';
};
} }

1
hmModules/firefox/default.nix
View file

@ -62,7 +62,6 @@ in
]; ];
}; };
profiles.default = { profiles.default = {
search.force = true;
search.default = "DuckDuckGo"; search.default = "DuckDuckGo";
search.engines = { search.engines = {
"Searx" = { "Searx" = {

5
hmModules/hyprland/hyprland.conf
View file

@ -30,10 +30,9 @@ windowrulev2 = workspace 9, class:^(Spotify)$
windowrulev2 = float, title:^(floating)$ windowrulev2 = float, title:^(floating)$
bind = $mod, b, exec, firefox bind = $mod, b, exec, firefox
# bind = $mod, t, exec, footclient $SHELL -C "zellij" bind = $mod, t, exec, footclient $SHELL -C "zellij"
bind = $mod, t, exec, footclient $SHELL
bind = $mod, RETURN, exec, emacsclient -c --eval "(ccr/start-eshell)" bind = $mod, RETURN, exec, emacsclient -c --eval "(ccr/start-eshell)"
bind = $mod, m, exec, emacsclient -c --eval '(notmuch-search "tag:new")' bind = $mod, m, exec, footclient $SHELL -C "aerc"
bind = $mod, d, exec, fuzzel --background-color=253559cc --border-radius=5 --border-width=0 bind = $mod, d, exec, fuzzel --background-color=253559cc --border-radius=5 --border-width=0
bind = $mod, s, exec, screenshot.sh bind = $mod, s, exec, screenshot.sh
bind = $mod, n, exec, logseq bind = $mod, n, exec, logseq

5
hmModules/shell/default.nix
View file

@ -49,7 +49,7 @@
WantedBy = [ "default.target" ]; WantedBy = [ "default.target" ];
}; };
Service = { Service = {
ExecStartPre = "${lib.getExe' pkgs.toybox "rm"} -f ${config.programs.atuin.settings.daemon.socket_path}"; # ExecStartPre = "${lib.getExe' pkgs.toybox "rm"} -f ${config.programs.atuin.settings.daemon.socket_path}";
ExecStart = "${lib.getExe pkgs.atuin} daemon"; ExecStart = "${lib.getExe pkgs.atuin} daemon";
}; };
}; };
@ -83,8 +83,7 @@
]; ];
shellInit = shellInit =
'' ''
# fish_vi_key_bindings fish_vi_key_bindings
fish_default_key_bindings
'' ''
+ lib.optionalString (builtins.hasAttr "cachix-personal-token" age.secrets) '' + lib.optionalString (builtins.hasAttr "cachix-personal-token" age.secrets) ''
export CACHIX_AUTH_TOKEN=$(cat ${age.secrets.cachix-personal-token.path}) export CACHIX_AUTH_TOKEN=$(cat ${age.secrets.cachix-personal-token.path})

1
hosts/kirk/default.nix
View file

@ -73,6 +73,7 @@
"imv" "imv"
"catppuccin" "catppuccin"
"libreoffice" "libreoffice"
"logseq"
"emacs" "emacs"
]; ];
extraGroups = [ ]; extraGroups = [ ];

10
hosts/picard/default.nix
View file

@ -35,7 +35,7 @@
"hass-poweroff" "hass-poweroff"
"forgejo-runners" "forgejo-runners"
"teamviewer" "teamviewer"
# "macos-ventura" "macos-ventura"
"sunshine" "sunshine"
"mount-sisko" "mount-sisko"
"adb" "adb"
@ -90,6 +90,7 @@
"zathura" "zathura"
"imv" "imv"
"libreoffice" "libreoffice"
"logseq"
"emacs" "emacs"
"vial" "vial"
]; ];
@ -127,15 +128,10 @@
]; ];
systemd.services.ddcci = { systemd.services.ddcci = {
serviceConfig.Type = "oneshot";
script = '' script = ''
echo 'ddcci 0x37' > /sys/bus/i2c/devices/i2c-2/new_device echo 'ddcci 0x37' > /sys/bus/i2c/devices/i2c-2/new_device
''; '';
wantedBy = [ "graphical.target" ];
restartIfChanged = false;
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
};
}; };
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;

1
packages/emacs/packages.nix
View file

@ -89,7 +89,6 @@ let
kind-icon kind-icon
ef-themes ef-themes
indent-bars indent-bars
ement
]) ])
++ (with nongnuPackages; [ ++ (with nongnuPackages; [
eat eat