home: major restructuring
needs more work
This commit is contained in:
128
home/natto.nix
128
home/natto.nix
@@ -1,128 +0,0 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
let
|
||||
home = config.home.homeDirectory;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
./stuff/programs.nix
|
||||
./stuff/xsession.nix
|
||||
./stuff/secret.nix
|
||||
./stuff/services.nix
|
||||
];
|
||||
nixpkgs = {
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
};
|
||||
};
|
||||
|
||||
age = {
|
||||
sshKeyPaths = [ "${home}/.ssh/id_ed25519" ];
|
||||
secrets = {
|
||||
/* fish_variables = {
|
||||
file = ./secrets/fish_variables.age;
|
||||
path = "${home}/.config/fish/fish_variables";
|
||||
mode = "660";
|
||||
};
|
||||
*/
|
||||
mpdasrc = {
|
||||
file = ./secrets/mpdasrc.age;
|
||||
path = "${home}/.config/mpdasrc";
|
||||
};
|
||||
zshrc = {
|
||||
file = ./secrets/.zshrc.age;
|
||||
path = "${home}/.zshrc";
|
||||
mode = "660";
|
||||
};
|
||||
};
|
||||
};
|
||||
home = {
|
||||
packages = with pkgs; [
|
||||
ffmpeg-full
|
||||
sox
|
||||
rage
|
||||
curl
|
||||
pamixer
|
||||
mpdas
|
||||
pavucontrol
|
||||
unstable.anup
|
||||
xfce.thunar
|
||||
xfce.xfconf
|
||||
xfce.tumbler
|
||||
master.discord
|
||||
mpd_discord_richpresence
|
||||
sox
|
||||
qbittorrent
|
||||
#tor-browser-bundle-bin
|
||||
mpc_cli
|
||||
hexchat
|
||||
luajit
|
||||
mpv
|
||||
jmtpfs
|
||||
dunst
|
||||
flameshot
|
||||
yt-dlp
|
||||
xclip
|
||||
xorg.xkbcomp
|
||||
xorg.xmodmap
|
||||
p7zip
|
||||
unrar
|
||||
glxinfo
|
||||
sxiv
|
||||
vim
|
||||
feh
|
||||
dmenu
|
||||
st
|
||||
neofetch
|
||||
xmobar
|
||||
xdotool
|
||||
arc-theme
|
||||
arc-icon-theme
|
||||
tor-browser-bundle-bin
|
||||
wineWowPackages.stable
|
||||
master.winetricks
|
||||
games.wine-discord-ipc-bridge
|
||||
(games.osu-stable.overrideAttrs (_: {
|
||||
tricks = [ "gdiplus" "dotnet48" "meiryo" ];
|
||||
}))
|
||||
pmidi
|
||||
# dosbox
|
||||
authy
|
||||
unstable.premid
|
||||
(master.tauon.override { withDiscordRPC = true; })
|
||||
nbfc-linux
|
||||
pulseaudio
|
||||
(texlive.combine { inherit (texlive) scheme-small babel lm graphics-def url; })
|
||||
# carla
|
||||
# electrum
|
||||
anki-bin
|
||||
spotify
|
||||
deluge
|
||||
teams
|
||||
# libreoffice
|
||||
google-drive-ocamlfuse
|
||||
customscripts
|
||||
(qjackctl.override { jackSession = true; })
|
||||
stable.ardour
|
||||
calf
|
||||
# stable.blender
|
||||
neomutt
|
||||
mailcap
|
||||
cantata
|
||||
];
|
||||
|
||||
file = {
|
||||
/* dwm-autostart = {
|
||||
source = ./config/dwm/autostart.sh;
|
||||
target = "${home}/.dwm/autostart.sh";
|
||||
};
|
||||
dwm-status = {
|
||||
source = ./config/dwm/bruhstatus.sh;
|
||||
target = "${home}/.dwm/bruhstatus.sh";
|
||||
};*/
|
||||
dunstrc = {
|
||||
source = ./config/dunst/dunstrc;
|
||||
target = "${home}/.config/dunst/dunstrc";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
13
home/natto/default.nix
Normal file
13
home/natto/default.nix
Normal file
@@ -0,0 +1,13 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
let
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
./secrets
|
||||
./programs.nix
|
||||
./xsession.nix
|
||||
./services.nix
|
||||
./pkgs.nix
|
||||
./stuff.nix
|
||||
];
|
||||
}
|
||||
76
home/natto/pkgs.nix
Normal file
76
home/natto/pkgs.nix
Normal file
@@ -0,0 +1,76 @@
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
ffmpeg-full
|
||||
sox
|
||||
rage
|
||||
curl
|
||||
pamixer
|
||||
mpdas
|
||||
pavucontrol
|
||||
unstable.anup
|
||||
xfce.thunar
|
||||
xfce.xfconf
|
||||
xfce.tumbler
|
||||
master.discord
|
||||
mpd_discord_richpresence
|
||||
sox
|
||||
qbittorrent
|
||||
#tor-browser-bundle-bin
|
||||
mpc_cli
|
||||
hexchat
|
||||
luajit
|
||||
mpv
|
||||
jmtpfs
|
||||
dunst
|
||||
flameshot
|
||||
yt-dlp
|
||||
xclip
|
||||
xorg.xkbcomp
|
||||
xorg.xmodmap
|
||||
p7zip
|
||||
unrar
|
||||
glxinfo
|
||||
sxiv
|
||||
vim
|
||||
feh
|
||||
dmenu
|
||||
st
|
||||
neofetch
|
||||
xmobar
|
||||
xdotool
|
||||
arc-theme
|
||||
arc-icon-theme
|
||||
tor-browser-bundle-bin
|
||||
wineWowPackages.stable
|
||||
master.winetricks
|
||||
games.wine-discord-ipc-bridge
|
||||
(games.osu-stable.overrideAttrs (_: {
|
||||
tricks = [ "gdiplus" "dotnet48" "meiryo" ];
|
||||
}))
|
||||
pmidi
|
||||
# dosbox
|
||||
authy
|
||||
unstable.premid
|
||||
(master.tauon.override { withDiscordRPC = true; })
|
||||
nbfc-linux
|
||||
pulseaudio
|
||||
(texlive.combine { inherit (texlive) scheme-small babel lm graphics-def url mhchem wrapfig capt-of; })
|
||||
# carla
|
||||
# electrum
|
||||
anki-bin
|
||||
spotify
|
||||
deluge
|
||||
teams
|
||||
# libreoffice
|
||||
google-drive-ocamlfuse
|
||||
customscripts
|
||||
(qjackctl.override { jackSession = true; })
|
||||
stable.lmms
|
||||
# stable.blender
|
||||
neomutt
|
||||
mailcap
|
||||
element-desktop
|
||||
syncplay
|
||||
];
|
||||
}
|
||||
92
home/natto/programs.nix
Normal file
92
home/natto/programs.nix
Normal file
@@ -0,0 +1,92 @@
|
||||
{ pkgs, config, ... }:
|
||||
{
|
||||
programs = {
|
||||
firefox = {
|
||||
enable = true;
|
||||
package = pkgs.master.firefox-bin;
|
||||
profiles.natto = {
|
||||
name = "natto";
|
||||
# userChrome = builtins.readFile ./config/firefox/userChrome.css;
|
||||
# userContent = builtins.readFile ./config/firefox/userContent.css;
|
||||
};
|
||||
};
|
||||
/* chromium = {
|
||||
enable = true;
|
||||
package = pkgs.ungoogled-chromium;
|
||||
}; */
|
||||
zathura = {
|
||||
enable = true;
|
||||
extraConfig = builtins.readFile ./config/zathura/zathurarc;
|
||||
options = {
|
||||
recolor = true;
|
||||
recolor-lightcolor = "rgba(0,0,0,0)";
|
||||
default-bg = "rgba(0,0,0,0.8)";
|
||||
};
|
||||
};
|
||||
mpv = {
|
||||
enable = true;
|
||||
config = {
|
||||
force-window = "yes";
|
||||
keep-open = "yes";
|
||||
save-position-on-quit = "yes";
|
||||
# autofit="100%";
|
||||
# no-keepaspect-window = "yes";
|
||||
};
|
||||
};
|
||||
go.enable = true;
|
||||
ncmpcpp = {
|
||||
enable = true;
|
||||
mpdMusicDir = ~/Music;
|
||||
settings = {
|
||||
autocenter_mode = "yes";
|
||||
follow_now_playing_lyrics = "yes";
|
||||
lyrics_directory = "~/.lyrics";
|
||||
fetch_lyrics_for_current_song_in_background = "yes";
|
||||
#store_lyrics_in_song_dir = yes;
|
||||
browser_sort_mode = "mtime";
|
||||
colors_enabled = "yes";
|
||||
main_window_color = "white";
|
||||
header_window_color = "143";
|
||||
volume_color = "222";
|
||||
progressbar_color = "143";
|
||||
# progressbar_elapsed_color = "";
|
||||
# statusbar_color = "43";
|
||||
active_window_border = "blue";
|
||||
user_interface = "alternative";
|
||||
#song_list_format="(4)[230]{l}";
|
||||
song_columns_list_format = "(4)[167]{l} (20)[109]{t} (12)[143]{a} (16)[139]{b}";
|
||||
song_list_format = "$(222){%a} - $(109){%t}";
|
||||
#song_list_format = "{$7%a - $9}{$5%t$9}|{$5%f$9}$R{$6%b $9}{$3%l$9}";
|
||||
song_status_format = " $6%a $7⟫⟫ $3%t $7⟫⟫ $4%b ";
|
||||
visualizer_data_source = "/tmp/g.fifo";
|
||||
#visualizer_output_name = "my_fifo";
|
||||
visualizer_type = "spectrum";
|
||||
#visualizer_type = "ellipse";
|
||||
visualizer_fps = "144";
|
||||
visualizer_in_stereo = "yes";
|
||||
visualizer_look = "◆▋";
|
||||
visualizer_spectrum_smooth_look = "yes";
|
||||
playlist_editor_display_mode = "classic";
|
||||
playlist_display_mode = "columns";
|
||||
cyclic_scrolling = "yes";
|
||||
lines_scrolled = "2";
|
||||
system_encoding = "utf-8";
|
||||
regular_expressions = "extended";
|
||||
#selected_item_prefix = "* "
|
||||
#discard_colors_if_item_is_selected = "no"
|
||||
#incremental_seeking = "yes"
|
||||
#seek_time = "1"
|
||||
header_visibility = "yes";
|
||||
statusbar_visibility = "yes";
|
||||
titles_visibility = "yes";
|
||||
progressbar_look = "▃▃▃";
|
||||
now_playing_prefix = "> ";
|
||||
centered_cursor = "yes";
|
||||
display_bitrate = "yes";
|
||||
enable_window_title = "yes";
|
||||
empty_tag_marker = "";
|
||||
execute_on_song_change = "${config.home.homeDirectory}/.config/ncmpcpp/ncmpcpp-ueberzug/ncmpcpp_cover_art.sh";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
20
home/natto/secrets/default.nix
Normal file
20
home/natto/secrets/default.nix
Normal file
@@ -0,0 +1,20 @@
|
||||
{ config, ... }: {
|
||||
age =
|
||||
let
|
||||
home = config.home.homeDirectory;
|
||||
in
|
||||
{
|
||||
sshKeyPaths = [ "${home}/.ssh/id_ed25519" ];
|
||||
secrets = {
|
||||
mpdasrc = {
|
||||
file = ./mpdasrc.age;
|
||||
path = "${home}/.config/mpdasrc";
|
||||
};
|
||||
zshrc = {
|
||||
file = ./.zshrc.age;
|
||||
path = "${home}/.zshrc";
|
||||
mode = "660";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
17
home/natto/stuff.nix
Normal file
17
home/natto/stuff.nix
Normal file
@@ -0,0 +1,17 @@
|
||||
{ config, lib, pkgs, ... }: {
|
||||
home =
|
||||
let
|
||||
home = config.home.homeDirectory;
|
||||
in
|
||||
{
|
||||
sessionVariables = {
|
||||
LV2_PATH = lib.makeSearchPath "lib/lv2" (with pkgs; [ calf ]);
|
||||
};
|
||||
file = {
|
||||
dunstrc = {
|
||||
source = ./config/dunst/dunstrc;
|
||||
target = "${home}/.config/dunst/dunstrc";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
{pkgs, config, ...}:
|
||||
{ pkgs, config, ... }:
|
||||
{
|
||||
xsession = {
|
||||
pointerCursor = {
|
||||
@@ -14,11 +14,11 @@
|
||||
enable = true;
|
||||
enableContribAndExtras = true;
|
||||
extraPackages = hs: [ hs.xmobar ];
|
||||
config = ../config/xmonad/xmonad.hs;
|
||||
config = ./config/xmonad/xmonad.hs;
|
||||
libFiles = {
|
||||
"xmobar.hs" = ../config/xmonad/xmobar.hs;
|
||||
"padding-icon.sh" = ../config/xmonad/padding-icon.sh;
|
||||
"nixos.xpm" = ../config/xmonad/nixos.xpm;
|
||||
"xmobar.hs" = ./config/xmonad/xmobar.hs;
|
||||
"padding-icon.sh" = ./config/xmonad/padding-icon.sh;
|
||||
"nixos.xpm" = ./config/xmonad/nixos.xpm;
|
||||
};
|
||||
};
|
||||
};
|
||||
@@ -1,42 +0,0 @@
|
||||
{ pkgs, config, ...}:
|
||||
{
|
||||
imports = [
|
||||
./programs/ncmpcpp.nix
|
||||
./programs/emacs.nix
|
||||
];
|
||||
programs = {
|
||||
firefox = {
|
||||
enable = true;
|
||||
package = pkgs.firefox-bin;
|
||||
profiles.natto = {
|
||||
name = "natto";
|
||||
# userChrome = builtins.readFile ../config/firefox/userChrome.css;
|
||||
# userContent = builtins.readFile ../config/firefox/userContent.css;
|
||||
};
|
||||
};
|
||||
/* chromium = {
|
||||
enable = true;
|
||||
package = pkgs.ungoogled-chromium;
|
||||
};*/
|
||||
zathura = {
|
||||
enable = true;
|
||||
extraConfig = builtins.readFile ../config/zathura/zathurarc;
|
||||
options = {
|
||||
recolor = true;
|
||||
recolor-lightcolor = "rgba(0,0,0,0)";
|
||||
default-bg = "rgba(0,0,0,0.8)";
|
||||
};
|
||||
};
|
||||
mpv = {
|
||||
enable = true;
|
||||
config = {
|
||||
force-window = "yes";
|
||||
keep-open = "yes";
|
||||
save-position-on-quit = "yes";
|
||||
# autofit="100%";
|
||||
# no-keepaspect-window = "yes";
|
||||
};
|
||||
};
|
||||
go.enable = true;
|
||||
};
|
||||
}
|
||||
@@ -1,64 +0,0 @@
|
||||
{ pkgs, config, ... }:
|
||||
{
|
||||
programs.emacs = {
|
||||
enable = false;
|
||||
extraPackages = epkgs: with epkgs; [
|
||||
elcord
|
||||
gruvbox-theme
|
||||
ivy
|
||||
rainbow-delimiters
|
||||
evil
|
||||
evil-colemak-basics
|
||||
treemacs
|
||||
treemacs-evil
|
||||
lsp-mode
|
||||
lsp-treemacs
|
||||
lsp-ui
|
||||
tree-sitter
|
||||
tree-sitter-langs
|
||||
tsc
|
||||
];
|
||||
overrides = self: super : {
|
||||
tsc = super.tsc.overrideAttrs(oa:
|
||||
let
|
||||
tsc-dyn = version: pkgs.fetchurl {
|
||||
url = "https://github.com/emacs-tree-sitter/elisp-tree-sitter/releases/download/${version}/tsc-dyn.so";
|
||||
sha256 = "sha256-oOq/TAooHRUo7JypCblrB/ztABowAHv2LRhFL/ZmVrg=";
|
||||
};
|
||||
in { postInstall = oa.postInstall or "" + "cp ${tsc-dyn "0.15.2"} $out/share/emacs/site-lisp/elpa/tsc-${super.tsc.version}/tsc-dyn.so" ;});
|
||||
tree-sitter-langs = pkgs.symlinkJoin rec {
|
||||
name = "tree-sitter-langs";
|
||||
paths =
|
||||
let
|
||||
tree-sitter-grammars = pkgs.stdenv.mkDerivation rec {
|
||||
name = "tree-sitter-grammars";
|
||||
version = "0.10.4";
|
||||
src = pkgs.fetchzip {
|
||||
url = "https://github.com/emacs-tree-sitter/tree-sitter-langs/releases/download/${version}/tree-sitter-grammars-linux-${version}.tar.gz";
|
||||
sha256 = "sha256-Z+JtuGLTCVhCJBR60cbcDgWtdKcoYGWoeI5u9GcfvUQ=";
|
||||
stripRoot = false;
|
||||
};
|
||||
installPhase = ''
|
||||
install -d $out/langs/bin
|
||||
install -m444 * $out/langs/bin
|
||||
echo -n $version > $out/langs/bin/BUNDLE-VERSION
|
||||
'';
|
||||
};
|
||||
in
|
||||
[
|
||||
(super.tree-sitter-langs.overrideAttrs (oldAttrs: {
|
||||
postPatch = oldAttrs.postPatch or "" + ''
|
||||
substituteInPlace ./tree-sitter-langs-build.el \
|
||||
--replace "tree-sitter-langs-grammar-dir tree-sitter-langs--dir" "tree-sitter-langs-grammar-dir \"${tree-sitter-grammars}/langs\""
|
||||
'';
|
||||
}))
|
||||
tree-sitter-grammars
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
home.file.emacs = {
|
||||
source = ../../config/emacs/init.el;
|
||||
target = "${config.home.homeDirectory}/.emacs.d/init.el";
|
||||
};
|
||||
}
|
||||
@@ -1,57 +0,0 @@
|
||||
{config, ...}:
|
||||
{
|
||||
programs.ncmpcpp = {
|
||||
enable = true;
|
||||
mpdMusicDir = ~/Music;
|
||||
settings = {
|
||||
autocenter_mode = "yes";
|
||||
follow_now_playing_lyrics = "yes";
|
||||
lyrics_directory = "~/.lyrics";
|
||||
fetch_lyrics_for_current_song_in_background = "yes";
|
||||
#store_lyrics_in_song_dir = yes;
|
||||
browser_sort_mode="mtime";
|
||||
colors_enabled = "yes";
|
||||
main_window_color = "white";
|
||||
header_window_color = "143";
|
||||
volume_color = "222";
|
||||
progressbar_color = "143";
|
||||
# progressbar_elapsed_color = "";
|
||||
# statusbar_color = "43";
|
||||
active_window_border = "blue";
|
||||
user_interface = "alternative";
|
||||
#song_list_format="(4)[230]{l}";
|
||||
song_columns_list_format = "(4)[167]{l} (20)[109]{t} (12)[143]{a} (16)[139]{b}";
|
||||
song_list_format = "$(222){%a} - $(109){%t}";
|
||||
#song_list_format = "{$7%a - $9}{$5%t$9}|{$5%f$9}$R{$6%b $9}{$3%l$9}";
|
||||
song_status_format = " $6%a $7⟫⟫ $3%t $7⟫⟫ $4%b ";
|
||||
visualizer_data_source = "/tmp/g.fifo";
|
||||
#visualizer_output_name = "my_fifo";
|
||||
visualizer_type = "spectrum";
|
||||
#visualizer_type = "ellipse";
|
||||
visualizer_fps = "144";
|
||||
visualizer_in_stereo = "yes";
|
||||
visualizer_look = "◆▋";
|
||||
visualizer_spectrum_smooth_look="yes";
|
||||
playlist_editor_display_mode = "classic";
|
||||
playlist_display_mode = "columns";
|
||||
cyclic_scrolling = "yes";
|
||||
lines_scrolled = "2";
|
||||
system_encoding = "utf-8";
|
||||
regular_expressions = "extended";
|
||||
#selected_item_prefix = "* "
|
||||
#discard_colors_if_item_is_selected = "no"
|
||||
#incremental_seeking = "yes"
|
||||
#seek_time = "1"
|
||||
header_visibility = "yes";
|
||||
statusbar_visibility = "yes";
|
||||
titles_visibility = "yes";
|
||||
progressbar_look = "▃▃▃";
|
||||
now_playing_prefix = "> ";
|
||||
centered_cursor = "yes";
|
||||
display_bitrate = "yes";
|
||||
enable_window_title = "yes";
|
||||
empty_tag_marker = "";
|
||||
execute_on_song_change="${config.home.homeDirectory}/.config/ncmpcpp/ncmpcpp-ueberzug/ncmpcpp_cover_art.sh";
|
||||
};
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user