move common completely

common/desktop/README.md

@@ -0,0 +1,9 @@
+# Common Desktop Config
+This is where I store the NixOS config that is common between
+my laptop and desktop
+
+## Files
+* `./default.nix`: Contains common systemwide configuration
+  * See also my NixOS [modules](../modules), specifically gnome
+* `./home.nix`: Contains common user-level configuration
+  * See also my Home-Manager [modules](../hm-modules)

common/desktop/default.nix

@@ -0,0 +1,116 @@
+{ pkgs, lib, inputs, ... }: {
+  # Bootloader.
+  boot = {
+    kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
+    loader = {
+      systemd-boot.enable = lib.mkDefault true;
+      efi.canTouchEfiVariables = true;
+      efi.efiSysMountPoint = "/boot/efi";
+    };
+    kernel.sysctl = { "fs.inotify.max_user_watches" = 524288; };
+    initrd = {
+      systemd.enable = true;
+      verbose = false;
+    };
+  };
+
+  programs.nix-ld.enable = true;
+
+  hardware.keyboard.qmk.enable = true;
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    users.vivian = import ./home.nix;
+    extraSpecialArgs = { inherit inputs; };
+  };
+  services = {
+
+    # Enable my config for the gnome desktop environment
+    v.gnome.enable = true;
+
+    # Enable CUPS to print documents.
+    printing.enable = true;
+    pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+      # If you want to use JACK applications, uncomment this
+      #jack.enable = true;
+
+      # use the example session manager (no others are packaged yet so this is enabled by default,
+      # no need to redefine it in your config for now)
+      #media-session.enable = true;
+    };
+  };
+
+  # Set your time zone.
+  time.timeZone = "Europe/Amsterdam";
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_GB.UTF-8";
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "nl_NL.UTF-8";
+    LC_IDENTIFICATION = "nl_NL.UTF-8";
+    LC_MEASUREMENT = "nl_NL.UTF-8";
+    LC_MONETARY = "nl_NL.UTF-8";
+    LC_NAME = "nl_NL.UTF-8";
+    LC_NUMERIC = "nl_NL.UTF-8";
+    LC_PAPER = "nl_NL.UTF-8";
+    LC_TELEPHONE = "nl_NL.UTF-8";
+    LC_TIME = "nl_NL.UTF-8";
+  };
+
+  # Global Packages
+  environment.systemPackages = with pkgs; [ wireguard-tools sbctl podman-compose ];
+
+  # programs.virt-manager = {
+  #   enable = true;
+  # };
+
+  # Enable sound with pipewire.
+  sound.enable = true;
+  hardware.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+
+  virtualisation = {
+    podman.enable = true;
+    libvirtd = {
+      enable = true;
+      qemu.package = pkgs.qemu_kvm;
+    };
+  };
+
+  fonts.packages = with pkgs; [
+    material-design-icons
+    noto-fonts
+    noto-fonts-cjk
+    noto-fonts-emoji
+    dejavu_fonts
+    (nerdfonts.override {
+      fonts =
+        [ "DejaVuSansMono" "Ubuntu" "DroidSansMono" "NerdFontsSymbolsOnly" ];
+    })
+  ];
+  programs = {
+    steam = {
+
+      enable = true;
+      # Open ports in the firewall for Steam Remote Play
+      remotePlay.openFirewall = true;
+      package = pkgs.steam.override {
+        extraPkgs = pkgs: with pkgs; [ gamescope mangohud ];
+      };
+    };
+
+    gamemode.enable = true;
+
+    adb.enable = true;
+  };
+  networking = {
+    # Networking
+    networkmanager.enable = true;
+    firewall.checkReversePath = false;
+    firewall.enable = false;
+  };
+}

common/desktop/home.nix

@@ -0,0 +1,96 @@
+{ pkgs, inputs, config, ... }:
+let
+  tex = pkgs.texlive.combine {
+    inherit (pkgs.texlive) scheme-full;
+    dnd-5e-latex-template = { pkgs = [ pkgs.v.dnd-5e-latex-template ]; };
+  };
+  my-python-packages = ps: with ps; [ pandas requests numpy ];
+in {
+  home.packages = with pkgs; [
+    (python3.withPackages my-python-packages)
+    btop
+    calibre
+    celluloid
+    cinny-desktop
+    element-desktop
+    fusee-launcher
+    fractal-next
+    foliate
+    gcc
+    gimp
+    helix
+    inputs.attic.packages.${pkgs.system}.attic
+    inputs.comma.packages.${pkgs.system}.default
+    inputs.webcord.packages.${pkgs.system}.default
+    jetbrains.clion
+    jetbrains.rust-rover
+    kdenlive
+    libreoffice-fresh
+    mattermost-desktop
+    mullvad-vpn
+    neofetch
+    nixfmt
+    nixpkgs-review
+    plex-media-player
+    plexamp
+    spotify
+    qmk
+    solo2-cli
+    tex
+    unzip
+    yt-dlp
+  ];
+
+  # Enable my own hm modules
+  themes.v.catppuccin.enable = true;
+  programs = {
+    v = {
+      vscode.enable = true;
+      nvim.enable = true;
+      rust.enable = true;
+    };
+
+    riff = {
+      enable = true;
+      direnv = true;
+    };
+
+    firefox.enable = true;
+
+    chromium = {
+      enable = true;
+      package = pkgs.ungoogled-chromium;
+    };
+
+    direnv = {
+      enable = true;
+      nix-direnv.enable = true;
+    };
+
+    zsh = {
+      enable = true;
+      sessionVariables = { DIRENV_LOG_FORMAT = ""; };
+    };
+
+    thunderbird = {
+      enable = true;
+      profiles.default = { isDefault = true; };
+    };
+  };
+
+  # Syncthing
+  services.syncthing.enable = true;
+  xdg.userDirs = let home = config.home.homeDirectory;
+  in {
+    enable = true;
+    createDirectories = true;
+    desktop = "${home}/.desktop";
+    documents = "${home}/cloud/Documents";
+    download = "${home}/dl";
+    music = "${home}/cloud/Music";
+    pictures = "${home}/cloud/Pictures";
+    publicShare = "${home}/.publicShare";
+    templates = "${home}/.templates";
+    videos = "${home}/cloud/Videos";
+  };
+}