From 85229264717d648cc4e3f6a9cb98454a96b7acac Mon Sep 17 00:00:00 2001 From: fqbn207 Date: Sun, 22 Dec 2024 18:28:43 +0100 Subject: [PATCH] kekl --- configuration.nix | 38 +++++++++++------- hardware-configuration.nix | 4 +- modules/home.nix | 8 +--- modules/nix/bash.nix | 37 ++++++++++++++++++ modules/nix/default.nix | 12 ++++++ modules/nix/git.nix | 10 +++++ modules/nix/mpd.nix | 25 ++++++++++++ modules/nix/tmux.nix | 35 +++++++++++++++++ modules/nix/user.nix | 79 -------------------------------------- 9 files changed, 147 insertions(+), 101 deletions(-) create mode 100644 modules/nix/bash.nix create mode 100644 modules/nix/default.nix create mode 100644 modules/nix/git.nix create mode 100644 modules/nix/mpd.nix create mode 100644 modules/nix/tmux.nix delete mode 100644 modules/nix/user.nix diff --git a/configuration.nix b/configuration.nix index 27a8124..440307b 100644 --- a/configuration.nix +++ b/configuration.nix @@ -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,20 +201,19 @@ in fonts = { fontconfig.enable = true; - packages = - with pkgs; - [ - noto-fonts - noto-fonts-emoji - liberation_ttf - fira-code - fira-code-symbols - fantasque-sans-mono - mplus-outline-fonts.githubRelease - dina-font - proggyfonts - ] - ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts); + packages = with pkgs; [ + noto-fonts + noto-fonts-emoji + liberation_ttf + fira-code + fira-code-symbols + fantasque-sans-mono + mplus-outline-fonts.githubRelease + dina-font + proggyfonts + nerdfonts + ]; + #++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts); }; environment.etc = { diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 55d42ee..a72e722 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -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" ]; }; diff --git a/modules/home.nix b/modules/home.nix index 86bcc12..e27d16e 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -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; diff --git a/modules/nix/bash.nix b/modules/nix/bash.nix new file mode 100644 index 0000000..426d780 --- /dev/null +++ b/modules/nix/bash.nix @@ -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 % " + + ''; + }; + }; +} diff --git a/modules/nix/default.nix b/modules/nix/default.nix new file mode 100644 index 0000000..5fd897c --- /dev/null +++ b/modules/nix/default.nix @@ -0,0 +1,12 @@ +{ config, pkgs, ... }: +{ + imports = [ + ./nvim/default.nix + ./bspwm/default.nix + ./hypr/default.nix + ./bash.nix + ./git.nix + ./tmux.nix + ./mpd.nix + ]; +} diff --git a/modules/nix/git.nix b/modules/nix/git.nix new file mode 100644 index 0000000..eb0e9a8 --- /dev/null +++ b/modules/nix/git.nix @@ -0,0 +1,10 @@ +{ config, pkgs, ... }: +{ + programs = { + git = { + enable = true; + userName = "fqbn207"; + userEmail = "fqbn207"; + }; + }; +} diff --git a/modules/nix/mpd.nix b/modules/nix/mpd.nix new file mode 100644 index 0000000..0e7bddf --- /dev/null +++ b/modules/nix/mpd.nix @@ -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"; + }; + }; +} diff --git a/modules/nix/tmux.nix b/modules/nix/tmux.nix new file mode 100644 index 0000000..54d9698 --- /dev/null +++ b/modules/nix/tmux.nix @@ -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 + ''; + }; + }; +} diff --git a/modules/nix/user.nix b/modules/nix/user.nix deleted file mode 100644 index cc0b3f8..0000000 --- a/modules/nix/user.nix +++ /dev/null @@ -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 ' - ''; - }; - }; -}