From 37764a2c1da08dd534739fe5519536179ecf0e5b Mon Sep 17 00:00:00 2001 From: Adam0 Date: Mon, 1 Jun 2026 05:40:18 +0200 Subject: [PATCH] removal of stuff and fixes --- .gitignore | 1 + flake.nix | 21 +- modules/desktop/noctalia/plugins.nix | 12 +- modules/desktop/tablet.nix | 40 +--- modules/desktop/xdg/applications/default.nix | 32 ++- modules/hosts/vm/default.nix | 11 +- modules/pkgs/lutris.nix | 213 ------------------- modules/profiles/gaming.nix | 1 - modules/profiles/personal.nix | 1 - modules/programs/cli/fastfetch.nix | 8 +- modules/programs/gui/lutris.nix | 24 --- 11 files changed, 65 insertions(+), 299 deletions(-) delete mode 100644 modules/pkgs/lutris.nix delete mode 100644 modules/programs/gui/lutris.nix diff --git a/.gitignore b/.gitignore index 582ee4e..d9ffcf8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ .direnv .rumdl_cache result* +vm.qcow2 # keep-sorted end diff --git a/flake.nix b/flake.nix index 5d37985..10b98cc 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ # DO-NOT-EDIT. This file was auto-generated using github:vic/flake-file. # Use `nix run .#write-flake` to regenerate it. { - outputs = inputs: inputs.flake-parts.lib.mkFlake {inherit inputs;} (inputs.import-tree ./modules); + outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules); inputs = { determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/3"; @@ -22,6 +22,15 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + hylix = { + url = "github:adam01110/hylix"; + inputs = { + flake-parts.follows = "flake-parts"; + import-tree.follows = "import-tree"; + nixpkgs.follows = "nixpkgs"; + treefmt-nix.follows = "treefmt-nix"; + }; + }; hyprland.url = "github:hyprwm/Hyprland?ref=v0.55.2"; hyprland-plugins = { url = "github:hyprwm/hyprland-plugins?ref=v0.55.0"; @@ -51,16 +60,6 @@ url = "github:kaylorben/nixcord"; inputs.flake-parts.follows = "flake-parts"; }; - hylix = { - url = "github:adam01110/hylix"; - inputs = { - flake-file.follows = "flake-file"; - flake-parts.follows = "flake-parts"; - import-tree.follows = "import-tree"; - nixpkgs.follows = "nixpkgs"; - treefmt-nix.follows = "treefmt-nix"; - }; - }; nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"; noctalia = { url = "github:noctalia-dev/noctalia-shell?ref=v4.7.7"; diff --git a/modules/desktop/noctalia/plugins.nix b/modules/desktop/noctalia/plugins.nix index 6286d3c..e8722ec 100644 --- a/modules/desktop/noctalia/plugins.nix +++ b/modules/desktop/noctalia/plugins.nix @@ -90,12 +90,17 @@ keybind-cheatsheet = with colors; { # keep-sorted start - windowWidth = 1600; hyprlandParserMode = "lua"; + windowWidth = 1600; # keep-sorted end # keep-sorted start descriptionTextColor = base00; + keyColorAlt = base08; + keyColorMouse = base0E; + keyColorNumeric = base0D; + keyColorPrint = base0D; + keyColorXF86 = base0D; keyTextAlt = base00; keyTextCtrl = base00; keyTextDefault = base00; @@ -105,11 +110,6 @@ keyTextShift = base00; keyTextSuper = base00; keyTextXF86 = base00; - keyColorMouse = base0E; - keyColorAlt = base08; - keyColorXF86 = base0D; - keyColorPrint = base0D; - keyColorNumeric = base0D; # keep-sorted end }; diff --git a/modules/desktop/tablet.nix b/modules/desktop/tablet.nix index 0f0e035..f523bc2 100644 --- a/modules/desktop/tablet.nix +++ b/modules/desktop/tablet.nix @@ -1,42 +1,4 @@ -{self, ...}: { - flake.modules.homeManager.tablet = { - # keep-sorted start - config, - lib, - # keep-sorted end - ... - }: let - inherit - (lib) - # keep-sorted start - filter - head - mkIf - # keep-sorted end - ; - - monitors = config.programs.hylix.monitors or []; - candidates = - filter ( - monitor: (monitor.position or null) == "0x0" - ) - monitors; - in { - imports = [ - { - key = "homeManager-hyprland"; - imports = [self.modules.homeManager.hyprland]; - } - ]; - - config = mkIf (candidates != []) { - programs.hylix.settings.input.tablet = { - inherit ((head candidates)) output; - transform = 0; - }; - }; - }; - +{ flake.modules.nixos.tablet = { hardware = { # keep-sorted start newline_separated=yes diff --git a/modules/desktop/xdg/applications/default.nix b/modules/desktop/xdg/applications/default.nix index ab22600..1399ae9 100644 --- a/modules/desktop/xdg/applications/default.nix +++ b/modules/desktop/xdg/applications/default.nix @@ -1,5 +1,35 @@ { flake.modules.homeManager.xdgApplications = { - xdg.mimeApps.enable = true; + xdg = { + mimeApps.enable = true; + + desktopEntries = { + qt5ct = { + name = "Qt5 Settings"; + exec = "qt5ct"; + icon = "preferences-desktop-theme"; + noDisplay = true; + categories = [ + "DesktopSettings" + "Qt" + "Settings" + ]; + settings.Keywords = "settings;desktop;qt;qtsettings;qt5;"; + }; + + qt6ct = { + name = "Qt6 Settings"; + exec = "qt6ct"; + icon = "preferences-desktop-theme"; + noDisplay = true; + categories = [ + "DesktopSettings" + "Qt" + "Settings" + ]; + settings.Keywords = "settings;desktop;qt;qtsettings;qt6;"; + }; + }; + }; }; } diff --git a/modules/hosts/vm/default.nix b/modules/hosts/vm/default.nix index 92ca490..15d6cec 100644 --- a/modules/hosts/vm/default.nix +++ b/modules/hosts/vm/default.nix @@ -1,5 +1,7 @@ {self, ...}: { - flake.modules.nixos.vm = { + flake.modules.nixos.vm = {vars, ...}: let + inherit (vars) username; + in { imports = with self.modules.nixos; [ # Profiles # keep-sorted start @@ -10,6 +12,13 @@ networking.hostName = "vm"; + virtualisation.vmVariant.virtualisation.sharedDirectories.sops-nix-key = { + # Provide the host age key at the path sops-nix expects in the guest. + source = "/home/${username}/.config/sops/age"; + target = "/var/lib/sops-nix"; + securityModel = "none"; + }; + # System version for state compatibility - do not modify. system.stateVersion = "26.05"; diff --git a/modules/pkgs/lutris.nix b/modules/pkgs/lutris.nix deleted file mode 100644 index aa9b67c..0000000 --- a/modules/pkgs/lutris.nix +++ /dev/null @@ -1,213 +0,0 @@ -{ - perSystem = {pkgs, ...}: let - inherit (pkgs) buildFHSEnv; - - # Slim lutris provides minimal lutris with essential dependencies. - qt5Deps = pkgs: - with pkgs.qt5; [ - # keep-sorted start - qtbase - qtmultimedia - # keep-sorted end - ]; - qt6Deps = pkgs: - with pkgs.qt6; [ - # keep-sorted start - qtbase - # keep-sorted end - ]; - gnomeDeps = pkgs: - with pkgs; [ - # keep-sorted start - adwaita-icon-theme - gtksourceview - libgnome-keyring - webkitgtk_4_1 - zenity - # keep-sorted end - ]; - xorgDeps = pkgs: - with pkgs; [ - # keep-sorted start - libice - libpthread-stubs - libsm - libx11 - libxaw - libxcb - libxcomposite - libxcursor - libxdmcp - libxext - libxfixes - libxi - libxinerama - libxmu - libxrandr - libxrender - libxscrnsaver - libxt - libxtst - libxv - libxxf86vm - # keep-sorted end - ]; - gstreamerDeps = pkgs: - with pkgs.gst_all_1; [ - # keep-sorted start - gst-libav - gst-plugins-bad - gst-plugins-base - gst-plugins-good - gst-plugins-ugly - gstreamer - # keep-sorted end - ]; - lutris = buildFHSEnv { - pname = "lutris"; - inherit (pkgs.lutris-unwrapped) version; - runScript = "lutris"; - multiArch = true; - - targetPkgs = pkgs: - (with pkgs; [ - # keep-sorted start - fuse - glib-networking - gnugrep - gnused - libnghttp2 - lutris-unwrapped - opencl-headers - p7zip - perl - psmisc - which - xrandr - # keep-sorted end - ]) - ++ qt5Deps pkgs - ++ qt6Deps pkgs - ++ gnomeDeps pkgs - ++ [pkgs.steam]; - - multiPkgs = pkgs: let - originalPkgs = - (with pkgs; [ - # keep-sorted start - SDL - SDL2 - alsa-lib - bash - cabextract - cairo - coreutils - cups - curl - dbus - freetype - fribidi - gcc - giflib - glib - gnutls - graphite2 - gtk2 - gtk3 - harfbuzz - keyutils - lcms2 - libGLU - libaio - libao - libass - libbsd - libcap - libcdio - libevdev - libgcrypt - libglvnd - libgphoto2 - libjack2 - libjpeg - libkrb5 - libmad - libmpeg2 - libogg - libopus - libpcap - libpng - libpulseaudio - libsamplerate - libselinux - libsndfile - libtheora - libtiff - libusb1 - libv4l - libva - libvorbis - libxkbcommon - libxml2 - libxslt - libzip - mpg123 - ncurses - ocl-icd - openldap - p11-kit - pango - readline - samba4 - sane-backends - sqlite - udev - unixodbc - unzip - util-linux - vulkan-loader - wayland - xdg-utils - zip - zlib - zziplib - # keep-sorted end - ]) - ++ xorgDeps pkgs - ++ gstreamerDeps pkgs; - in - originalPkgs; - - extraInstallCommands = '' - mkdir -p $out/share - ln -sf ${pkgs.lutris-unwrapped}/share/applications $out/share - ln -sf ${pkgs.lutris-unwrapped}/share/icons $out/share - ''; - - # Allows for some gui applications to share IPC - # This fixes certain issues where they don't render correctly - unshareIpc = false; - - # Some applications such as Natron need access to MIT-SHM or other - # Shared memory mechanisms. Unsharing the pid namespace - # Breaks the ability for application to reference shared memory. - unsharePid = false; - - meta = { - inherit - (pkgs.lutris-unwrapped.meta) - homepage - description - platforms - license - maintainers - broken - ; - - mainProgram = "lutris"; - }; - }; - in { - packages.lutris = lutris; - }; -} diff --git a/modules/profiles/gaming.nix b/modules/profiles/gaming.nix index 2fe1a1a..b268d0f 100644 --- a/modules/profiles/gaming.nix +++ b/modules/profiles/gaming.nix @@ -13,7 +13,6 @@ imports = with self.modules.homeManager; [ # keep-sorted start heroic - lutris mangohud mcpelauncher optiscaler diff --git a/modules/profiles/personal.nix b/modules/profiles/personal.nix index 3c53d73..cdef5d5 100644 --- a/modules/profiles/personal.nix +++ b/modules/profiles/personal.nix @@ -81,7 +81,6 @@ # keep-sorted start block=yes polkit stylixPersonal - tablet uwsm xdgApplications xdgPortal diff --git a/modules/programs/cli/fastfetch.nix b/modules/programs/cli/fastfetch.nix index 58535b3..37e6127 100644 --- a/modules/programs/cli/fastfetch.nix +++ b/modules/programs/cli/fastfetch.nix @@ -28,8 +28,12 @@ logo = { source = "${self}/assets/nix.png"; type = "kitty"; - height = 15; - width = 35; + + # keep-sorted start + height = 16; + padding.left = 2; + width = 32; + # keep-sorted end }; # Configure display formatting and binary prefix standards. diff --git a/modules/programs/gui/lutris.nix b/modules/programs/gui/lutris.nix deleted file mode 100644 index fc6f263..0000000 --- a/modules/programs/gui/lutris.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - flake.modules.homeManager.lutris = { - # keep-sorted start - osConfig, - pkgs, - # keep-sorted end - ... - }: let - inherit (osConfig.programs) steam; - in { - programs.lutris = { - enable = true; - - package = pkgs.lutris; - - # Add umu launcher for proton outside of steam. - extraPackages = [pkgs.umu-launcher] ++ steam.extraPackages; - - # Proton and the package of steam form the system steam module. - steamPackage = steam.package; - protonPackages = steam.extraCompatPackages; - }; - }; -} -- 2.51.2