Merge branch 'master' into tongfang

tongfang/.bash_aliases

@@ -1,3 +1,3 @@
 alias ll='ls -la'
 alias lt='ls --human-readable --size -1 -S --classify'
-alias nrebuild='sudo nixos-rebuild --use-remote-sudo switch'
+alias nrebuild='sudo nixos-rebuild --use-remote-sudo switch'

tongfang/configuration.nix

@@ -0,0 +1,75 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    /etc/nixos/hardware-configuration.nix
+  ];
+
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  networking.hostName = "tongfang";
+  networking.networkmanager.enable = true;
+
+  time.timeZone = "Europe/Amsterdam";
+
+  i18n.defaultLocale = "en_US.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 = "en_US.UTF-8";
+  };
+
+  services.xserver.enable = false;
+  services.displayManager.sddm.enable = true;
+  services.desktopManager.plasma6.enable = true;
+
+  services.xserver.xkb = {
+    layout = "us";
+    variant = "";
+  };
+
+  services.printing.enable = false;
+  hardware.bluetooth.enable = true;
+
+  hardware.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+  };
+
+  services.xserver.libinput.enable = true;
+
+  users.users.bart = {
+    isNormalUser = true;
+    description = "Bart van der Braak";
+    extraGroups = [ "networkmanager" "wheel" ];
+    packages = with pkgs; [
+      kdePackages.kate
+      codium
+      git
+      thunderbird
+      fastfetch
+    ];
+  };
+
+
+  nixpkgs.config.allowUnfree = true;
+  environment.systemPackages = with pkgs; [
+    inputs.zen-browser.packages."${system}".specific
+    nvim
+    wget
+  ];
+
+  system.stateVersion = "24.05"; # Did you read the comment?
+}

tongfang/flake.nix

@@ -0,0 +1,3 @@
+inputs = {
+  zen-browser.url = "github:MarceColl/zen-browser-flake";
+}