Compare commits

..

3 commits

Author SHA1 Message Date
vorboyvo ee9b522fac Did a bunch of refactoring home-manager packages including things I no longer
use as well as commenting out programming languages so I can use nix flakes
as dev environments.
2024-11-12 16:45:03 -05:00
vorboyvo 74fcd72041 Removed a bunch of comments.
Installed zathura properly, through nix.
2024-11-12 12:11:58 -05:00
vorboyvo a97edb3e3e Removed detachedtext. 2024-11-12 11:58:18 -05:00

View file

@ -42,8 +42,6 @@ in {
# Install packages # Install packages
home.packages = with pkgs; home.packages = with pkgs;
let let
xdg-terminal-exec =
callPackage ../../pkgs/xdg-terminal-exec/xdg-terminal-exec.nix { };
mons = callPackage ../../pkgs/mons/mons.nix { }; mons = callPackage ../../pkgs/mons/mons.nix { };
archivo = callPackage ../../pkgs/archivo/archivo.nix { }; archivo = callPackage ../../pkgs/archivo/archivo.nix { };
highway-gothic = callPackage ../../pkgs/highway-gothic/highway-gothic.nix { }; highway-gothic = callPackage ../../pkgs/highway-gothic/highway-gothic.nix { };
@ -52,20 +50,20 @@ in {
[ marksman nil ] ++ # Language servers except those installed through package sections [ marksman nil ] ++ # Language servers except those installed through package sections
[ texliveFull texlab ] ++ # LaTeX [ texliveFull texlab ] ++ # LaTeX
[ typst typstyle tinymist ] ++ # Typst [ typst typstyle tinymist ] ++ # Typst
(with ocamlPackages; [ # (with ocamlPackages; [
ocaml # ocaml
opam # opam
dune_3 # dune_3
dune-release # dune-release
merlin # merlin
ocaml-lsp # ocaml-lsp
odoc # odoc
ocamlformat # ocamlformat
utop # utop
]) ++ # OCaml # ]) ++ # OCaml
[ rustup ] ++ # Rust # [ rustup ] ++ # Rust
[ go gopls ] ++ # Golang # [ go gopls ] ++ # Golang
(with elmPackages; [ elm elm-language-server elm-format elm-test ]) ++ # (with elmPackages; [ elm elm-language-server elm-format elm-test ]) ++
[ python3 ] ++ # I guess..... [ python3 ] ++ # I guess.....
[ [
kak-lsp kak-lsp
@ -73,19 +71,14 @@ in {
grim grim
slurp slurp
wl-clipboard wl-clipboard
jq
xdg-terminal-exec
blueman blueman
upower upower
proselint # for prose lint glib # provides trash and mount (latter may supplant udisks2?)
glib
] ++ # Basic utilities ] ++ # Basic utilities
[ bitwarden-cli htop snore hledger hledger-ui clifm ] [ bitwarden-cli htop snore hledger hledger-ui clifm ]
++ # Personalized selection of command-line (CLI/TUI) apps ++ # Personalized selection of command-line (CLI/TUI) apps
[ terminal ] ++ # Terminal emulator [ terminal ] ++ # Terminal emulator
[ [
qutebrowser
zathura
evince evince
imv imv
vlc vlc
@ -107,8 +100,9 @@ in {
filezilla filezilla
bitwarden bitwarden
josm josm
activate-linux
] ++ # Personalized selection of graphical apps ] ++ # Personalized selection of graphical apps
[ mons shticker-book-unwritten ] ++ # Games [ olympus shticker-book-unwritten ] ++ # Games
[ swaybg bemenu j4-dmenu-desktop ] ++ # Sway- and Wayland-related packages [ swaybg bemenu j4-dmenu-desktop ] ++ # Sway- and Wayland-related packages
[ [
noto-fonts noto-fonts
@ -125,7 +119,7 @@ in {
] ++ # Fonts ] ++ # Fonts
# [ papirus-icon-theme ] ++ # Icons # [ papirus-icon-theme ] ++ # Icons
# [ vanilla-dmz ] ++ # Cursor # [ vanilla-dmz ] ++ # Cursor
[ activate-linux android-studio olympus ] ++ # Temp [ ] ++ # Temp
[ ]; [ ];
programs.home-manager.enable = true; programs.home-manager.enable = true;
@ -159,13 +153,10 @@ in {
}]; }];
}; };
# Fixes electron apps and also nnn # Fixes electron apps
home.sessionVariables = home.sessionVariables =
let detachedtext = pkgs.writeShellScript "detachedtext" {
(builtins.readFile "${scripts}/detachedtext.sh");
in {
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";
VISUAL = detachedtext;
}; };
# configure fonts correctly # configure fonts correctly
@ -173,16 +164,9 @@ in {
xdg.configFile."fontconfig/conf.d/20-default.fonts.conf".source = xdg.configFile."fontconfig/conf.d/20-default.fonts.conf".source =
"${extra}/20-default-fonts.conf"; "${extra}/20-default-fonts.conf";
# fix nemo terminal integration
# dconf.settings."org/cinnamon/desktop/applications/terminal".exec =
# "${pkgs.lib.getExe terminal}";
# dconf.settings."org/cinnamon/desktop/applications/terminal".exec-arg = "-e --cwd %F";
# terminal emulator # terminal emulator
programs.alacritty.enable = true; programs.alacritty.enable = true;
# programs.neovim = import ./programs/neovim.nix;
programs.kakoune = import ../../programs/kakoune.nix pkgs; programs.kakoune = import ../../programs/kakoune.nix pkgs;
xdg.configFile."kak-lsp/kak-lsp.toml".source = xdg.configFile."kak-lsp/kak-lsp.toml".source =
../../programs/kakoune/kak-lsp.toml; ../../programs/kakoune/kak-lsp.toml;
@ -214,31 +198,9 @@ in {
categories = [ "Utility" "TextEditor" ]; categories = [ "Utility" "TextEditor" ];
}; };
programs.nnn = { programs.zathura = {
enable = true; enable = true;
plugins = {
src = pkgs.fetchFromGitHub {
owner = "jarun";
repo = "nnn";
rev = "v4.9";
hash = "sha256-g19uI36HyzTF2YUQKFP4DE2ZBsArGryVHhX79Y0XzhU=";
};
};
}; };
xdg.desktopEntries.nnn = {
name = "nnn";
genericName = "File Manager";
comment = "Terminal file manager";
exec = "env NNN_TRASH=2 nnn -Adex";
terminal = true;
mimeType = [ "inode/directory" ];
categories = [ "System" "FileTools" "FileManager" "ConsoleOnly" ];
settings.Keywords = "File;Manager;Management;Explorer;Launcher";
};
# programs.zathura = {
# enable = true;
# };
programs.pandoc = { enable = true; }; programs.pandoc = { enable = true; };