base.nix

@@ -42,23 +42,16 @@
   environment.systemPackages = with pkgs; [
     bat
     bottom
-    duf
     eza
-    file
     git
     gnugrep
     gnutar
-    htop
-    neofetch
-    nix-output-monitor
-    p7zip
     python3
     ripgrep
     rsync
     screen
     unzip
     wget
-    zip
   ];
 
   services.openssh = {

home/alacritty.nix

@@ -9,12 +9,10 @@
 
       window = {
         padding = {
-          x = 8;
-          y = 2;
+          x = 4;
+          y = 4;
         };
 
-        dynamic_padding = true;
-
         decorations = "none"; # full/none/transparent/buttonless
 
         # Transparency:

home/zsh.nix

@@ -47,7 +47,6 @@
         s = "nix-shell --run zsh";
         sp = "nix-shell --run zsh -p";
         spu = "nix-shell -I nixpkgs=channel:nixos-unstable --run zsh -p";
-        nd = "nix develop --command zsh";
         em = "emacsclient -c";
         emnw = "emacsclient -nw";
         gst = "git status -sb";

hosts/edison/configuration.nix

@@ -6,11 +6,10 @@
       ../../base.nix
       ../../common/metrics-exporters.nix
       ./hardware-configuration.nix
-      ./desktop
+      ./desktop.nix
   ];
 
   virtualisation.docker.enable = true;
-  systemd.coredump.enable = true;
 
   networking = {
     hostName = "edison";
@@ -30,19 +29,14 @@
 
   environment.variables = { EDITOR = "vim"; };
   environment.systemPackages = with pkgs; [
-    discord
-    gimp
-    gparted
-    openvpn
     pavucontrol
-    unstable.element-desktop
+    gparted
     unstable.hydrus
   ];
 
   programs.steam.enable = true;
 
   nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
-    "discord"
     "nvidia-x11"
     "nvidia-settings"
     "steam"

hosts/edison/desktop.nix

@@ -0,0 +1,58 @@
+{ config, pkgs, lib, ... }:
+{
+  services.xserver = {
+    enable = true;
+    desktopManager.xfce.enable = true;
+    videoDrivers = [ "nvidia" ];
+    layout = "us,no";
+    xkbVariant = "intl";
+  };
+
+  services.openssh.settings.X11Forwarding = true;
+
+  environment.systemPackages = with pkgs; [
+    xfce.xfce4-pulseaudio-plugin
+  ];
+
+  services.picom.enable = true;
+  hardware.opengl.enable = true;
+
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    pulse.enable = true;
+    jack.enable = true;
+  };
+
+  fonts = {
+    fontDir.enable = true;
+    packages = with pkgs; [
+      noto-fonts
+      noto-fonts-emoji
+      noto-fonts-cjk-sans
+      font-awesome
+      fira-code
+      hack-font
+      (nerdfonts.override {
+        fonts = [
+          "Hack"
+        ];
+      })
+    ];
+  };
+
+  # Remote:
+  services.xrdp = {
+    enable = true;
+    defaultWindowManager = "xfce4-session";
+    openFirewall = true;
+  };
+
+  security.polkit.enable = true;
+  services.flatpak.enable = true;
+  users.users."felixalb".packages = [ pkgs.flatpak ];
+  xdg.portal = {
+    enable = true;
+    extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+  };
+}

hosts/edison/desktop/default.nix

@@ -1,91 +0,0 @@
-{ config, pkgs, lib, ... }:
-{
-  imports = [
-    ./remote.nix
-    ./gnome.nix
-    ./xfce.nix
-  ];
-
-  services.xserver = {
-    enable = true;
-    displayManager.gdm = {
-      enable = true;
-      wayland = true;
-    };
-    videoDrivers = [ "nvidia" ];
-    xkbOptions = "ctrl:nocaps";
-    layout = "no,us";
-    xkbVariant = "intl";
-  };
-
-  #hardware.nvidia.modesetting.enable = true; # TODO: Fix this. Steam crashes, and textures/fonts unload when suspended.
-  hardware.keyboard.zsa.enable = true;
-  environment.sessionVariables.NIXOS_OZONE_WL = "1";
-
-  environment.systemPackages = with pkgs; [
-    xclip
-  ];
-
-  hardware.opengl.enable = true;
-
-  # Audio
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    pulse.enable = true;
-    jack.enable = true;
-  };
-  hardware.pulseaudio.enable = false;
-
-  # Fonts
-  fonts = {
-    fontDir.enable = true;
-    packages = with pkgs; [
-      noto-fonts
-      noto-fonts-emoji
-      noto-fonts-cjk-sans
-      font-awesome
-      fira-code
-      hack-font
-      (nerdfonts.override {
-        fonts = [
-          "Hack"
-        ];
-      })
-    ];
-  };
-
-  # Dark mode
-  home-manager.users.felixalb = {
-    dconf.settings = {
-      "org/gnome/desktop/interface" = {
-        color-scheme = "prefer-dark";
-      };
-    };
-
-    gtk = {
-      enable = true;
-      theme = {
-        name = "Adwaita-dark";
-        package = pkgs.gnome.gnome-themes-extra;
-      };
-    };
-  };
-
-  qt = {
-    enable = true;
-    platformTheme = "gnome";
-    style = "adwaita-dark";
-  };
-
-  # Misc:
-  xdg.portal = {
-    enable = true;
-    wlr.enable = true;
-  };
-  location.provider = "geoclue2";
-  security.polkit.enable = true;
-  services.flatpak.enable = true;
-  services.redshift.enable = true;
-  users.users."felixalb".packages = [ pkgs.flatpak ];
-}

hosts/edison/desktop/gnome.nix

@@ -1,10 +0,0 @@
-{ config, pkgs, lib, ... }:
-{
-  services.xserver.desktopManager.gnome.enable = true;
-  environment.systemPackages = with pkgs; [
-    gnomeExtensions.appindicator
-    gnome.adwaita-icon-theme
-  ];
-  services.udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
-  programs.dconf.enable = true;
-}

hosts/edison/desktop/remote.nix

@@ -1,12 +0,0 @@
-{ config, pkgs, lib, ... }:
-{
-  # Microsoft-style Remote Desktop:
-  services.xrdp = {
-    enable = true;
-    defaultWindowManager = "xfce4-session"; # Avoid fancy animations, no hyprland/GNOME!
-    openFirewall = true;
-  };
-
-  # X window forwarding with `ssh -Y`
-  services.openssh.settings.X11Forwarding = true;
-}

hosts/edison/desktop/xfce.nix

@@ -1,10 +0,0 @@
-{ config, pkgs, lib, ... }:
-{
-  services.xserver = {
-    desktopManager.xfce.enable = true;
-  };
-
-  environment.systemPackages = with pkgs; [
-    xfce.xfce4-pulseaudio-plugin
-  ];
-}

hosts/edison/email.nix

@@ -1,52 +0,0 @@
-{ config, pkgs, lib, ... }:
-{
-  programs.neomutt = {
-    enable = true;
-    sidebar = {
-      enable = true;
-      width = 30;
-    };
-    sort = "reverse-threads";
-    vimKeys = true;
-    checkStatsInterval = 60;
-  };
-
-  programs.mbsync.enable = true;
-  programs.notmuch = {
-    enable = true;
-    hooks = {
-      preNew = "mbsync --all";
-    };
-  };
-  # programs.msmtp.enable = true;
-
-  accounts.email = {
-    accounts.felix-albrigtsen-it = rec {
-      address = "felix@albrigtsen.it";
-      userName = address;
-      primary = true;
-      realName = "Felix Albrigtsen";
-      signature = {
-        text = ''
-          Med vennlig hilsen
-          ${realName}
-        '';
-        showSignature = "append";
-      };
-
-      imap.host = "imap.migadu.com";
-      smtp.host = "smtp.migadu.com";
-      passwordCommand = "cat ~/.secrets/email/migadu"; # yolo / TODO
-
-      mbsync = {
-        enable = true;
-        create = "maildir"; # Create subfolders locally
-        # expugne = "both";
-      };
-      msmtp.enable = true;
-      notmuch.enable = true;
-      neomutt.enable = true;
-    };
-  };
-}
-

hosts/edison/home.nix

@@ -2,21 +2,10 @@
 {
   home.packages = with pkgs; [
     nix-index
-    unstable.snicat
-
-    python3
-  ] ++ (with python3Packages; [
-      beautifulsoup4
-      numpy
-      pillow
-      pwntools
-      pycryptodome
-      requests
-    ]);
+  ];
 
   imports = [
     ./../../home/base.nix
-    ./email.nix
   ];
 
   programs = {

shells/ctf.nix

@@ -53,6 +53,7 @@ in { pkgs ? import <nixpkgs> {} }:
       gdb
       pwndbg
       ropgadget
+      ropper
       wireshark
       tcpdump
     ];