diff --git a/configuration.nix b/configuration.nix index 91c1422..5bbe53a 100644 --- a/configuration.nix +++ b/configuration.nix @@ -112,7 +112,7 @@ grim slurp feh - + chromium # cli neofetch fastfetch diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 8083356..3a31bee 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -1,38 +1,47 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.availableKernelModules = [ + "nvme" + "xhci_pci" + "ahci" + "usb_storage" + "usbhid" + "sd_mod" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/0869359e-4c7e-4410-aab0-55bc72a45e0b"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/0869359e-4c7e-4410-aab0-55bc72a45e0b"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/7C74-E1AE"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/7C74-E1AE"; + fsType = "vfat"; + options = [ + "fmask=0022" + "dmask=0022" + ]; + }; swapDevices = [ ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/modules/nix/bspwm/alacritty.nix b/modules/nix/bspwm/alacritty.nix index ef8db83..ceb08a2 100644 --- a/modules/nix/bspwm/alacritty.nix +++ b/modules/nix/bspwm/alacritty.nix @@ -4,6 +4,9 @@ alacritty = { enable = true; settings = { + terminal.shell = { + program = "tmux"; + }; colors = { primary = { background = "#282828"; diff --git a/modules/nix/user.nix b/modules/nix/user.nix index bdb20ba..a71ceff 100644 --- a/modules/nix/user.nix +++ b/modules/nix/user.nix @@ -30,9 +30,6 @@ initExtra = '' eval "$(fzf --bash)" PS1="\[\e[38;5;216m\]\u\[\e[38;5;220m\]@\[\e[38;5;222m\]\h \[\e[38;5;229m\]\w \[\033[0m\]% " - if command -v tmux &> /dev/null && [ -z "$TMUX" ]; then - tmux attach-session -t default || tmux new-session -s default - fi ''; }; @@ -69,6 +66,13 @@ 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 ' ''; }; };