kekl
This commit is contained in:
@ -21,6 +21,14 @@ in
|
||||
"flakes"
|
||||
];
|
||||
|
||||
systemd = {
|
||||
services = {
|
||||
mpd.environment = {
|
||||
XDG_RUNTIME_DIR = "/run/user/1000";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
boot = {
|
||||
loader = {
|
||||
systemd-boot = {
|
||||
@ -38,6 +46,9 @@ in
|
||||
networking = {
|
||||
hostName = "poggers";
|
||||
networkmanager.enable = true;
|
||||
nameservers = [
|
||||
"192.168.0.125"
|
||||
];
|
||||
firewall = {
|
||||
enable = true;
|
||||
allowedTCPPorts = [
|
||||
@ -190,9 +201,7 @@ in
|
||||
|
||||
fonts = {
|
||||
fontconfig.enable = true;
|
||||
packages =
|
||||
with pkgs;
|
||||
[
|
||||
packages = with pkgs; [
|
||||
noto-fonts
|
||||
noto-fonts-emoji
|
||||
liberation_ttf
|
||||
@ -202,8 +211,9 @@ in
|
||||
mplus-outline-fonts.githubRelease
|
||||
dina-font
|
||||
proggyfonts
|
||||
]
|
||||
++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
|
||||
nerdfonts
|
||||
];
|
||||
#++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
|
||||
};
|
||||
|
||||
environment.etc = {
|
||||
|
@ -14,12 +14,12 @@
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/b06d4374-2fe4-4607-b4a4-d9290e4cf7cd";
|
||||
{ device = "/dev/disk/by-uuid/850226f1-be02-42df-bb13-669f364ced4c";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/E4ED-FEFF";
|
||||
{ device = "/dev/disk/by-uuid/D3F1-6A1B";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
|
@ -5,15 +5,11 @@
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
./nix/user.nix
|
||||
./nix/nvim/default.nix
|
||||
./nix/hypr/default.nix
|
||||
./nix/bspwm/default.nix
|
||||
./nix
|
||||
];
|
||||
|
||||
home = {
|
||||
enableNixpkgsReleaseCheck = false;
|
||||
stateVersion = "24.05";
|
||||
stateVersion = "24.11";
|
||||
file = {
|
||||
".wp/temple.png".source = ./raw/wp/temple.png;
|
||||
".wp/skull_purple.png".source = ./raw/wp/skull_purple.png;
|
||||
|
37
modules/nix/bash.nix
Normal file
37
modules/nix/bash.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
programs = {
|
||||
bash = {
|
||||
enable = true;
|
||||
enableCompletion = true;
|
||||
sessionVariables = {
|
||||
DEVKITPRO = "/opt/devkitpro";
|
||||
DEVKITPPC = "/opt/devkitpro/devkitPPC";
|
||||
DEVKITA64 = "/opt/devkitpro/devkitA64";
|
||||
DEVKITARM = "/opt/devkitpro/devkitARM";
|
||||
PATH = "/opt/devkitpro/tools/bin:$PATH";
|
||||
};
|
||||
shellAliases = {
|
||||
http = "python3 -m http.server";
|
||||
rm = "rm -rfv";
|
||||
ls = "${pkgs.eza}/bin/eza -l --icons";
|
||||
cp = "cp -rv";
|
||||
mv = "mv -v";
|
||||
mkdir = "mkdir -pv";
|
||||
update = "doas nixos-rebuild switch";
|
||||
};
|
||||
shellOptions = [
|
||||
"histappend"
|
||||
"checkwinsize"
|
||||
"extglob"
|
||||
"globstar"
|
||||
"checkjobs"
|
||||
];
|
||||
initExtra = ''
|
||||
eval "$(fzf --bash)"
|
||||
PS1="\w % "
|
||||
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
12
modules/nix/default.nix
Normal file
12
modules/nix/default.nix
Normal file
@ -0,0 +1,12 @@
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
imports = [
|
||||
./nvim/default.nix
|
||||
./bspwm/default.nix
|
||||
./hypr/default.nix
|
||||
./bash.nix
|
||||
./git.nix
|
||||
./tmux.nix
|
||||
./mpd.nix
|
||||
];
|
||||
}
|
10
modules/nix/git.nix
Normal file
10
modules/nix/git.nix
Normal file
@ -0,0 +1,10 @@
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
programs = {
|
||||
git = {
|
||||
enable = true;
|
||||
userName = "fqbn207";
|
||||
userEmail = "fqbn207";
|
||||
};
|
||||
};
|
||||
}
|
25
modules/nix/mpd.nix
Normal file
25
modules/nix/mpd.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
mpc
|
||||
];
|
||||
services = {
|
||||
mpd = {
|
||||
enable = true;
|
||||
musicDirectory = "/home/fabian/.music";
|
||||
extraConfig = ''
|
||||
audio_output {
|
||||
type "pipewire"
|
||||
name "Pipewire Output"
|
||||
}
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
programs = {
|
||||
ncmpcpp = {
|
||||
enable = true;
|
||||
mpdMusicDir = "/home/fabian/.music";
|
||||
};
|
||||
};
|
||||
}
|
35
modules/nix/tmux.nix
Normal file
35
modules/nix/tmux.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
programs = {
|
||||
tmux = {
|
||||
enable = true;
|
||||
plugins = with pkgs; [
|
||||
tmuxPlugins.net-speed
|
||||
tmuxPlugins.cpu
|
||||
tmuxPlugins.battery
|
||||
];
|
||||
disableConfirmationPrompt = true;
|
||||
mouse = true;
|
||||
keyMode = "vi";
|
||||
extraConfig = ''
|
||||
unbind C-b
|
||||
set-option -g prefix C-a
|
||||
bind-key C-a send-prefix
|
||||
bind \\ split-window -h
|
||||
bind - split-window -v
|
||||
unbind '"'
|
||||
unbind %
|
||||
bind t new-window
|
||||
bind -n M-q previous-window
|
||||
bind -n M-e next-window
|
||||
bind r source-file ~/.tmux.conf
|
||||
bind -n M-Left select-pane -L
|
||||
bind -n M-Right select-pane -R
|
||||
bind -n M-Up select-pane -U
|
||||
bind -n M-Down select-pane -D
|
||||
set -g status-position top
|
||||
set status-bg default
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
@ -1,79 +0,0 @@
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
programs = {
|
||||
bash = {
|
||||
enable = true;
|
||||
enableCompletion = true;
|
||||
sessionVariables = {
|
||||
DEVKITPRO = "/opt/devkitpro";
|
||||
DEVKITPPC = "/opt/devkitpro/devkitPPC";
|
||||
DEVKITA64 = "/opt/devkitpro/devkitA64";
|
||||
DEVKITARM = "/opt/devkitpro/devkitARM";
|
||||
PATH = "/opt/devkitpro/tools/bin:$PATH";
|
||||
};
|
||||
shellAliases = {
|
||||
http = "python3 -m http.server";
|
||||
rm = "rm -rfv";
|
||||
ls = "${pkgs.eza}/bin/eza -l --icons";
|
||||
cp = "cp -rv";
|
||||
mv = "mv -v";
|
||||
mkdir = "mkdir -pv";
|
||||
update = "sudo nixos-rebuild switch";
|
||||
};
|
||||
shellOptions = [
|
||||
"histappend"
|
||||
"checkwinsize"
|
||||
"extglob"
|
||||
"globstar"
|
||||
"checkjobs"
|
||||
];
|
||||
initExtra = ''
|
||||
eval "$(fzf --bash)"
|
||||
PS1="\w % "
|
||||
|
||||
'';
|
||||
};
|
||||
git = {
|
||||
enable = true;
|
||||
userName = "fqbn207";
|
||||
userEmail = "fqbn207";
|
||||
};
|
||||
tmux = {
|
||||
enable = true;
|
||||
plugins = with pkgs; [
|
||||
tmuxPlugins.net-speed
|
||||
tmuxPlugins.cpu
|
||||
tmuxPlugins.battery
|
||||
tmuxPlugins.gruvbox
|
||||
];
|
||||
disableConfirmationPrompt = true;
|
||||
mouse = true;
|
||||
keyMode = "vi";
|
||||
extraConfig = ''
|
||||
unbind C-b
|
||||
set-option -g prefix C-a
|
||||
bind-key C-a send-prefix
|
||||
bind \\ split-window -h
|
||||
bind - split-window -v
|
||||
unbind '"'
|
||||
unbind %
|
||||
bind t new-window
|
||||
bind -n M-q previous-window
|
||||
bind -n M-e next-window
|
||||
bind r source-file ~/.tmux.conf
|
||||
bind -n M-Left select-pane -L
|
||||
bind -n M-Right select-pane -R
|
||||
bind -n M-Up select-pane -U
|
||||
bind -n M-Down select-pane -D
|
||||
set -g status-position top
|
||||
|
||||
|
||||
set -g @net_speed_interfaces "wg0-mullvad"
|
||||
set -g @download_speed_format "%10s"
|
||||
set -g @upload_speed_format "%10s"
|
||||
set -g @net_speed_format "D:%10s U:%10s"
|
||||
set -g status-right '#{cpu_bg_color} CPU: #{cpu_icon} #{cpu_percentage} | %a %h-%d %H:%M '
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
Reference in New Issue
Block a user