From 4ee9bd7aa29cbfc2b39c0d5078b5570c367d88e1 Mon Sep 17 00:00:00 2001 From: 4DBug Date: Sun, 25 May 2025 18:19:18 -0500 Subject: [PATCH] push --- .stfolder/syncthing-folder-a0745f.txt | 2 +- core/boot.nix | 13 +++++----- core/network.nix | 2 ++ gnome.nix | 3 +++ gtk.lua | 5 ++++ packages/flatpak.nix | 11 +++++---- packages/packages.nix | 16 ++++++++++++- packages/plasticity.nix | 6 ++--- packages/system.nix | 24 +++++++++++++++++++ packages/user.nix | 34 +++++++++++++++++++++++++-- 10 files changed, 98 insertions(+), 18 deletions(-) create mode 100644 gtk.lua diff --git a/.stfolder/syncthing-folder-a0745f.txt b/.stfolder/syncthing-folder-a0745f.txt index 85a8184..3e320bf 100644 --- a/.stfolder/syncthing-folder-a0745f.txt +++ b/.stfolder/syncthing-folder-a0745f.txt @@ -2,4 +2,4 @@ # Do not delete. folderID: nix -created: 2025-03-12T07:24:38-05:00 +created: 2025-03-12T07:20:56-05:00 diff --git a/core/boot.nix b/core/boot.nix index 67bba48..bf148b9 100644 --- a/core/boot.nix +++ b/core/boot.nix @@ -2,18 +2,19 @@ { systemd.services = { - NetworkManager-wait-online.enable = false; - systemd-udev-settle.enable = false; + #NetworkManager-wait-online.enable = false; + #systemd-udev-settle.enable = false; }; - services.journald.extraConfig = "Storage=volatile"; + #services.journald.extraConfig = "Storage=volatile"; boot = { - kernelModules = [ "ext4" "ahci" "nvme" ]; - kernelParams = [ "elevator=deadline" "quiet" ]; + kernelParams = [ "fsck.mode=skip" ]; + + initrd.checkJournalingFS = false; loader = { - timeout = 0; + #timeout = 0; grub.splashImage = null; systemd-boot.enable = true; efi.canTouchEfiVariables = true; diff --git a/core/network.nix b/core/network.nix index b9431c6..86c68ff 100644 --- a/core/network.nix +++ b/core/network.nix @@ -1,6 +1,8 @@ { ... }: { + services.openssh.enable = true; + networking = { hostName = "nix"; useNetworkd = true; diff --git a/gnome.nix b/gnome.nix index 6f91657..ba4fbf5 100644 --- a/gnome.nix +++ b/gnome.nix @@ -6,6 +6,7 @@ rounded-window-corners-reborn just-perfection clipboard-history + #pano ]; services = { @@ -16,6 +17,8 @@ }; }; + # desktopManager.cosmic.enable = true; + xserver = { enable = true; diff --git a/gtk.lua b/gtk.lua new file mode 100644 index 0000000..34bd83b --- /dev/null +++ b/gtk.lua @@ -0,0 +1,5 @@ + +local gtk = require("lgi").require("Gtk", "3.0") +local dialog = gtk.MessageDialog { text = 'This is a text message.' } +dialog:show_all() +gtk.main() \ No newline at end of file diff --git a/packages/flatpak.nix b/packages/flatpak.nix index f02c270..4a3c04c 100644 --- a/packages/flatpak.nix +++ b/packages/flatpak.nix @@ -6,13 +6,14 @@ "org.vinegarhq.Sober" "org.vinegarhq.Vinegar" { flatpakref = "https://dl.flathub.org/repo/appstream/org.gimp.GIMP.flatpakref"; sha256 = "1xw8vwpgmyjf5xhh101gqffpwa8x41pysfdl3glx2xv7ydhpc3bj"; } - "dev.qwery.AddWater" - "io.github.Foldex.AdwSteamGtk" - "com.jeffser.Alpaca" + #"dev.qwery.AddWater" + #"io.github.Foldex.AdwSteamGtk" + #"com.jeffser.Alpaca" "com.bambulab.BambuStudio" - "org.gabmus.gfeeds" + #"org.gabmus.gfeeds" "org.gnome.Decibels" "org.pipewire.Helvum" - "io.github.giantpinkrobots.flatsweep" + #"io.github.giantpinkrobots.flatsweep" + "io.missioncenter.MissionCenter" ]; } diff --git a/packages/packages.nix b/packages/packages.nix index be9449a..05e1243 100644 --- a/packages/packages.nix +++ b/packages/packages.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, ... }: +{ lib, pkgs, config, ... }: { imports = [ @@ -32,6 +32,14 @@ uninstallUnmanaged = false; }; + programs.virt-manager.enable = true; + + users.groups.libvirtd.members = ["bug"]; + + virtualisation.libvirtd.enable = true; + + virtualisation.spiceUSBRedirection.enable = true; + programs = { bash.shellAliases = { fetch = "fastfetch --file ~/Pictures/Ansi/nix.ans"; @@ -71,6 +79,12 @@ ssh -R \"$\{name}:80:localhost:$\{port}\" tuns.sh'\'' _"; libraries = with pkgs; [ gtk3 glib + libgbinder + pcre2 + gtk4 + libadwaita + lxc + dnsmasq alsa-lib libGL diff --git a/packages/plasticity.nix b/packages/plasticity.nix index 653a9c5..afe289c 100644 --- a/packages/plasticity.nix +++ b/packages/plasticity.nix @@ -34,13 +34,13 @@ }: stdenv.mkDerivation rec { pname = "plasticity"; - version = "25.2.0"; + version = "25.2.0.beta.13"; src = fetchurl { #url = "https://github.com/nkallen/plasticity/releases/download/v${version}/Plasticity-${version}-1.x86_64.rpm"; #hash = "sha256:166f8hvgdgr5lpkff28ms5qb425b2w7ckskchsabr1nwq49f7y74"; - url = "https://github.com/4DBug/plasticity/releases/download/beta/plasticity-beta-25.2.0.beta.6-1.x86_64.rpm"; - hash = "sha256:0xm68cslchx1ppdiwagh9n520kxbjkxgyij4kmhr7pxfbmi1d9h5"; + url = "https://github.com/4DBug/plasticity/releases/download/${version}/plasticity-beta-${version}-1.x86_64-2.rpm"; + hash = "sha256:0hqy7gw7fq49bvvpch5k5j5ax9y0z1a1wxm3jhg2w2dxlh79jrl5"; }; passthru.updateScript = ./update.sh; diff --git a/packages/system.nix b/packages/system.nix index 3e4e38e..f7eb7c4 100644 --- a/packages/system.nix +++ b/packages/system.nix @@ -24,5 +24,29 @@ # nix language server nixd nil + + gtk3 + gobject-introspection + + libadwaita + + appimage-run + + nimble + clang + gnumake + nim + pkg-config + mimalloc + + gnome-boxes + + glib + libgbinder + pcre2 + gtk4 + libadwaita + lxc + dnsmasq ]; } diff --git a/packages/user.nix b/packages/user.nix index 6fcfe7d..e845f5b 100644 --- a/packages/user.nix +++ b/packages/user.nix @@ -14,12 +14,18 @@ bit32 luautf8 jsregexp - #lgi + lgi + gtk3 + gobject-introspection ])) go (python3.withPackages (ps: with ps; [ + unidecode + discordpy + setuptools + pip pynput python-uinput @@ -69,9 +75,19 @@ # jsonschema # scikit-image + pyautogui + pygobject3 + pycairo + + tkinter + pyautogui + + numpy + scipy + imageio ])) - #nodejs + nodejs # 3D (blender.withPackages (ps: with ps; [ @@ -113,10 +129,24 @@ tree gnome-tweaks wine + wine64 xclicker gh scanmem openrgb samrewritten + testdisk + impression + bambu-studio + sushi + #lutris + resources + discord + authenticator + eyedropper + turtle + #xonotic + apostrophe + buffer ]; }