mirror of
https://github.com/gburd/nix-config.git
synced 2024-10-05 04:56:57 +00:00
fixes
This commit is contained in:
parent
1074c0cead
commit
52f8feb010
8 changed files with 51 additions and 13 deletions
2
NOTES
2
NOTES
|
@ -127,5 +127,5 @@ TODO:
|
||||||
EXAMPLE COMMANDS:
|
EXAMPLE COMMANDS:
|
||||||
|
|
||||||
* nh os switch --ask
|
* nh os switch --ask
|
||||||
* nix run github:viperML/nh os switch --ask --nom .
|
* nix run github:viperML/nh -- os switch --ask --nom .
|
||||||
* clear; sudo nixos-rebuild dry-activate --flake .#floki
|
* clear; sudo nixos-rebuild dry-activate --flake .#floki
|
||||||
|
|
|
@ -39,7 +39,5 @@
|
||||||
ltex-ls # Spell checking LSP
|
ltex-ls # Spell checking LSP
|
||||||
|
|
||||||
tly # Tally counter
|
tly # Tally counter
|
||||||
|
|
||||||
# inputs.nh.default # nixos-rebuild and home-manager CLI wrapper
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,7 +30,8 @@ in
|
||||||
snr = "sudo nixos-rebuild --flake .";
|
snr = "sudo nixos-rebuild --flake .";
|
||||||
snrs = "sudo nixos-rebuild --flake . switch";
|
snrs = "sudo nixos-rebuild --flake . switch";
|
||||||
hm = "home-manager --flake .";
|
hm = "home-manager --flake .";
|
||||||
hms = "home-manager --flake . switch";
|
hms = "home-manager -b bkup --flake .gburd@$(hostmname) switch";
|
||||||
|
nh-ask = "nix run github:viperML/nh -- os switch --ask --nom ."
|
||||||
|
|
||||||
ls = mkIf hasExa "eza";
|
ls = mkIf hasExa "eza";
|
||||||
exa = mkIf hasExa "eza";
|
exa = mkIf hasExa "eza";
|
||||||
|
@ -45,6 +46,8 @@ in
|
||||||
mutt = mkIf hasNeomutt "neomutt";
|
mutt = mkIf hasNeomutt "neomutt";
|
||||||
m = mutt;
|
m = mutt;
|
||||||
|
|
||||||
|
locate = "plocate";
|
||||||
|
|
||||||
cik = mkIf hasKitty "clone-in-kitty --type os-window";
|
cik = mkIf hasKitty "clone-in-kitty --type os-window";
|
||||||
ck = cik;
|
ck = cik;
|
||||||
};
|
};
|
||||||
|
|
6
home-manager/_mixins/cli/signal.nix
Normal file
6
home-manager/_mixins/cli/signal.nix
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
{ desktop, lib, pkgs, ... }: {
|
||||||
|
imports = [ ] ++ lib.optionals (desktop != null) [
|
||||||
|
../desktop/signal.nix
|
||||||
|
];
|
||||||
|
home.packages = [ pkgs.signal-cli ];
|
||||||
|
}
|
4
home-manager/_mixins/desktop/alacritty.nix
Normal file
4
home-manager/_mixins/desktop/alacritty.nix
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
home.packages = [ pkgs.alacritty ];
|
||||||
|
}
|
3
home-manager/_mixins/desktop/signal.nix
Normal file
3
home-manager/_mixins/desktop/signal.nix
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
{ desktop, lib, pkgs, ... }: {
|
||||||
|
home.packages = [ pkgs.signal-desktop ];
|
||||||
|
}
|
|
@ -1,10 +1,6 @@
|
||||||
{ inputs, config, pkgs, username, ... }: {
|
{ inputs, config, pkgs, username, ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
inputs.impermanence.nixosModules.home-manager.impermanence
|
inputs.impermanence.nixosModules.home-manager.impermanence
|
||||||
../../services/keybase.nix
|
|
||||||
../../desktop/protonmail-bridge.nix
|
|
||||||
../../desktop/jetbrains-idea-ultimate.nix
|
|
||||||
../../desktop/jetbrains-clion.nix
|
|
||||||
../../pass
|
../../pass
|
||||||
../../cli
|
../../cli
|
||||||
../../nvim
|
../../nvim
|
||||||
|
@ -23,6 +19,7 @@
|
||||||
"Pictures"
|
"Pictures"
|
||||||
"Videos"
|
"Videos"
|
||||||
".local/bin"
|
".local/bin"
|
||||||
|
".config"
|
||||||
];
|
];
|
||||||
allowOther = true;
|
allowOther = true;
|
||||||
};
|
};
|
||||||
|
@ -68,6 +65,29 @@
|
||||||
iso="nixos-desktop/nixos.iso"
|
iso="nixos-desktop/nixos.iso"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
file.".local/share/applications/emacs.desktop".text = ''
|
||||||
|
[Desktop Entry]
|
||||||
|
Version=1.0
|
||||||
|
Categories=Utility;Development;TextEditor;
|
||||||
|
Comment=View and edit files
|
||||||
|
Exec=env XLIB_SKIP_ARGB_VISUALS=1 emacs -c -a "" %F
|
||||||
|
#Exec=/usr/bin/emacsclient -c -a "" %F
|
||||||
|
GenericName=Text Editor
|
||||||
|
Icon=/usr/share/icons/hicolor/scalable/apps/emacs.svg
|
||||||
|
MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
|
||||||
|
Name=Emacs (Client)
|
||||||
|
Name[en_US]=Emacs (Client)%
|
||||||
|
StartupWMClass=Emacs
|
||||||
|
Terminal=false
|
||||||
|
TryExec=emacs
|
||||||
|
Type=Application
|
||||||
|
'';
|
||||||
|
|
||||||
|
file.".inputrc".text = ''
|
||||||
|
"\C-v": ""
|
||||||
|
set enable-bracketed-paste off
|
||||||
|
'';
|
||||||
|
|
||||||
# A Modern Unix experience
|
# A Modern Unix experience
|
||||||
# https://jvns.ca/blog/2022/04/12/a-list-of-new-ish--command-line-tools/
|
# https://jvns.ca/blog/2022/04/12/a-list-of-new-ish--command-line-tools/
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
|
@ -128,6 +148,7 @@
|
||||||
yq-go # Terminal `jq` for YAML
|
yq-go # Terminal `jq` for YAML
|
||||||
|
|
||||||
emacs
|
emacs
|
||||||
|
plocate
|
||||||
];
|
];
|
||||||
sessionVariables = {
|
sessionVariables = {
|
||||||
# PAGER = "moar";
|
# PAGER = "moar";
|
||||||
|
|
|
@ -2,18 +2,21 @@
|
||||||
with lib.hm.gvariant;
|
with lib.hm.gvariant;
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
../../cli/signal.nix
|
||||||
|
../../desktop/alacritty.nix
|
||||||
../../desktop/audio-recorder.nix
|
../../desktop/audio-recorder.nix
|
||||||
../../desktop/celluloid.nix
|
../../desktop/celluloid.nix
|
||||||
../../desktop/dconf-editor.nix
|
../../desktop/dconf-editor.nix
|
||||||
../../desktop/emote.nix
|
|
||||||
../../desktop/gitkraken.nix
|
../../desktop/gitkraken.nix
|
||||||
../../desktop/gnome-sound-recorder.nix
|
../../desktop/gnome-sound-recorder.nix
|
||||||
|
../../desktop/jetbrains-clion.nix
|
||||||
|
../../desktop/jetbrains-idea-ultimate.nix
|
||||||
../../desktop/meld.nix
|
../../desktop/meld.nix
|
||||||
../../desktop/sublime.nix
|
../../desktop/protonmail-bridge.nix
|
||||||
../../desktop/sublime-merge.nix
|
|
||||||
../../desktop/rhythmbox.nix
|
../../desktop/rhythmbox.nix
|
||||||
../../desktop/sakura.nix
|
../../desktop/sublime-merge.nix
|
||||||
../../desktop/tilix.nix
|
../../desktop/sublime.nix
|
||||||
|
../../services/keybase.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
dconf.settings = {
|
dconf.settings = {
|
||||||
|
|
Loading…
Reference in a new issue