From 791bc419b6dac7c70951981ef6b34cdf85828470 Mon Sep 17 00:00:00 2001 From: adikro Date: Sat, 20 Dec 2025 03:14:45 +0100 Subject: absolutely massive rewrite, made (almost) everything modular with changes to come --- hosts/desktop/configuration.nix | 138 +++++++++++----------------------------- hosts/desktop/home.nix | 89 +++++++++++++------------- hosts/laptop/configuration.nix | 0 hosts/laptop/disko.nix | 0 4 files changed, 81 insertions(+), 146 deletions(-) create mode 100644 hosts/laptop/configuration.nix create mode 100644 hosts/laptop/disko.nix (limited to 'hosts') diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index be74098..4dbf3bb 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -1,131 +1,67 @@ -{ inputs, pkgs, ... }: +{ pkgs, ... }: { nixpkgs.config.allowUnfree = true; imports = [ ./hardware-configuration.nix - ../../modules/sys/default.nix - inputs.home-manager.nixosModules.home-manager - inputs.chaotic.nixosModules.default + ../../sys/default.nix ]; - szpont = { - audio.enable = true; - bootloader = "systemd-boot"; - drivers = { - enable = true; - amd.enable = true; - stability = "unstable"; + szpont.sys = { + core = { + audio.enable = true; + bootloader = "systemd-boot"; + drivers = { + enable = true; + amd.enable = true; + stability = "unstable"; + }; + fonts.enable = true; + greet.enable = true; + home-manager = { + enable = true; + users.adam.path = ./home.nix; + }; + locale.enable = true; + network.enable = true; + security.enable = true; }; - fonts.enable = true; - greet.enable = true; - home-manager = { - enable = true; - users.adam.path = ./home.nix; + srv = { + files = { + thunar.enable = true; + utils.enable = true; + }; + gaming = { + enable = true; + steam.enable = true; + vr.enable = true; + }; + kvm.enable = true; + nix-helper.enable = true; + ollama.enable = true; }; - locale.enable = true; - network.enable = true; - security.enable = true; - virtualization.enable = true; - niri.enable = true; - }; - - programs.alvr = { - enable = true; - openFirewall = true; - }; - - programs.thunar = { - enable = true; - plugins = [ - pkgs.xfce.thunar-volman - pkgs.xfce.thunar-vcs-plugin - pkgs.xfce.thunar-archive-plugin - ]; - }; - - nixpkgs.config.packageOverrides = pkgs: { - bottles = pkgs.bottles.override { - removeWarningPopup = true; + wm = { + niri.enable = true; }; }; - programs.xwayland = { - enable = true; - package = pkgs.xwayland-satellite; - }; - programs.kdeconnect.enable = true; - programs.coolercontrol.enable = true; - - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - pinentryPackage = pkgs.pinentry-curses; - }; - - programs.gamescope.enable = true; - -programs.steam = { - enable = true; - localNetworkGameTransfers.openFirewall = true; - dedicatedServer.openFirewall = true; - remotePlay.openFirewall = false; - extest.enable = true; - protontricks.enable = true; - - extraCompatPackages = with pkgs; [ - proton-ge-custom - ]; -}; - - programs.gamemode = { - enable = true; - enableRenice = true; - }; - services.flatpak.enable = true; - services.dbus.enable = true; - - xdg.portal = { - enable = true; - extraPortals = with pkgs; [ - xdg-desktop-portal-gtk - ]; - }; - -environment.sessionVariables = { - NIXOS_OZONE_WL = "1"; - ELECTRON_ENABLE_WAYLAND = "1"; - }; - programs.fish.enable = true; users.users.adam = { isNormalUser = true; - extraGroups = [ "wheel" "input" ]; + extraGroups = [ "wheel" ]; home = "/home/adam"; shell = pkgs.fish; }; environment.systemPackages = with pkgs; [ - pigz - pxz nautilus - swaylock-effects - swayidle - helvum - fuzzel - wineWowPackages.waylandFull - winetricks - linux-firmware - mangohud - cliphist - wl-clipboard rivalcfg ]; -system.stateVersion = "25.05"; + system.stateVersion = "25.05"; } diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index 71580b7..08140dd 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -1,65 +1,64 @@ -{ pkgs, inputs, ... }: +{ pkgs, ... }: { imports = [ - ../../modules/hm/default.nix + ../../hm/default.nix ]; home.username = "adam"; home.homeDirectory = "/home/adam"; home.stateVersion = "25.05"; + szpont.hm = { + conf = { + clipboard = { + enable = true; + backend = "wayland"; + }; + git.enable = true; + ssh.enable = true; + xdg-dirs = { + enable = true; + mediaPath = /media; + }; + }; + editors = { + nixvim.enable = true; + }; + env = { + themes = { + enable = true; + gtk.enable = true; + qt.enable = true; + }; + waybar.enable = true; + }; + shell = { + cli.enable = true; + fish.enable = true; + foot.enable = true; + starship.enable = true; + }; + soft = { + easyeffects.enable = true; + media.enable = true; + nixcord.enable = true; + spicetify.enable = true; + }; + }; + home.packages = with pkgs; [ - librewolf - gavin-bc - qalculate-gtk - onlyoffice-desktopeditors - file - heroic protonvpn-gui evolution - imagemagick kdePackages.kdenlive - syncplay - bottles - ncdu - prismlauncher - inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww - grim - slurp - satty veracrypt brave qbittorrent-enhanced - foot bitwarden-desktop - yt-dlp_git - ffmpeg - mpv - gimp thunderbird - obsidian ]; - services.easyeffects.enable = true; - - services.cliphist = { - enable = true; - systemdTargets = [ "graphical-session.target" ]; - }; - - gtk = { - enable = true; - colorScheme = "dark"; - theme = { - name = "Adwaita-dark"; - package = pkgs.gnome-themes-extra; - }; - }; - - qt = { - enable = true; - style.name = "adwaita-dark"; - style.package = pkgs.adwaita-qt; - platformTheme.name = "kde"; - }; + programs.obsidian.enable = true; + programs.onlyoffice.enable = true; + programs.librewolf.enable = true; + # programs.thunderbird.enable = true; } diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix new file mode 100644 index 0000000..e69de29 diff --git a/hosts/laptop/disko.nix b/hosts/laptop/disko.nix new file mode 100644 index 0000000..e69de29 -- cgit v1.3