Merge branch 'main' of github.com:bloxx12/nichts

hosts/default.nix

@@ -2,16 +2,29 @@
   inherit (inputs) self;
   inherit (self) lib;
 in {
-  mars = lib.nixosSystem {
+  temperance = lib.nixosSystem {
     system = "x86_64-linux";
     specialArgs = {inherit lib inputs self;};
     modules = [
-      inputs.stylix.nixosModules.stylix
-      ./vali/mars
+      ./vali/temperance
       ../modules
       inputs.home-manager.nixosModules.home-manager
       inputs.agenix.nixosModules.default
+      inputs.stylix.nixosModules.stylix
       inputs.nixvim.nixosModules.nixvim
     ];
   };
+  hermit = lib.nixosSystem {
+    system = "x86_64-linux";
+    specialArgs = {inherit lib inputs self;};
+    modules = [
+      ./vali/hermit
+      ../modules
+      inputs.home-manager.nixosModules.home-manager
+      inputs.agenix.nixosModules.default
+      inputs.stylix.nixosModules.stylix
+      inputs.nixvim.nixosModules.nixvim
+    ];
+  };
+
 }

hosts/vali/hermit/configuration.nix

@@ -0,0 +1,87 @@
+{pkgs, ...}: {
+  # allow unfree packages
+  nixpkgs.config.allowUnfree = true;
+  # Time Zone
+  time.timeZone = "Europe/Zurich";
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_US.UTF-8";
+  console.keyMap = "de";
+  nix = {
+    settings = {
+      substituters = ["https://hyprland.cachix.org"];
+      trusted-public-keys = [
+        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+      ];
+      # enable flakes
+      experimental-features = ["nix-command" "flakes"];
+      # reduce file size used & automatic garbage collector
+      auto-optimise-store = true;
+    };
+  };
+  security.sudo.package = pkgs.sudo.override {withInsults = true;};
+  security.polkit.enable = true;
+  programs.kdeconnect.enable = true;
+  programs.dconf.enable = true;
+  # boot.kernelModules = [ "v4l2loopback" ];
+  boot.kernelPackages = pkgs.linuxPackages_zen;
+  # boot.extraModulePackages = [ pkgs.linuxPackages.v4l2loopback ];
+  #  services.picom.enable = true;
+  services.emacs.enable = true;
+  modules = {
+    other = {
+      system = {
+        hostname = "hermit";
+        username = "vali";
+        gitPath = "/home/vali/repos/nichts";
+      };
+      home-manager = {
+        enable = true;
+        enableDirenv = true;
+      };
+    };
+    wms = {
+      wayland = {
+        enable = true;
+        hyprland.enable = true;
+      };
+    };
+    programs = {
+      vesktop.enable = true;
+      ssh.enable = true;
+      btop.enable = true;
+      mpv.enable = true;
+      kitty.enable = true;
+      newsboat.enable = true;
+      foot.enable = true;
+      fish.enable = true;
+      stylix.enable = true;
+      nh.enable = true;
+      waybar.enable = true;
+      spicetify.enable = true;
+      schizofox.enable = true;
+      anyrun.enable = true;
+    };
+    editors = {
+      emacs = {
+        enable = false;
+        doom.enable = false;
+      };
+      helix.enable = false;
+      kakoune.enable = false;
+      nixvim.enable = true;
+    };
+    services = {
+      pipewire.enable = true;
+      dunst.enable = true;
+    };
+    themes = {
+      gtk = {enable = true;};
+      qt = {
+        enable = true;
+        package = pkgs.kde-gruvbox;
+        name = "Gruvbox-Dark";
+      };
+    };
+  };
+  system.stateVersion = "23.11";
+}

hosts/vali/hermit/hardware-configuration.nix

@@ -0,0 +1,40 @@
+# 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, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "rtsx_pci_sdmmc" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/3d023930-3656-44bb-a737-b0e08a6bbd3e";
+      fsType = "ext4";
+    };
+
+  boot.initrd.luks.devices."luks-10037600-c781-4ebc-9ceb-7e0367b1ed24".device = "/dev/disk/by-uuid/10037600-c781-4ebc-9ceb-7e0367b1ed24";
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/3A39-FAF1";
+      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.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp59s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

hosts/vali/hermit/programs.nix

@@ -0,0 +1,99 @@
+{
+  inputs,
+  pkgs,
+  ...
+}: let
+  fenix = inputs.fenix.packages.${pkgs.system};
+  nixpkgs-wayland = inputs.nixpkgs-wayland.packages.${pkgs.system};
+in {
+  environment.systemPackages = with pkgs; [
+    alejandra
+    alsa-utils
+    asciinema
+    bibata-cursors
+    blanket
+    cmake
+    difftastic
+    dig
+    easyeffects
+    element-desktop
+    evince
+    eza
+    fastfetch
+    feh
+    ffmpeg-full
+    fftw
+    grimblast
+    gcc
+    gdb
+    gnumake
+    grc
+    grimblast
+    git
+    helvum
+    httpie
+    imagemagick
+    img2pdf
+    imv
+    keepassxc
+    lazygit
+    libtool
+    links2
+    mars-mips
+    gnome.nautilus
+    ncmpcpp
+    neofetch
+    neovim
+    networkmanagerapplet
+    nextcloud-client
+    nicotine-plus
+    nil
+    nitch
+    nixfmt
+    nixpkgs-wayland.swww
+    nmap
+    notesnook
+    obsidian
+    onlyoffice-bin
+    pamixer
+    pavucontrol
+    pdfarranger
+    pfetch
+    pidgin
+    playerctl
+    polkit
+    python3
+    qbittorrent
+    ripgrep
+    rustdesk
+    scc
+    scummvm
+    sherlock
+    signal-desktop-beta
+    smartmontools
+    strawberry
+    telegram-desktop
+    texliveFull
+    tldr
+    thunderbird
+    tor-browser-bundle-bin
+    trash-cli
+    tree
+    typst
+    unzip
+    util-linux
+    v4l-utils
+    ventoy-full
+    vlc
+    weechat
+    wget
+    wireguard-tools
+    wl-clipboard
+    xdg-utils
+    xournalpp
+    yt-dlp
+    zapzap
+    zip
+    zoxide
+  ];
+}

hosts/vali/temperance/configuration.nix

@@ -30,7 +30,7 @@
   modules = {
     other = {
       system = {
-        hostname = "mars";
+        hostname = "temperance";
         username = "vali";
         gitPath = "/home/vali/repos/nichts";
       };
@@ -77,7 +77,7 @@
     themes = {
       gtk = {enable = true;};
       qt = {
-        enable = true;
+        enable = false;
         package = pkgs.kde-gruvbox;
         name = "Gruvbox-Dark";
       };

hosts/vali/temperance/default.nix

@@ -0,0 +1,8 @@
+_: {
+  imports = [
+    ./configuration.nix
+    ./programs.nix
+    ./hardware-configuration.nix
+    ./profile.nix
+  ];
+}

hosts/vali/temperance/profile.nix

@@ -0,0 +1,10 @@
+_: {
+  imports = [
+    ../../../options/boot/grub-boot.nix
+    ../../../options/desktop/fonts.nix
+    ../../../options/common/networking.nix
+    ../../../options/common/gpu/nvidia.nix
+    ../../../options/desktop/monitors.nix
+    ../../../overlay.nix
+  ];
+}