From 64e088a0df4014d98e24b815012197dc2b89f538 Mon Sep 17 00:00:00 2001 From: Ghostfox Date: Sun, 24 May 2026 13:09:09 +0200 Subject: [PATCH] update --- flake.lock | 82 ++++++++++++++--------------- modules/base/default.nix | 3 +- modules/base/filesystems.nix | 10 ++++ modules/desktop/default.nix | 3 ++ modules/development/default.nix | 1 + modules/development/home/vscode.nix | 1 + modules/development/java.nix | 50 ++++++++++++++++++ modules/development/packages.nix | 9 +++- 8 files changed, 116 insertions(+), 43 deletions(-) create mode 100644 modules/base/filesystems.nix create mode 100644 modules/development/java.nix diff --git a/flake.lock b/flake.lock index 6592922..75f6ed9 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1777024856, - "narHash": "sha256-OQ+yIcRMXo4UaHyX+W5DCgBvJ5dZo/3kFGWPJiuR6x8=", + "lastModified": 1779125773, + "narHash": "sha256-F34zmAgMQXHwvFb9SpCilX4cAIfF4+KvpzrJqnkNLJE=", "owner": "catppuccin", "repo": "nix", - "rev": "f41cc1cf13647e482b7317396f749840ef715e16", + "rev": "86996e2c4ee6a091fddb10de56dd21a1a5972bcb", "type": "github" }, "original": { @@ -26,11 +26,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1777089773, - "narHash": "sha256-ZIlNuebeWTncyl7mcV9VbceSLAaZki+UeXLPQG959xI=", + "lastModified": 1779336167, + "narHash": "sha256-YbAbHiHmPhBVqgVvWzFOrQTkmYQ7oXOvEBNDRT6ruBA=", "owner": "rycee", "repo": "nur-expressions", - "rev": "402ba229617a12d918c2a887a4c83a9a24f9a36c", + "rev": "e4bc7d7ca24db3a7b1daac4ef0957b8148b444bf", "type": "gitlab" }, "original": { @@ -43,11 +43,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1751685974, - "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=", + "lastModified": 1777699697, + "narHash": "sha256-Eg9b/rq/ECYwNwEXs5i9wHyhxNI0JrYx2srdI2uZMaQ=", "ref": "refs/heads/main", - "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1", - "revCount": 92, + "rev": "382052b74656a369c5408822af3f2501e9b1af81", + "revCount": 94, "type": "git", "url": "https://git.lix.systems/lix-project/flake-compat.git" }, @@ -64,11 +64,11 @@ ] }, "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "lastModified": 1778716662, + "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", "type": "github" }, "original": { @@ -84,11 +84,11 @@ ] }, "locked": { - "lastModified": 1777086106, - "narHash": "sha256-hlNpIN18pw3xo34Lsrp6vAMUPn0aB/zFBqL0QXI1Pmk=", + "lastModified": 1779336838, + "narHash": "sha256-n1+l78hJRABp4cQHKeD0BVByT0vZLPqd09Tvoq8Q+d8=", "owner": "nix-community", "repo": "home-manager", - "rev": "5826802354a74af18540aef0b01bc1320f82cc17", + "rev": "928d72376949e222ea4f07b44828a55b0136422e", "type": "github" }, "original": { @@ -99,11 +99,11 @@ }, "mnw": { "locked": { - "lastModified": 1770419553, - "narHash": "sha256-b1XqsH7AtVf2dXmq2iyRr2NC1yG7skY7Z6N2MpWHlK4=", + "lastModified": 1778541201, + "narHash": "sha256-n0twkzWexzjsoDycOTvvQNuGEdg62UiNHYcFCduYpKI=", "owner": "Gerg-L", "repo": "mnw", - "rev": "2aaffa8030d0b262176146adbb6b0e6374ce2957", + "rev": "1a3573fc9d2486738fe0b2cacc5cd10dd5f3a445", "type": "github" }, "original": { @@ -120,27 +120,27 @@ ] }, "locked": { - "lastModified": 1776882296, - "narHash": "sha256-DWZozXwMsgvUqfVlL1mQ8dOxW7GJ/8CdyaDN+1niZRg=", + "lastModified": 1779233504, + "narHash": "sha256-YIKEyzh0NFQlD0O92LQQNMoVCDwV8yw1Xz0Iu+4ZC5U=", "owner": "feel-co", "repo": "ndg", - "rev": "ab7d78d4884b3a34968cf9fa3d16c0c1246d5c6e", + "rev": "86f6644411a64d5413711895b7cf6e0e1be465b6", "type": "github" }, "original": { "owner": "feel-co", - "ref": "refs/tags/v2.6.0", + "ref": "refs/tags/v2.8.0", "repo": "ndg", "type": "github" } }, "nixos-hardware": { "locked": { - "lastModified": 1776983936, - "narHash": "sha256-ZOQyNqSvJ8UdrrqU1p7vaFcdL53idK+LOM8oRWEWh6o=", + "lastModified": 1779258371, + "narHash": "sha256-j1iZsLy6oFApqR1oiDmHhvkwxXqcNi0aoSJj643LuwU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2096f3f411ce46e88a79ae4eafcfc9df8ed41c61", + "rev": "c97bc4d15bd3473dd095e8e8ba57330ab1943a77", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1776548001, - "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", + "lastModified": 1778443072, + "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", + "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1776877367, - "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=", + "lastModified": 1778869304, + "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57", + "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", "type": "github" }, "original": { @@ -194,11 +194,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1777062815, - "narHash": "sha256-RWwgP/R2nIcyOTPYJdApqvj/dVc4+n/4kOCNlRnfb7U=", + "lastModified": 1779322566, + "narHash": "sha256-4fsU5w4WXGiDMSRkCTKeEbQwc8TbRSeNOZDlfOM4e7o=", "owner": "NotAShelf", "repo": "nvf", - "rev": "41394699260ffc533a688d0ca5b8888bd5e64233", + "rev": "01d49ca23a885fdded35fb44b8eec3b4707b8aef", "type": "github" }, "original": { @@ -250,11 +250,11 @@ ] }, "locked": { - "lastModified": 1776771786, - "narHash": "sha256-DRFGPfFV6hbrfO9a1PH1FkCi7qR5FgjSqsQGGvk1rdI=", + "lastModified": 1777944972, + "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "bef289e2248991f7afeb95965c82fbcd8ff72598", + "rev": "c591bf665727040c6cc5cb409079acb22dcce33c", "type": "github" }, "original": { @@ -288,11 +288,11 @@ ] }, "locked": { - "lastModified": 1777084302, - "narHash": "sha256-qHE5XpgtRedzND5xzaqzbSOw4amse0aA4/BaVI4ONcU=", + "lastModified": 1779377324, + "narHash": "sha256-svU6Ro4xiMxMA1KJGwQ/nfKwz3yXE/SONCw2Z1qTXHA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "f6bab88f8566ddc13fb5e5500bd6c720b61d5321", + "rev": "1ac4a5872e1d76a93329a4d0698d0de35b8bdd67", "type": "github" }, "original": { diff --git a/modules/base/default.nix b/modules/base/default.nix index df9cdc2..d346d28 100644 --- a/modules/base/default.nix +++ b/modules/base/default.nix @@ -5,8 +5,9 @@ inputs.home-manager.nixosModules.home-manager inputs.nvf.nixosModules.default - ./nvf + ./nvf ./branding.nix + ./filesystems.nix ./garbage.nix ./locale.nix ./nix.nix diff --git a/modules/base/filesystems.nix b/modules/base/filesystems.nix new file mode 100644 index 0000000..4e62dca --- /dev/null +++ b/modules/base/filesystems.nix @@ -0,0 +1,10 @@ +{ pkgs, ... }: +{ + boot.supportedFilesystems = [ + "exfat" + ]; + + environment.systemPackages = with pkgs; [ + exfat + ]; +} \ No newline at end of file diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index b6524aa..e9a8dfc 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -30,4 +30,7 @@ fonts.packages = with pkgs; [ montserrat ]; + + programs.appimage.enable = true; + programs.fuse.enable = true; } \ No newline at end of file diff --git a/modules/development/default.nix b/modules/development/default.nix index e7b563d..470173f 100644 --- a/modules/development/default.nix +++ b/modules/development/default.nix @@ -5,6 +5,7 @@ in { imports = [ ./direnv.nix + ./java.nix ./packages.nix ./virt-manager.nix ]; diff --git a/modules/development/home/vscode.nix b/modules/development/home/vscode.nix index 8d9f579..08b26db 100644 --- a/modules/development/home/vscode.nix +++ b/modules/development/home/vscode.nix @@ -31,6 +31,7 @@ in bradlc.vscode-tailwindcss dbaeumer.vscode-eslint mesonbuild.mesonbuild + ms-vscode.cmake-tools ]; userSettings = { "chat.agent.enabled" = false; diff --git a/modules/development/java.nix b/modules/development/java.nix new file mode 100644 index 0000000..f9e42b4 --- /dev/null +++ b/modules/development/java.nix @@ -0,0 +1,50 @@ +{ config, lib, pkgs, ... }: +let + hasGui = config.services.dbus.implementation == "dbus"; + openjfx_jdk = pkgs.openjfx.override { + withWebKit = true; + }; +in +{ + config = lib.mkIf hasGui + { + programs.java = { + enable = true; + package = pkgs.jdk21.override { + enableJavaFX = true; + inherit openjfx_jdk; + }; + }; + + environment.systemPackages = with pkgs; [ + gradle + netbeans + dejavu_fonts + ]; + + programs.nix-ld = { + enable = true; + libraries = (with pkgs; [ + libxrender + libxi + libxcursor + libxtst + + alsa-lib + libjack2 + libpulseaudio + pipewire + + ## glfw + libGL + libx11 + libxcursor + libxext + libxrandr + libxxf86vm + freetype + libxft + ]); + }; + }; +} \ No newline at end of file diff --git a/modules/development/packages.nix b/modules/development/packages.nix index d6f5b9c..3779d1e 100644 --- a/modules/development/packages.nix +++ b/modules/development/packages.nix @@ -11,5 +11,12 @@ in just nodejs gcc - ] ++ (if hasGui then [pkgs.wireshark-qt] else []); + + # Distrobox + distrobox + distrobox-tui + ] ++ (if hasGui then with pkgs; [ + wireshark + kontainer + ] else []); }