19 changed files with 138 additions and 204 deletions
--- a/flake.lock
+++ b/flake.lock
@ -7,11 +7,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1729321331,
-        "narHash": "sha256-KVyQq+ez/oB30/WbdNgVD8g/bda34z8NiU187QKQb74=",
+        "lastModified": 1728598744,
+        "narHash": "sha256-sSfvyO5xH3HObHHmh6lp/hcvo7tMjFKd/HXpxyrRnoE=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "122f70545b29ccb922e655b08acfe05bfb44ec68",
+        "rev": "342a1d682386d3a1d74f9555cb327f2f311dda6e",
        "type": "github"
      },
      "original": {
@ -22,11 +22,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1729256560,
-        "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
+        "lastModified": 1728492678,
+        "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
+        "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
        "type": "github"
      },
      "original": {
@ -38,11 +38,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1729181673,
-        "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=",
+        "lastModified": 1728500571,
+        "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3",
+        "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -21,7 +21,7 @@
        specialArgs = {
          inherit pkgs-stable;
        };
-        modules = [ ./system ];
+        modules = [ system/configuration.nix ];
      };
      homeConfigurations.ahnwuoa = home-manager.lib.homeManagerConfiguration {
        inherit pkgs;
--- a/system/audio.nix
+++ b/system/audio.nix
@ -1,18 +0,0 @@
-{ ... }:
-
-{
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-  };
-  security.rtkit.enable = true;
-  hardware.bluetooth = {
-    enable = true;
-    powerOnBoot = true;
-    settings.General = {
-      Enable = "Source,Sink,Media,Socket";
-    };
-  };
-}
--- a/system/bash.nix
+++ b/system/bash.nix
@ -1,9 +0,0 @@
-{ lib, ... }:
-
-{
-  programs.bash = {
-    completion.enable = true;
-    promptInit = ''PS1="[\u \W] \[\e[32;1m\]\$\[\e[0m\] "'';
-  };
-  environment.etc.bashrc.text = lib.mkAfter ''[ -f ~/.config/bash/bashrc ] && . ~/.config/bash/bashrc'';
-}
--- a/system/boot.nix
+++ b/system/boot.nix
@ -1,12 +0,0 @@
-{ ... }:
-
-{
-  boot.loader = {
-    grub.enable = true;
-    grub.device = "nodev";
-    grub.efiSupport = true;
-    grub.useOSProber = true;
-    efi.canTouchEfiVariables = true;
-  };
-  environment.etc.issue.text = "\nNixOS \\r (\\m) - \\l\n\n";
-}
--- a/system/configuration.nix
+++ b/system/configuration.nix
@ -1,11 +1,22 @@
 { config, pkgs, lib, ... }:

 {
+  imports = [ ./hardware-configuration.nix ];
+
  nix.settings = {
    experimental-features = [ "nix-command" "flakes" ];
    use-xdg-base-directories = true;
  };

+  boot.loader = {
+    grub.enable = true;
+    grub.device = "nodev";
+    grub.efiSupport = true;
+    grub.useOSProber = true;
+    efi.canTouchEfiVariables = true;
+  };
+  environment.etc.issue.text = "\nNixOS \\r (\\m) - \\l\n\n";
+
  environment.pathsToLink = [ "/libexec" ];
  environment.localBinInPath = true;

@ -16,6 +27,59 @@

  time.timeZone = "America/Chicago";

+  i18n.defaultLocale = "en_US.UTF-8";
+  i18n.supportedLocales = [
+    "en_US.UTF-8/UTF-8"
+    "ja_JP.UTF-8/UTF-8"
+  ];
+  i18n.inputMethod = {
+    enable = true;
+    type = "fcitx5";
+    fcitx5.addons = with pkgs; [
+      fcitx5-mozc
+      fcitx5-gtk
+    ];
+  };
+  fonts.packages = with pkgs; [
+    noto-fonts
+    noto-fonts-cjk
+    source-han-sans
+    source-han-serif
+    (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
+  ];
+
+  services.xserver = {
+    enable = true;
+    autorun = false;
+    displayManager.sx.enable = true;
+    windowManager.awesome.enable = true;
+    desktopManager.plasma5.enable = true;
+    autoRepeatDelay = 200;
+    autoRepeatInterval = 30;
+    videoDrivers = [ "amdgpu" ];
+    deviceSection = ''Option "TearFree" "true"'';
+  };
+  services.libinput = {
+    enable = true;
+    mouse.accelProfile = "flat";
+  };
+  services.xserver.wacom.enable = true;
+
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+  };
+  security.rtkit.enable = true;
+  hardware.bluetooth = {
+    enable = true;
+    powerOnBoot = true;
+    settings.General = {
+      Enable = "Source,Sink,Media,Socket";
+    };
+  };
+
  environment.systemPackages = with pkgs; [
    neovim
    wget
@ -29,11 +93,52 @@
    home-manager
  ];
  documentation.dev.enable = true;
+  programs.bash = {
+    completion.enable = true;
+    promptInit = ''PS1="[\u \W] \[\e[32;1m\]\$\[\e[0m\] "'';
+  };
+  environment.etc.bashrc.text = lib.mkAfter ''[ -f ~/.config/bash/bashrc ] && . ~/.config/bash/bashrc'';
+
+  users.users.ahnwuoa = {
+    isNormalUser = true;
+    extraGroups = [ "wheel" "podman" ];
+  };

  xdg.terminal-exec = {
    enable = true;
    settings.default = [ "Alacritty.desktop" ];
  };
+  programs.partition-manager = {
+    enable = true;
+    package = pkgs.libsForQt5.partitionmanager;
+  };
+  services.udisks2.enable = true;
+
+  virtualisation.containers.enable = true;
+  virtualisation = {
+    podman = {
+      enable = true;
+      dockerCompat = true;
+      defaultNetwork.settings.dns_enabled = true;
+    };
+  };
+  virtualisation.libvirtd.enable = true;
+  programs.virt-manager.enable = true;
+  programs.nix-ld.enable = true;
+  hardware.graphics.enable32Bit = true;
+
+  security.doas = {
+    enable = true;
+    extraRules = [
+      { groups = [ "wheel" ]; persist = true; }
+    ];
+  };
+  security.polkit.enable = true;
+
+  systemd.user.services = {
+    plasma-kactivitymanagerd.enable = false;
+    plasma-xdg-desktop-portal-kde.enable = false;
+  };

  system.stateVersion = "24.05";
 }
--- a/system/default.nix
+++ b/system/default.nix
@ -1,17 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ./audio.nix
-    ./bash.nix
-    ./boot.nix
-    ./configuration.nix
-    ./display.nix
-    ./hardware-configuration.nix
-    ./locale.nix
-    ./plasma.nix
-    ./security.nix
-    ./users.nix
-    ./virt.nix
-  ];
-}
--- a/system/display.nix
+++ b/system/display.nix
@ -1,20 +0,0 @@
-{ ... }:
-
-{
-  services.xserver = {
-    enable = true;
-    autorun = false;
-    displayManager.sx.enable = true;
-    windowManager.awesome.enable = true;
-    desktopManager.plasma5.enable = true;
-    autoRepeatDelay = 200;
-    autoRepeatInterval = 30;
-    videoDrivers = [ "amdgpu" ];
-    deviceSection = ''Option "TearFree" "true"'';
-  };
-  services.libinput = {
-    enable = true;
-    mouse.accelProfile = "flat";
-  };
-  services.xserver.wacom.enable = true;
-}
--- a/system/locale.nix
+++ b/system/locale.nix
@ -1,24 +0,0 @@
-{ pkgs, ... }:
-
-{
-  i18n.defaultLocale = "en_US.UTF-8";
-  i18n.supportedLocales = [
-    "en_US.UTF-8/UTF-8"
-    "ja_JP.UTF-8/UTF-8"
-  ];
-  i18n.inputMethod = {
-    enable = true;
-    type = "fcitx5";
-    fcitx5.addons = with pkgs; [
-      fcitx5-mozc
-      fcitx5-gtk
-    ];
-  };
-  fonts.packages = with pkgs; [
-    noto-fonts
-    noto-fonts-cjk
-    source-han-sans
-    source-han-serif
-    (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
-  ];
-}
--- a/system/plasma.nix
+++ b/system/plasma.nix
@ -1,13 +0,0 @@
-{ pkgs, ... }:
-
-{
-  programs.partition-manager = {
-    enable = true;
-    package = pkgs.libsForQt5.partitionmanager;
-  };
-  services.udisks2.enable = true;
-  systemd.user.services = {
-    plasma-kactivitymanagerd.enable = false;
-    plasma-xdg-desktop-portal-kde.enable = false;
-  };
-}
--- a/system/security.nix
+++ b/system/security.nix
@ -1,11 +0,0 @@
-{ ... }:
-
-{
-  security.doas = {
-    enable = true;
-    extraRules = [
-      { groups = [ "wheel" ]; persist = true; }
-    ];
-  };
-  security.polkit.enable = true;
-}
--- a/system/users.nix
+++ b/system/users.nix
@ -1,8 +0,0 @@
-{ ... }:
-
-{
-  users.users.ahnwuoa = {
-    isNormalUser = true;
-    extraGroups = [ "wheel" "podman" ];
-  };
-}
--- a/system/virt.nix
+++ b/system/virt.nix
@ -1,16 +0,0 @@
-{ ... }:
-
-{
-  virtualisation.containers.enable = true;
-  virtualisation = {
-    podman = {
-      enable = true;
-      dockerCompat = true;
-      defaultNetwork.settings.dns_enabled = true;
-    };
-  };
-  virtualisation.libvirtd.enable = true;
-  programs.virt-manager.enable = true;
-  programs.nix-ld.enable = true;
-  hardware.graphics.enable32Bit = true;
-}
--- a/user/config/bash/aliases
+++ b/user/config/bash/aliases
@ -80,7 +80,6 @@ alias clipboard-image='xclip -o -sel clip | nsxiv-pipe'
 alias path='sed "s/:/\n/g" <<< $PATH'
 alias utc='date -u +"%Y-%m-%d %H:%M:%S UTC"'
 alias odd='objdump -d'
-alias pwninit='pwninit --template-path ~/.config/pwninit/template.py --template-bin-name e'
 alias fonts='fc-list | awk -F: "{ print \$2 }" | sort | uniq | fzf'
 alias hz='xrandr --output DisplayPort-1 --mode 1920x1080 --rate'
 alias ns='nix-shell'
--- a/user/config/pwninit/template.py
+++ b/user/config/pwninit/template.py
@ -1,32 +0,0 @@
-#!/usr/bin/env python3
-from pwn import *
-import argparse
-import sys
-
-{bindings}
-context.binary = {bin_name}
-context.terminal = ['tmux', 'splitw', '-h']
-gdbscript = ''
-
-def main(args):
-    p = conn(args)
-    
-    p.interactive()
-
-def conn(args):
-    if args.remote:
-        p = remote(*args.remote)
-    else:
-        p = process({proc_args})
-        if args.gdb:
-            gdb.attach(p, gdbscript=gdbscript)
-    return p
-
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser()
-    g = parser.add_mutually_exclusive_group()
-    g.add_argument('-r', '--remote', nargs=2, metavar=('HOST', 'PORT'))
-    g.add_argument('-g', '--gdb', action='store_true')
-    argv = ['-r' if x == 'nc' else x for x in sys.argv[1:]]
-    args = parser.parse_args(argv)
-    main(args)
--- a/user/config/starship.toml
+++ b/user/config/starship.toml
@ -1,5 +1,6 @@
 format = """
 [ ](bg:#E34F7C)\
+$sudo\
 $username\
 $directory\
 $git_branch\
@ -33,6 +34,15 @@ fish_indicator = "[fsh](green italic)"
 [fill]
 symbol = " "

+#[time]
+#format = "[█]($style)[$time]($style inverted)"
+#style = "#838d99"
+#disabled = false
+
+[sudo]
+format = "[ ](bg:#E34F7C blue)"
+disabled = false
+
 [username]
 show_always = true
 format = "[$user ]($style inverted)[ ]($style bg:#443f59)"
--- a/user/home.nix
+++ b/user/home.nix
@ -1,6 +1,12 @@
 { config, pkgs, pkgs-stable, username, homeDirectory, ... }:

 {
+  imports = [
+    ./xdg.nix
+    ./theme.nix
+    ./bin
+  ];
+
  home.username = username;
  home.homeDirectory = homeDirectory;

@ -26,8 +32,10 @@
    obs-studio
    screenkey
    pkgs-stable.safeeyes
+    libsForQt5.kcalc
    libsForQt5.kolourpaint
    libsForQt5.filelight
+    libsForQt5.kate
    papirus-icon-theme
    pavucontrol
    qpwgraph
@ -50,14 +58,13 @@
    killall
    file

-    (python312.withPackages (python-pkgs: [
+    (python311.withPackages (python-pkgs: [
      python-pkgs.pwntools
+      # python-pkgs.angr
      python-pkgs.requests
      python-pkgs.pyjwt
      python-pkgs.flask
    ]))
-    nodejs
-    deno
    gnumake
    coq
    coqPackages.coqide
@ -74,7 +81,7 @@

    gdb
    pwndbg
-    (pkgs-stable.cutter.withPlugins (ps: with ps; [ jsdec rz-ghidra sigdb ]))
+    (cutter.withPlugins (ps: with ps; [ jsdec rz-ghidra sigdb ]))
    ghidra-bin
    pwninit
    patchelf
--- a/user/share/default.nix
+++ b/user/share/default.nix
@ -7,12 +7,6 @@

  xdg.dataFile."bell.wav".source = ./bell.wav;
  xdg.dataFile."wallpaper.png".source = ./wallpaper.png;
-  xdg.dataFile."recently-used.xbel" = {
-    text = "";
-    force = true;
-  };
-  xdg.dataFile."RecentDocuments" = {
-    text = "";
-    force = true;
-  };
+  xdg.dataFile."recently-used.xbel".text = "";
+  xdg.dataFile."RecentDocuments".text = "";
 }
--- a/user/xdg.nix
+++ b/user/xdg.nix
@ -16,7 +16,6 @@ in {
  xdg.configFile.git.source = config/git;
  xdg.configFile.lsd.source = config/lsd;
  xdg.configFile.picom.source = config/picom;
-  xdg.configFile.pwninit.source = config/pwninit;
  xdg.configFile.python.source = config/python;
  xdg.configFile.qt5ct.source = config/qt5ct;
  xdg.configFile.readline.source = config/readline;