Modularize nixos and home-manager packages

programs/coding.nix

@@ -1,116 +0,0 @@
-{ pkgs
-, lib
-, config
-, ...
-}:
-{
-  programs.dashvim = {
-    enable = true;
-    colorscheme = config.conf.colorscheme;
-  };
-
-  home.packages = with pkgs; [
-    #basics
-    gitui
-    gcc
-    meson
-    ninja
-    tree-sitter
-    unzip
-    pkg-config
-    sqlite
-    plantuml
-    d-spy
-
-    # cpp
-    bear
-    clang-tools
-
-    #sql
-    nodePackages.sql-formatter
-    sqls
-
-    #assembly
-    asm-lsp
-
-    #yaml
-    yamlfmt
-    yamllint
-    yaml-language-server
-
-    #markdown
-    marksman
-    mdformat
-
-    #bash
-    bash-language-server
-    shfmt
-
-    #fsharp
-    fsharp
-    fsautocomplete
-
-    #haskell
-    haskellPackages.cabal-install
-    ghc
-    haskellPackages.haskell-language-server
-
-    #html
-    html-tidy
-
-    #json
-    jq
-    nodePackages.vscode-json-languageserver
-
-    #css
-    tailwindcss
-    tailwindcss-language-server
-    vscode-langservers-extracted
-
-    #editors
-    neovide
-    ##fallback
-    vscodium
-
-    #rust
-    rustup
-
-    #python
-    python3
-    python312Packages.python-lsp-server
-    python312Packages.python-lsp-ruff
-    python312Packages.python-lsp-black
-
-    #ts/js
-    nodejs_20
-    deno
-    typescript
-    nodePackages.typescript-language-server
-    nodePackages.prettier
-
-    #go
-    go
-    gopls
-
-    #typst
-    typst
-    tinymist
-    ltex-ls
-
-    #java
-    gradle
-    maven
-    jdt-language-server
-    temurin-jre-bin
-
-    #.!
-    dotnet-sdk_8
-    omnisharp-roslyn
-    csharpier
-    netcoredbg
-
-    #zig
-    zig
-    zls
-  ];
-}

programs/common.nix

@@ -1,11 +1,5 @@
-{ pkgs
-, inputs
-, lib
-, config
-, ...
-}:
+{ config, ... }:
 let
-  callPackage = lib.callPackageWith (pkgs);
   username = config.conf.username;
 in
 {
@@ -16,68 +10,6 @@ in
   };
 
   fonts.fontconfig.enable = true;
-  home.packages = with pkgs; [
-    vesktop
-    kitty
-    fish
-    ripgrep
-    rm-improved
-    bat
-    fd
-    lsd
-    (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
-    noto-fonts
-    flatpak
-    networkmanager
-    zoxide
-    fastfetch
-    pkgs.gnome-keyring
-    dbus
-    killall
-    adw-gtk3
-    qt5ct
-    qt6ct
-    gnutar
-    fishPlugins.tide
-    nix-index
-    libnotify
-    zenith
-    nh
-    amberol
-    pulseaudio
-    playerctl
-    ncspot
-    poppler_utils
-    brave
-    greetd.regreet
-    sops
-    flake-checker
-    ffmpeg
-    system-config-printer
-    brightnessctl
-    (callPackage
-      ../override/cambalache.nix
-      { })
-  ];
-
-  #my own programs
-  programs.oxicalc.enable = true;
-  programs.oxinoti.enable = true;
-  programs.oxidash.enable = true;
-  programs.oxishut.enable = true;
-  programs.oxipaste.enable = true;
-  programs.hyprdock.enable = true;
-  programs.ReSet.enable = true;
-  programs.ReSet.config.plugins = [
-    inputs.reset-plugins.packages."x86_64-linux".monitor
-    inputs.reset-plugins.packages."x86_64-linux".keyboard
-  ];
-  programs.ReSet.config.plugin_config = {
-    Keyboard = {
-      path = "/home/${username}/.config/reset/keyboard.conf";
-    };
-  };
-
   nixpkgs.config.allowUnfree = true;
 
   home.username = username;
@@ -98,15 +30,6 @@ in
     [Context]
     filesystems=xdg-config/gtk-3.0;xdg-config/gtk-4.0
   '';
-  #
-  # dconf.settings = {
-  # "org/gnome/desktop/interface" = {
-  # gtk-theme = "adw-gtk3";
-  # cursor-theme = "Bibata-Modern-Classic";
-  # cursor-size = 24;
-  # icon-theme = "MoreWaita";
-  # };
-  # };
 
   programs.nix-index =
     {

programs/default.nix

@@ -33,12 +33,8 @@ in
   home-manager.users.${config.conf.username} = {
     imports = [
       ./hyprland/default.nix
-      ./flatpak.nix
       ./common.nix
-      ./coding.nix
       ./xdg.nix
-      ./media.nix
-      ./utils.nix
       ./oxi/default.nix
       ./themes/default.nix
       ./individual_configs/default.nix

programs/flatpak.nix

@@ -1,14 +0,0 @@
-{ lib, ... }: {
-
-  services.flatpak.remotes = lib.mkOptionDefault [{
-    name = "flathub-stable";
-    location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
-  }];
-  services.flatpak.uninstallUnmanaged = true;
-  services.flatpak.packages = [
-    # fallback if necessary, but generally avoided as nix is superior :)
-    "com.github.tchx84.Flatseal"
-    "io.github.Foldex.AdwSteamGtk"
-  ];
-}
-

programs/hyprland/config.nix

@@ -151,7 +151,8 @@
     };
 
     input = {
-      #kb_layout = "dashie";
+      kb_layout = "{config.mods.xkb.layout}";
+      kb_variant = "{config.mods.xkb.variant}";
       repeat_delay = 200;
       force_no_accel = true;
       touchpad = {
@@ -168,11 +169,14 @@
       disable_hyprland_logo = true;
       swallow_regex = "^(.*)(kitty)(.*)$";
       initial_workspace_tracking = 1;
+      no_direct_scanout = false;
     };
 
     cursor = {
       # conversion seems to be borked right now, i want a smooth bibata :(
       enable_hyprcursor = false;
+      no_hardware_cursors = true;
+      no_break_fs_vrr = true;
     };
 
     gestures = {

programs/media.nix

@@ -1,34 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    # base audio
-    pipewire
-    wireplumber
-    # audio control
-    playerctl
-    # images
-    imv
-    # videos
-    mpv
-    # pdf
-    zathura
-    evince
-    libreoffice-fresh
-    onlyoffice-bin
-    pdftk
-    pdfpc
-    polylux2pdfpc
-    # spotify
-    # video editing
-    kdenlive
-    # image creation
-    inkscape
-    gimp
-    krita
-    yt-dlp
-  ];
-  programs.obs-studio.enable = true;
-  programs.obs-studio.plugins = with pkgs; [
-    obs-studio-plugins.obs-vaapi
-  ];
-}

programs/utils.nix

@@ -1,11 +0,0 @@
-{ pkgs
-, ...
-}:
-{
-  home.packages = with pkgs; [
-    keepassxc
-    nheko
-    nextcloud-client
-    xournalpp
-  ];
-}