Desktop layout

desktop/common.nix

@@ -5,9 +5,13 @@
     vim
     firefox
     bat
+    btop
     byobu
     curl
+    dig
+    eza
     git
+    htop
     fd
     flameshot
     fishPlugins.done
@@ -24,6 +28,9 @@
     tmux
     vlc
     wget
+    whois
     zoom-us
   ];
+
+  programs.mtr.enable = true;
 }

desktop/compat.nix

@@ -0,0 +1,29 @@
+{
+  pkgs,
+  ...
+}  @ args: {
+
+  # AppImage support
+  boot.binfmt.registrations.appimage = {
+    wrapInterpreterInShell = false;
+    interpreter = "${pkgs.appimage-run}/bin/appimage-run";
+    recognitionType = "magic";
+    offset = 0;
+    mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff'';
+    magicOrExtension = ''\x7fELF....AI\x02'';
+  };
+
+  # Flatpak
+  services.flatpak.enable = true;
+
+  # Legacy
+  programs.nix-ld.enable = true;
+
+  programs.nix-ld.libraries = with pkgs; [
+    # Add any missing dynamic libraries for unpackaged programs
+    # here, NOT in environment.systemPackages
+  ];
+
+
+
+}

desktop/default.nix

@@ -6,24 +6,38 @@
 
   imports = [
     ./common.nix
+    ./compat.nix
+    ./i18n.nix
   ];
 
+  # Bootloader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  # Enable networking
+  networking.networkmanager.enable = true;
+
+
   hardware.bluetooth.enable = true;
   hardware.bluetooth.powerOnBoot = true;
 
-  # AppImage support
-  boot.binfmt.registrations.appimage = {
-    wrapInterpreterInShell = false;
-    interpreter = "${pkgs.appimage-run}/bin/appimage-run";
-    recognitionType = "magic";
-    offset = 0;
-    mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff'';
-    magicOrExtension = ''\x7fELF....AI\x02'';
-  };
+
+  # Enable the X11 windowing system.
+  services.xserver.enable = true;
+
+  # Enable the KDE Plasma Desktop Environment.
+  services.xserver.displayManager.sddm.enable = true;
+  services.xserver.desktopManager.plasma6.enable = true;
+  services.xserver.desktopManager.gnome.enable = true;
 
   # Set your time zone.
   time.timeZone = "America/Los_Angeles";
 
+  # Shells
+  programs.zsh.enable = true;
+  programs.fish.enable = true;
+  programs.ssh.startAgent = true;
+  programs.ssh.askPassword = pkgs.lib.mkForce "${pkgs.ksshaskpass.out}/bin/ksshaskpass";
 
   # Enable CUPS to print documents.
   services.printing.enable = true;

desktop/dev.nix

@@ -1,6 +1,8 @@
 {pkgs, ...}: {
 
   environment.systemPackages = with pkgs; [
+    awscli2
+    bitwarden-cli
     ddev
     mkcert
     php81

desktop/i18n.nix

@@ -0,0 +1,24 @@
+{pkgs, ...}: {
+
+  # Configure keymap in X11
+  services.xserver.xkb = {
+    layout = "us";
+    variant = "";
+  };
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_US.UTF-8";
+
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "en_US.UTF-8";
+    LC_IDENTIFICATION = "en_US.UTF-8";
+    LC_MEASUREMENT = "en_US.UTF-8";
+    LC_MONETARY = "en_US.UTF-8";
+    LC_NAME = "en_US.UTF-8";
+    LC_NUMERIC = "en_US.UTF-8";
+    LC_PAPER = "en_US.UTF-8";
+    LC_TELEPHONE = "en_US.UTF-8";
+    LC_TIME = "en_US.UTF-8";
+  };
+
+}