diff --git a/hosts/temperance/configuration.nix b/hosts/temperance/configuration.nix index 6c357a1..b32535b 100644 --- a/hosts/temperance/configuration.nix +++ b/hosts/temperance/configuration.nix @@ -11,25 +11,33 @@ console.keyMap = "de"; security.polkit.enable = true; programs.kdeconnect.enable = true; + programs.nix-ld.enable = false; boot.kernelPackages = pkgs.linuxPackages_xanmod_latest; - services.fstrim.enable = lib.mkDefault true; + services = { + fstrim.enable = lib.mkDefault true; + }; modules = { system = { programs = { editors = { emacs.enable = true; + # only emacs for me, right now. neovim.enable = true; + # sadly just not advanced enough, yet. helix.enable = true; kakoune.enable = false; }; discord.enable = true; + nushell.enable = true; + oh-my-posh.enable = true; + eza.enable = true; firefox.enable = true; spotify.enable = true; zellij.enable = true; terminals = { foot.enable = true; - kitty.enable = false; + kitty.enable = true; }; }; sound.enable = true; @@ -41,6 +49,7 @@ launchers = { fuzzel.enable = true; }; + media = { beets.enable = true; mpv.enable = true; @@ -55,6 +64,7 @@ musicDirectory = "/home/${config.modules.other.system.username}/Nextcloud/media/Music"; }; }; + style = { gtk.enable = true; qt.enable = true; @@ -66,17 +76,21 @@ username = "vali"; gitPath = "/home/vali/projects/nichts"; }; - home-manager.enable = true; + + home-manager = { + enable = true; + }; }; programs = { ssh.enable = true; btop.enable = true; newsboat.enable = true; - fish.enable = true; + # fish.enable = true; nh.enable = true; - steam.enable = true; waybar.enable = true; + # steam.enable = true; }; + services = { dunst.enable = true; }; diff --git a/hosts/temperance/default.nix b/hosts/temperance/default.nix index 1e3d69e..0312dc8 100644 --- a/hosts/temperance/default.nix +++ b/hosts/temperance/default.nix @@ -3,6 +3,6 @@ _: { ./configuration.nix ./programs.nix ./hardware-configuration.nix - ./profile.nix + ./hardware ]; } diff --git a/hosts/temperance/kernel/default.nix b/hosts/temperance/kernel/default.nix new file mode 100644 index 0000000..5146fec --- /dev/null +++ b/hosts/temperance/kernel/default.nix @@ -0,0 +1,10 @@ +{ + config, + lib, + pkgs, + ... +}: let + xanmod_custom = callPackage ./xanmod.nix; +in { + boot.kernelPackages = xanmod_custom; +} diff --git a/hosts/temperance/profile.nix b/hosts/temperance/profile.nix deleted file mode 100644 index 1778b10..0000000 --- a/hosts/temperance/profile.nix +++ /dev/null @@ -1,9 +0,0 @@ -_: { - imports = [ - ../../../options/boot/grub-boot.nix - ../../../options/desktop/fonts.nix - ../../../options/common/networking.nix - ../../../options/common/gpu/nvidia.nix - ../../../options/desktop/monitors.nix - ]; -} diff --git a/hosts/temperance/programs.nix b/hosts/temperance/programs.nix index 4822700..e0d56bc 100644 --- a/hosts/temperance/programs.nix +++ b/hosts/temperance/programs.nix @@ -1,73 +1,56 @@ -{pkgs, ...}: let -in { +{pkgs, ...}: { environment.systemPackages = with pkgs; [ alsa-utils asciinema - blanket + blueman + bluetuith + bluez + cachix calc calibre cbonsai - coreutils-full - cmake cmus difftastic - dig + element element-desktop evince eza - fastfetch - ffmpeg-full fftw - fzf - gcc - gdb - gnumake - gnutls grc - grimblast - gthumb git + halloy helvum - heroic httpie hyperfine - imagemagickBig + imagemagick img2pdf impala imv inetutils jrnl keepassxc - krita lazygit - libreoffice - librewolf libtool links2 - lutris mapscii - mars-mips moc - musikcube - nautilus ncmpcpp - nettools neofetch - nheko networkmanagerapplet nextcloud-client nicotine-plus nil nitch swww + microfetch nmap - nodejs_20 - obsidian + notesnook onlyoffice-bin pamixer pavucontrol pdfarranger pfetch + pidgin playerctl polkit prismlauncher @@ -76,34 +59,24 @@ in { qbittorrent r2modman ripgrep - rnote - scc - scummvm - sherlock signal-desktop-beta smartmontools - teamspeak_client telegram-desktop - temurin-bin-17 tldr thunderbird tor-browser trash-cli - tree - ttyper - unzip util-linux v4l-utils vlc + weechat wget - wine - winetricks wireguard-tools wl-clipboard xdg-utils xournalpp - yazi zapzap zip + zoxide ]; }