From 23bd5b054e1c6029c2126ef9a2918d928610189c Mon Sep 17 00:00:00 2001 From: Octelly Date: Mon, 23 Dec 2024 12:39:25 +0100 Subject: [PATCH 01/11] poorly written emulation module should really switch to the snowflake branch already --- hosts/ocean-desktop/configuration.nix | 4 ++++ modules/desktop/gaming/emulation.nix | 28 +++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100755 modules/desktop/gaming/emulation.nix diff --git a/hosts/ocean-desktop/configuration.nix b/hosts/ocean-desktop/configuration.nix index 2f045ec..7a4fd62 100755 --- a/hosts/ocean-desktop/configuration.nix +++ b/hosts/ocean-desktop/configuration.nix @@ -7,6 +7,10 @@ olympus.enable = false; minecraft.enable = true; sunshine.enable = true; + emulation = { + enable = true; + switch = true; + }; }; awesome = { enable = true; diff --git a/modules/desktop/gaming/emulation.nix b/modules/desktop/gaming/emulation.nix new file mode 100755 index 0000000..ae02e0a --- /dev/null +++ b/modules/desktop/gaming/emulation.nix @@ -0,0 +1,28 @@ +{ config, pkgs, lib, inputs, system, ... }: + +with builtins; +with lib; +let cfg = config.modules.desktop.gaming.emulation; +in { + options.modules.desktop.gaming.emulation = { + enable = mkEnableOption "enable the emulation module"; + switch = mkEnableOption "Nintendo Switch"; + }; + + config = mkIf cfg.enable { + + programs.gamemode = { + enable = true; + enableRenice = true; + }; + + environment.systemPackages = with pkgs; [ + # helpful overlays and such + mangohud + vkbasalt + # a configurator for them + goverlay + ] + ++ optional cfg.switch pkgs.ryujinx; + }; +} From 4fe18450c60043ba78c046fb0e1c417c60f2f817 Mon Sep 17 00:00:00 2001 From: Octelly Date: Wed, 25 Dec 2024 03:32:44 +0100 Subject: [PATCH 02/11] more emulation module --- hosts/ocean-desktop/configuration.nix | 9 +++++++-- hosts/ocean-t460/configuration.nix | 4 ++++ modules/desktop/gaming/emulation.nix | 8 +++++++- users/octelly/default.nix | 1 - 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/hosts/ocean-desktop/configuration.nix b/hosts/ocean-desktop/configuration.nix index 7a4fd62..79551ca 100755 --- a/hosts/ocean-desktop/configuration.nix +++ b/hosts/ocean-desktop/configuration.nix @@ -10,6 +10,7 @@ emulation = { enable = true; switch = true; + wii = true; }; }; awesome = { @@ -59,6 +60,10 @@ # #"async" # ?? # ]; #}; - networking.firewall.allowedTCPPorts = [ 3216 ]; # EA App - networking.firewall.allowedUDPPorts = [ 3216 ]; # EA App + networking.firewall.allowedTCPPorts = [ + 3216 # EA App + ]; + networking.firewall.allowedUDPPorts = [ + 3216 # EA App + ]; } diff --git a/hosts/ocean-t460/configuration.nix b/hosts/ocean-t460/configuration.nix index 55b7e78..e88da7f 100755 --- a/hosts/ocean-t460/configuration.nix +++ b/hosts/ocean-t460/configuration.nix @@ -6,6 +6,10 @@ steam.enable = true; olympus.enable = false; minecraft.enable = true; + emulation = { + enable = true; + wii = true; + }; }; awesome = { enable = true; diff --git a/modules/desktop/gaming/emulation.nix b/modules/desktop/gaming/emulation.nix index ae02e0a..ca55b64 100755 --- a/modules/desktop/gaming/emulation.nix +++ b/modules/desktop/gaming/emulation.nix @@ -7,6 +7,10 @@ in { options.modules.desktop.gaming.emulation = { enable = mkEnableOption "enable the emulation module"; switch = mkEnableOption "Nintendo Switch"; + gamecube = mkEnableOption "Nintendo GameCube"; + wii = mkEnableOption "Nintendo Wii"; + + primehack = mkEnableOption "Metroid Prime GCN/Wii mouse keyboard hack"; }; config = mkIf cfg.enable { @@ -23,6 +27,8 @@ in { # a configurator for them goverlay ] - ++ optional cfg.switch pkgs.ryujinx; + ++ optional cfg.switch pkgs.ryujinx + ++ optional (cfg.gamecube || cfg.wii) pkgs.dolphin-emu + ++ optional cfg.primehack pkgs.dolphin-emu-primehack; }; } diff --git a/users/octelly/default.nix b/users/octelly/default.nix index 615b6b7..db7440e 100755 --- a/users/octelly/default.nix +++ b/users/octelly/default.nix @@ -309,7 +309,6 @@ rec { #tmuf tetrio-desktop xonotic-glx - dolphin-emu #emulationstation-de inputs.aagl.packages.${pkgs.system}.sleepy-launcher From a667a28fd3ee5fbf3fa03770746c1d3386dc0d52 Mon Sep 17 00:00:00 2001 From: Octelly Date: Fri, 27 Dec 2024 15:23:40 +0100 Subject: [PATCH 03/11] fixing repeated code with a module for gaming utilities --- hosts/ocean-desktop/configuration.nix | 29 +++++++++++++++++ modules/desktop/gaming/emulation.nix | 16 +++------- modules/desktop/gaming/steam.nix | 35 ++++++++------------ modules/desktop/gaming/utils..nix | 46 +++++++++++++++++++++++++++ 4 files changed, 93 insertions(+), 33 deletions(-) create mode 100644 modules/desktop/gaming/utils..nix diff --git a/hosts/ocean-desktop/configuration.nix b/hosts/ocean-desktop/configuration.nix index 79551ca..9461b88 100755 --- a/hosts/ocean-desktop/configuration.nix +++ b/hosts/ocean-desktop/configuration.nix @@ -12,6 +12,7 @@ switch = true; wii = true; }; + utils.overlays.vkbasalt = true; }; awesome = { enable = true; @@ -36,6 +37,24 @@ ''; }; + programs.alvr = { + enable = true; + openFirewall = true; + }; + + # required for NixOS SteamVR to work + # https://wiki.nixos.org/wiki/VR/en#SteamVR + boot.kernelPatches = [ + { + name = "amdgpu-ignore-ctx-privileges"; + patch = pkgs.fetchpatch { + name = "cap_sys_nice_begone.patch"; + url = "https://github.com/Frogging-Family/community-patches/raw/master/linux61-tkg/cap_sys_nice_begone.mypatch"; + hash = "sha256-Y3a0+x2xvHsfLax/uwycdJf3xLxvVfkfDVqjkxNaYEo="; + }; + } + ]; + #services.davfs2 = { # enable = true; # settings.sections = { @@ -60,6 +79,16 @@ # #"async" # ?? # ]; #}; + + fileSystems."/tmp" = { + device = "none"; + fsType = "tmpfs"; + options = [ + "defaults" + "size=150%" + ]; + }; + networking.firewall.allowedTCPPorts = [ 3216 # EA App ]; diff --git a/modules/desktop/gaming/emulation.nix b/modules/desktop/gaming/emulation.nix index ca55b64..7209c89 100755 --- a/modules/desktop/gaming/emulation.nix +++ b/modules/desktop/gaming/emulation.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.modules.desktop.gaming.emulation; in { options.modules.desktop.gaming.emulation = { - enable = mkEnableOption "enable the emulation module"; + enable = mkEnableOption "the emulation module"; switch = mkEnableOption "Nintendo Switch"; gamecube = mkEnableOption "Nintendo GameCube"; wii = mkEnableOption "Nintendo Wii"; @@ -15,18 +15,10 @@ in { config = mkIf cfg.enable { - programs.gamemode = { - enable = true; - enableRenice = true; - }; + # some emulators support gamemode natively + modules.desktop.gaming.utils.gamemode = mkDefault true; - environment.systemPackages = with pkgs; [ - # helpful overlays and such - mangohud - vkbasalt - # a configurator for them - goverlay - ] + environment.systemPackages = [] ++ optional cfg.switch pkgs.ryujinx ++ optional (cfg.gamecube || cfg.wii) pkgs.dolphin-emu ++ optional cfg.primehack pkgs.dolphin-emu-primehack; diff --git a/modules/desktop/gaming/steam.nix b/modules/desktop/gaming/steam.nix index 40df715..414eca7 100755 --- a/modules/desktop/gaming/steam.nix +++ b/modules/desktop/gaming/steam.nix @@ -12,33 +12,26 @@ in { programs.steam = { enable = true; - remotePlay.openFirewall = true; - localNetworkGameTransfers.openFirewall = true; + remotePlay.openFirewall = mkDefault true; + localNetworkGameTransfers.openFirewall = mkDefault true; - # wayland thing + # makes Steam Input and such behave better under Wayland extest.enable = true; - protontricks.enable = true; - gamescopeSession.enable = true; + protontricks.enable = mkDefault true; + gamescopeSession.enable = mkDefault true; }; - programs.gamemode = { - enable = true; - enableRenice = true; - }; - - environment = { - sessionVariables.STEAM_EXTRA_COMPAT_TOOLS_PATHS = "\${HOME}/.steam/root/compatibilitytools.d"; + modules.desktop.gaming.utils = { + protonup = mkDefault true; - systemPackages = with pkgs; [ - protonup-qt - - # helpful overlays and such - mangohud - vkbasalt - # a configurator for them - goverlay - ]; + # both gamemode and mangohud will have to be enabled manually per game + gamemode = mkDefault true; + overlays.mangohud = mkDefault true; }; + + environment + .sessionVariables + .STEAM_EXTRA_COMPAT_TOOLS_PATHS = "\${HOME}/.steam/root/compatibilitytools.d"; }; } diff --git a/modules/desktop/gaming/utils..nix b/modules/desktop/gaming/utils..nix new file mode 100644 index 0000000..a4f5f96 --- /dev/null +++ b/modules/desktop/gaming/utils..nix @@ -0,0 +1,46 @@ + +{ config, pkgs, lib, inputs, system, ... }: + +with builtins; +with lib; +let + cfg = config.modules.desktop.gaming.utils; + # mkEnableOption, but you can set the default + mkEnableDefault = name: default: mkOption { + inherit default; + example = true; + description = "Whether to enable ${name}."; + type = types.bool; + }; + # or operation for a list - if a single value is true, return true + anyTrue = list: lists.any (x: x) list; + isSteamEnabled = config.modules.desktop.gaming.steam.enable; +in { + options.modules.desktop.gaming.utils = { + overlayConfigGUI = mkEnableDefault + "goverlay - a configurator for game overlays" + (anyTrue (attrsets.attrValues cfg.overlays)); + + overlays = { + mangohud = mkEnableOption "MangoHUD - FPS counter"; + vkbasalt = mkEnableOption "vkbasalt - shaders"; + }; + + protonup = mkEnableOption "protonup-qt - GUI manager for compatibility tools"; + + gamemode = mkEnableOption "gamemode for extra performance during games"; + }; + + config = { + programs.gamemode = mkIf cfg.gamemode { + enable = true; + enableRenice = mkDefault true; + }; + + environment.systemPackages = [] + ++ optional cfg.overlayConfigGUI pkgs.goverlay + ++ optional cfg.overlays.mangohud pkgs.mangohud + ++ optional cfg.overlays.vkbasalt pkgs.vkbasalt + ++ optional cfg.protonup pkgs.protonup-qt; + }; +} \ No newline at end of file From 758307c96e55c3505a484e8f2a32d49e5813931f Mon Sep 17 00:00:00 2001 From: Octelly Date: Sun, 19 Jan 2025 19:42:08 +0100 Subject: [PATCH 04/11] ocean-desktop HW - rocm - docker - minecraft port - flatpak - btrfs autoscrub - noatime for Nix store --- hosts/ocean-desktop/configuration.nix | 46 +++++++++---------- .../ocean-desktop/hardware-configuration.nix | 21 ++++++--- 2 files changed, 35 insertions(+), 32 deletions(-) diff --git a/hosts/ocean-desktop/configuration.nix b/hosts/ocean-desktop/configuration.nix index 9461b88..3ac9780 100755 --- a/hosts/ocean-desktop/configuration.nix +++ b/hosts/ocean-desktop/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: { +{ pkgs, ... }: { modules = { desktop = { @@ -28,6 +28,13 @@ hardware.bluetooth.enable = true; }; + hardware.opengl = { + enable = true; + extraPackages = with pkgs; [ + rocmPackages.clr.icd + ]; + }; + virtualisation.vmware.host = { enable = true; extraConfig = '' @@ -37,6 +44,11 @@ ''; }; + # for dev stuff + virtualisation.docker.enable = true; + + # broken upstream + # https://github.com/NixOS/nixpkgs/issues/359680 programs.alvr = { enable = true; openFirewall = true; @@ -55,30 +67,7 @@ } ]; - #services.davfs2 = { - # enable = true; - # settings.sections = { - # "/home/octelly/nextcloud" = { - # use_locks = false; - # gui_optimize = true; - # cache_size = 1024 * 8; - # table_size = 32768; - # }; - # }; - #}; - - #fileSystems."/home/octelly/nextcloud" = { - # device = "https://cloud.owo.digital/remote.php/dav/files/octelly/"; - # fsType = "davfs"; - # options = [ - # #"x-systemd.automount" # mount on access - # "noauto" # do not mount on boot - # "user" # let's ordinary user to unmount - # "uid=octelly" - # "rw" # read write - # #"async" # ?? - # ]; - #}; + services.flatpak.enable = true; fileSystems."/tmp" = { device = "none"; @@ -89,10 +78,17 @@ ]; }; + services.btrfs.autoScrub = { + enable = true; + interval = "weekly"; + }; + networking.firewall.allowedTCPPorts = [ + 25565 # minecra 3216 # EA App ]; networking.firewall.allowedUDPPorts = [ + 25565 # minecra 3216 # EA App ]; } diff --git a/hosts/ocean-desktop/hardware-configuration.nix b/hosts/ocean-desktop/hardware-configuration.nix index f32d263..5cb98f4 100755 --- a/hosts/ocean-desktop/hardware-configuration.nix +++ b/hosts/ocean-desktop/hardware-configuration.nix @@ -5,7 +5,8 @@ { imports = - [ (modulesPath + "/installer/scan/not-detected.nix") + [ + (modulesPath + "/installer/scan/not-detected.nix") ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; @@ -14,29 +15,35 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/23f48d9f-cce6-488a-ba7f-5e2e0d13dd5d"; + { + device = "/dev/disk/by-uuid/23f48d9f-cce6-488a-ba7f-5e2e0d13dd5d"; fsType = "btrfs"; }; fileSystems."/boot/efi" = - { device = "/dev/disk/by-uuid/9DB6-25F6"; + { + device = "/dev/disk/by-uuid/9DB6-25F6"; fsType = "vfat"; options = [ "fmask=0022" "dmask=0022" ]; }; fileSystems."/nix" = - { device = "/dev/disk/by-uuid/2c738dc3-b5ad-4c18-8c98-d25e98431a9f"; + { + device = "/dev/disk/by-uuid/2c738dc3-b5ad-4c18-8c98-d25e98431a9f"; fsType = "btrfs"; + options = [ + "noatime" + ]; }; fileSystems."/home" = - { device = "/dev/disk/by-uuid/da172f79-f4f5-425b-a000-0f4486c2932f"; + { + device = "/dev/disk/by-uuid/da172f79-f4f5-425b-a000-0f4486c2932f"; fsType = "btrfs"; }; swapDevices = - [ { device = "/dev/disk/by-uuid/37c98e08-e2a7-4875-a126-899e6e124e4b"; } - ]; + [{ device = "/dev/disk/by-uuid/37c98e08-e2a7-4875-a126-899e6e124e4b"; }]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's From bee2f996f19c911c5d7989bfe3837df348dd0225 Mon Sep 17 00:00:00 2001 From: Octelly Date: Sun, 19 Jan 2025 19:42:38 +0100 Subject: [PATCH 05/11] smaller fixes + Goldwarden --- hosts/shared/configuration.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/hosts/shared/configuration.nix b/hosts/shared/configuration.nix index e1c491e..31ec20b 100755 --- a/hosts/shared/configuration.nix +++ b/hosts/shared/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, inputs, lib, ... }: { +{ config, pkgs, lib, ... }: { nix.settings = { experimental-features = [ "nix-command" "flakes" ]; @@ -16,6 +16,7 @@ ]; trusted-users = [ "nixremote" + "@wheel" ]; }; @@ -53,6 +54,7 @@ ''; extraConfig = builtins.concatStringsSep "\n" [ + # FIXME: this doesn't work actually, lol ## auto boot last choice # save selection as default "GRUB_SAVEDEFAULT=true" @@ -143,7 +145,9 @@ xclip zip wireguard-tools - ]; + ] + # adds PolicyKit rules + ++ lib.optional config.services.desktopManager.plasma6.enable pkgs.kdePackages.kpmcore; # WARN: polkit will error out with shells not listed here shells = with pkgs; [ zsh bash nushell elvish ]; @@ -154,6 +158,13 @@ MOZ_USE_XINPUT2 = "1"; }; + # HOME MANAGER DOCS: + # Note, if you use the NixOS module and have useUserPackages = true, + # make sure to add + pathsToLink = [ "/share/xdg-desktop-portal" "/share/applications" ]; + # to your system configuration so that the portal definitions and DE + # provided configurations get linked. + plasma6.excludePackages = with pkgs.kdePackages; [ elisa kate @@ -175,6 +186,10 @@ enable = true; flake = "/etc/nixos"; }; + + # Bitwarden system integration + ## needs to be here to set up background services and stuff + goldwarden.enable = true; }; security.pam.services.gtklock.text = lib.readFile "${pkgs.gtklock}/etc/pam.d/gtklock"; From 9e4199d208f06ae66f465eed5d5a2c73feb8828c Mon Sep 17 00:00:00 2001 From: Octelly Date: Sun, 19 Jan 2025 19:43:21 +0100 Subject: [PATCH 06/11] octelly: too many smaller tweaks to list --- users/octelly/default.nix | 244 ++++++++++++++++++++++---------------- 1 file changed, 143 insertions(+), 101 deletions(-) diff --git a/users/octelly/default.nix b/users/octelly/default.nix index db7440e..4cb81f6 100755 --- a/users/octelly/default.nix +++ b/users/octelly/default.nix @@ -38,99 +38,108 @@ let cp -r Posy* $out/share/icons/ ''; }); - klassy = with pkgs; (stdenv.mkDerivation rec { - pname = "klassy"; - version = "6.2.breeze6.2.1"; + klassy = pkgs.nur.repos.shadowrz.klassy-qt6; + #klassy = with pkgs; (stdenv.mkDerivation rec { + # pname = "klassy"; + # #version = "6.2.breeze6.2.1"; + + # #src = fetchFromGitHub { + # # owner = "paulmcauley"; + # # repo = "klassy"; + # # rev = version; + # # hash = "sha256-tFqze3xN1XECY74Gj0nScis7DVNOZO4wcfeA7mNZT5M="; + # #}; + # version = "6.3"; + + # src = fetchFromGitHub { + # owner = "ivan-cukic"; + # repo = "wip-klassy"; + # rev = "01b8a6c29008e1667d0d02a0d3069f70009a9185"; + # hash = "sha256-9IZhO8a8URTYPv6/bf7r3incfN1o2jBd2+mLVptNRYo="; + # }; - src = fetchFromGitHub { - owner = "paulmcauley"; - repo = "klassy"; - rev = version; - hash = "sha256-tFqze3xN1XECY74Gj0nScis7DVNOZO4wcfeA7mNZT5M="; - }; + # nativeBuildInputs = with kdePackages; [ + # cmake + # extra-cmake-modules + # wrapQtAppsHook + # ]; - nativeBuildInputs = with kdePackages; [ - cmake - extra-cmake-modules - wrapQtAppsHook - ]; + # buildInputs = with kdePackages; [ + # qtbase + # qtdeclarative + # qttools + + # frameworkintegration + # kcmutils + # kdecoration + # kiconthemes + # kwindowsystem + + # qtsvg + # kcolorscheme + # kconfig + # kcoreaddons + # kdecoration + # kguiaddons + # ki18n + # kirigami + # kwidgetsaddons + # ]; - buildInputs = with kdePackages; [ - qtbase - qtdeclarative - qttools - - frameworkintegration - kcmutils - kdecoration - kiconthemes - kwindowsystem - - qtsvg - kcolorscheme - kconfig - kcoreaddons - kdecoration - kguiaddons - ki18n - kirigami - kwidgetsaddons - ]; + # cmakeFlags = [ + # "-DCMAKE_INSTALL_PREFIX=$out" + # "-DBUILD_TESTING=OFF" + # "-DKDE_INSTALL_USE_QT_SYS_PATHS=ON" + # "-DBUILD_QT5=OFF" + # "-DBUILD_QT6=ON" + # ]; - cmakeFlags = [ - "-DCMAKE_INSTALL_PREFIX=$out" - "-DBUILD_TESTING=OFF" - "-DKDE_INSTALL_USE_QT_SYS_PATHS=ON" - "-DBUILD_QT5=OFF" - "-DBUILD_QT6=ON" - ]; + # meta = { + # description = "Highly customizable binary Window Decoration, Application Style and Global Theme plugin for recent versions of the KDE Plasma desktop"; + # homepage = "https://github.com/paulmcauley/klassy"; + # platforms = lib.platforms.linux; + # license = with lib.licenses; [ + # bsd3 + # cc0 + # gpl2Only + # gpl2Plus + # gpl3Only + # gpl3Plus # KDE-Accepted-GPL + # mit + # ]; + # maintainers = with lib.maintainers; [ pluiedev ]; + # mainProgram = "klassy-settings"; + # }; + #}); + schildichat-desktop-appimage = with pkgs; + let + pname = "schildichat-desktop"; + version = "1.11.86-sc.0.test.0"; + src = fetchurl { + url = "https://github.com/SchildiChat/schildichat-desktop/releases/download/v${version}/SchildiChatAlpha-${version}.AppImage"; + hash = "sha256-tRPRvMZ1sP2t1KiHVdNwGxfTr4JVC3fSmaHfkM9gKWg="; + }; - meta = { - description = "Highly customizable binary Window Decoration, Application Style and Global Theme plugin for recent versions of the KDE Plasma desktop"; - homepage = "https://github.com/paulmcauley/klassy"; - platforms = lib.platforms.linux; - license = with lib.licenses; [ - bsd3 - cc0 - gpl2Only - gpl2Plus - gpl3Only - gpl3Plus # KDE-Accepted-GPL - mit - ]; - maintainers = with lib.maintainers; [ pluiedev ]; - mainProgram = "klassy-settings"; - }; - }); - schildichat-desktop-appimage = with pkgs; let - pname = "schildichat-desktop"; - version = "1.11.86-sc.0.test.0"; - src = fetchurl { - url = "https://github.com/SchildiChat/schildichat-desktop/releases/download/v${version}/SchildiChatAlpha-${version}.AppImage"; - hash = "sha256-tRPRvMZ1sP2t1KiHVdNwGxfTr4JVC3fSmaHfkM9gKWg="; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; + in + appimageTools.wrapType2 rec { + inherit pname version src; + nativeBuildInputs = [ makeWrapper ]; + + #FIXME: still uses xwayland for some reason + extraInstallCommands = '' + wrapProgram $out/bin/${pname} \ + --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + + install -Dm444 ${appimageContents}/*.desktop -t $out/share/applications + substituteInPlace $out/share/applications/*.desktop \ + --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}' + + cp -r ${appimageContents}/usr/share/icons $out/share + ''; }; - - appimageContents = appimageTools.extractType2 { inherit pname version src; }; - in - appimageTools.wrapType2 rec { - inherit pname version src; - nativeBuildInputs = [ makeWrapper ]; - - #FIXME: still uses xwayland for some reason - extraInstallCommands = '' - wrapProgram $out/bin/${pname} \ - --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" - - install -Dm444 ${appimageContents}/*.desktop -t $out/share/applications - substituteInPlace $out/share/applications/*.desktop \ - --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}' - - cp -r ${appimageContents}/usr/share/icons $out/share - ''; - }; - videomass = with pkgs.python3Packages; let - in buildPythonPackage rec { + videomass = with pkgs.python3Packages; buildPythonPackage rec { pname = "videomass"; version = "5.0.21"; pyproject = true; @@ -147,14 +156,14 @@ let ]; dependencies = [ - pkgs.ffmpeg + pkgs.ffmpeg-full pypubsub wxpython yt-dlp ]; }; in -rec { +{ home = { packages = with pkgs; [ @@ -165,7 +174,7 @@ rec { maple-mono-NF #ranger - ffmpeg + ffmpeg-full videomass qalculate-qt @@ -322,6 +331,7 @@ rec { kdePackages.kclock kdePackages.ktorrent + kdePackages.partitionmanager # spelling stuff # is also used by Plasma @@ -346,6 +356,8 @@ rec { planify newsflash + eyedropper + junction wezterm ]; @@ -624,17 +636,20 @@ rec { pkief.material-icon-theme # language support - bungcip.better-toml + #bungcip.better-toml + tamasfe.even-better-toml ms-pyright.pyright ms-python.python ms-python.isort jnoortheen.nix-ide #ms-vscode.makefile-tools wayou.vscode-todo-highlight + spgoding.datapack-language-server ]) ++ (with pkgs.vscode-marketplace; [ # language support sumneko.lua vgalaktionov.moonscript + lijin.yuescript tnze.snbt mrmlnc.vscode-json5 # this one broken somehow, bruh: @@ -655,6 +670,10 @@ rec { # "asvetliakov.vscode-neovim" = 1; #}; + "nix.enableLanguageServer" = true; + "nix.serverSettings".nil.formatting.command = [ "${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt" ]; + "nix.serverPath" = "${pkgs.nil}/bin/nil"; + # theming "workbench.preferredDarkColorTheme" = "Sonokai Shusia"; "workbench.colorTheme" = "Sonokai Shusia"; @@ -685,6 +704,9 @@ rec { } ]; + "editor.minimap.enabled" = false; + "workbench.startupEditor" = "none"; + # terminal "terminal.external.linuxExec" = "${pkgs.wezterm}/bin/wezterm"; "terminal.integrated.cursorBlinking" = true; @@ -704,9 +726,11 @@ rec { "editor.formatOnSave" = true; "python.formatting.provider" = "black"; - # brhuhe - "workbench.startupEditor" = "none"; - "vim.userSystemClipboard" = true; + # Vim + "vim.useSystemClipboard" = true; + "vim.enableNeovim" = true; + "vim.neovimPath" = "${pkgs.neovim}/bin/nvim"; + "vim.hlsearch" = true; }; }; @@ -736,7 +760,12 @@ rec { # enableZshIntegration = true; #}; - programs.btop.enable = true; + programs.btop = { + enable = true; + package = pkgs.btop.override { + rocmSupport = true; + }; + }; dconf.settings = let @@ -794,19 +823,32 @@ rec { xdg = { enable = true; mime.enable = true; - mimeApps = { + mimeApps = rec { enable = true; defaultApplications = { "video" = [ "mpv.desktop" ]; "audio" = [ "mpv.desktop" ]; "text" = [ "nvim.desktop" ]; - "default-web-browser" = [ "floorp.desktop" ]; - "text/html" = [ "floorp.desktop" ]; - "x-scheme-handler/http" = [ "floorp.desktop " ]; - "x-scheme-handler/https" = [ "floorp.desktop " ]; - "x-scheme-handler/unknown" = [ "floorp.desktop " ]; + "default-web-browser" = [ "re.sonny.Junction.desktop" ]; + "text/html" = [ "re.sonny.Junction.desktop" ]; + "x-scheme-handler/http" = [ "re.sonny.Junction.desktop " ]; + "x-scheme-handler/https" = [ "re.sonny.Junction.desktop " ]; + "x-scheme-handler/unknown" = [ "re.sonny.Junction.desktop " ]; }; + associations.added = defaultApplications; + }; + + portal = { + enable = true; + xdgOpenUsePortal = true; + + config.plasma.default = [ "kde" "*" ]; + + # NOTE: "extra" is misleading here + # you need to set this if you set xdg.portal.enable to true + extraPortals = [ ] + ++ lib.optional config.programs.plasma.enable pkgs.xdg-desktop-portal-kde; }; userDirs = From 09d364f69930ede3618b31f50854d776d196639e Mon Sep 17 00:00:00 2001 From: Octelly Date: Sun, 19 Jan 2025 19:43:39 +0100 Subject: [PATCH 07/11] flake update --- flake.lock | 152 +++++++++++++++++++++++------------------------------ flake.nix | 1 + 2 files changed, 66 insertions(+), 87 deletions(-) diff --git a/flake.lock b/flake.lock index 75f46e9..32099f6 100755 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1733424266, - "narHash": "sha256-cBxteBDr4K4GdUr6ugitxkhcnNDxqoExyK9TVz1RhRQ=", + "lastModified": 1736877444, + "narHash": "sha256-K25atZ9alRsGb6TW+rRcpJTbtP5tnb3qusd762B2qWw=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "24e2f7bf68d27e25dd5997185a91d576cc1f409a", + "rev": "a1f0ce3bfbe9f0cc81e8b7def5e652a021e95c98", "type": "github" }, "original": { @@ -30,11 +30,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1731092955, - "narHash": "sha256-L1hLXf4IDZ0KoXbFiSNNZJ7IrReEr/J+CLt6Rl4Ea3M=", + "lastModified": 1735301051, + "narHash": "sha256-jU88Q9tP4vuvWYGQcmOdFwI9e2uMPVYJHbXdiklIH9o=", "owner": "Kirottu", "repo": "anyrun", - "rev": "d2017f224b2bfd7e33573c7070e7c3e2960c7dcc", + "rev": "06017e753c8886d5296768dca80745ee09402a2d", "type": "github" }, "original": { @@ -49,11 +49,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1733966495, - "narHash": "sha256-XVAFR00ChfywHJG3v47AOVaCOM8Xcst0zxI/6qyBrxo=", + "lastModified": 1737249389, + "narHash": "sha256-VZmUzQi1XEFMOaLoSTZz++eU81Dwoh6jZNzrfKqrC5U=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "07a183880b1f5bc1c18bbf3583fab17b94b2a110", + "rev": "9071d5f50ce03d1f872973516d0e5dd13179cb93", "type": "github" }, "original": { @@ -72,11 +72,11 @@ "parts": "parts" }, "locked": { - "lastModified": 1733972655, - "narHash": "sha256-37hftoU9qbooTrqIgwO0DysYzda+l6AUB08vnPK1kOc=", + "lastModified": 1737255089, + "narHash": "sha256-jnqZuc9OOt3KEXQZC9YEV9NqLgQkBHgkTiFL7SaHHJ0=", "owner": "moni-dz", "repo": "nixpkgs-f2k", - "rev": "2324c1fc48b82a4c34ce5af87477a9dbf1a33a3e", + "rev": "20dc69176b500debc14ea0dba7f366ad1ed370bc", "type": "github" }, "original": { @@ -111,11 +111,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -259,11 +259,11 @@ ] }, "locked": { - "lastModified": 1733951607, - "narHash": "sha256-CN6q6iCzxI1gkNyk4xLdwaMKi10r7n+aJkRzWj8PXwQ=", + "lastModified": 1737221749, + "narHash": "sha256-igllW0yG+UbetvhT11jnt9RppSHXYgMykYhZJeqfHs0=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e5b2d9e8014b5572e3367937a329e7053458d34", + "rev": "97d7946b5e107dd03cc82f21165251d4e0159655", "type": "github" }, "original": { @@ -299,11 +299,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1733586715, - "narHash": "sha256-qRwBwL6bI3ZIDHHaFgpOSYWhcVN102rsSvueHbyfxFs=", + "lastModified": 1737052390, + "narHash": "sha256-px/UOfTgr46ilEELRvx2f042u4UzcAU4JiH8+G+Rc6s=", "owner": "taj-ny", "repo": "kwin-effects-forceblur", - "rev": "6c5705e8f96d5d0cdd1fcbd48007740921fa7313", + "rev": "f7bb683dde404f6df9858e2b6bb6bb7a9039751b", "type": "github" }, "original": { @@ -314,11 +314,11 @@ }, "master": { "locked": { - "lastModified": 1734003853, - "narHash": "sha256-oRwo8xRF4ktH3HPTOpRhPh59CKSsyLuxpORkLHFsV04=", + "lastModified": 1737296775, + "narHash": "sha256-/0zO7NWfk4Gr4qKTf7MIVKE4orD4a4lZbh1NTHlUA24=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f0a890dfa5ed6644a322f4c3105f5a17242df4d6", + "rev": "2e9a29ee1372fa8944cdd15e32062993530e02df", "type": "github" }, "original": { @@ -330,11 +330,11 @@ }, "nixHW": { "locked": { - "lastModified": 1733861262, - "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=", + "lastModified": 1736978406, + "narHash": "sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5", + "rev": "b678606690027913f3434dea3864e712b862dde5", "type": "github" }, "original": { @@ -350,15 +350,14 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2", - "rust-overlay": "rust-overlay" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1733967442, - "narHash": "sha256-uYdtD2nAjT55fXv8EW4TcItKFU1ugoZkFke4WSPxVs4=", + "lastModified": 1737250613, + "narHash": "sha256-0QcnnQZ/il9UPVmhJtDqjPDCCcW5vTCz7QaLu+rlrRQ=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "ad6f64f6512957048bdfd21be5f4ed54c8a53f37", + "rev": "6ec08f11bbf0e936ad82f1bb532f3757f8b5e3c2", "type": "github" }, "original": { @@ -369,11 +368,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733759999, - "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "lastModified": 1737062831, + "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", + "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "type": "github" }, "original": { @@ -408,23 +407,23 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1733096140, - "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", + "lastModified": 1735774519, + "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1733808091, - "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", + "lastModified": 1737165118, + "narHash": "sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", + "rev": "6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566", "type": "github" }, "original": { @@ -436,11 +435,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1733808091, - "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", + "lastModified": 1737165118, + "narHash": "sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", + "rev": "6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566", "type": "github" }, "original": { @@ -484,11 +483,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1733759999, - "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "lastModified": 1737062831, + "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", + "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "type": "github" }, "original": { @@ -521,11 +520,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734004084, - "narHash": "sha256-x2hpTlB4ZulLnEGF9Xx5G/OE5qbev2IQehsYYGVqdOU=", + "lastModified": 1737291670, + "narHash": "sha256-iA+SQO8w012sS6OW0knTpOc/UNh8Ca+/I2JC+NDpdlE=", "owner": "nix-community", "repo": "NUR", - "rev": "1eee3380499e53df3a0b0909fcb92b2839d29142", + "rev": "3d5cfb5c3d2832ec39c6565707bf30f9e8e42560", "type": "github" }, "original": { @@ -539,11 +538,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "type": "github" }, "original": { @@ -562,11 +561,11 @@ ] }, "locked": { - "lastModified": 1733858086, - "narHash": "sha256-h2BDIDKiqgMpA6E+mu0RgMGy3FeM6k+EuJ9xgOQ1+zw=", + "lastModified": 1736549395, + "narHash": "sha256-XzwkB62Tt5UYoL1jXiHzgk/qz2fUpGHExcSIbyGTtI0=", "owner": "pjones", "repo": "plasma-manager", - "rev": "7e2010249529931a3848054d5ff0dbf24675ab68", + "rev": "a53af7f1514ef4cce8620a9d6a50f238cdedec8b", "type": "github" }, "original": { @@ -613,34 +612,13 @@ "type": "github" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "nixos-cosmic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733884434, - "narHash": "sha256-8GXR9kC07dyOIshAyfZhG11xfvBRSZzYghnZ2weOKJU=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "d0483df44ddf0fd1985f564abccbe568e020ddf2", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "stable": { "locked": { - "lastModified": 1733808091, - "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", + "lastModified": 1737165118, + "narHash": "sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", + "rev": "6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566", "type": "github" }, "original": { @@ -733,11 +711,11 @@ }, "unstable": { "locked": { - "lastModified": 1733759999, - "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "lastModified": 1737062831, + "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", + "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "type": "github" }, "original": { @@ -772,11 +750,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1733968579, - "narHash": "sha256-Dy/VbXIX/QrZECXDj2nm2aFzxfX9c81v8WTGNqS8a84=", + "lastModified": 1737251504, + "narHash": "sha256-ge1YQWQ94AqPvqN8yKSYe842et8JnN5gbr/f/w3EFtI=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "bc2bfeeb438600386610c70aa37fb75ba390a569", + "rev": "cc90a15fc1ff395d3caa4186478aff011d2b88de", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 25d2bc7..c784e29 100755 --- a/flake.nix +++ b/flake.nix @@ -89,6 +89,7 @@ "freeimage-unstable-2021-11-01" # for EmulationStation DE (desktop edition) "fluffychat-linux-1.22.1" # isn't really insecure + "fluffychat-linux-1.23.0" "cinny-unwrapped-4.2.3" "cinny-4.2.3" "olm-3.2.16" # this is what marks fluffy and many other matrix things as insecure From 587f6d1e9eabf355091b985d5e9ff73c8b958b45 Mon Sep 17 00:00:00 2001 From: Octelly Date: Sun, 2 Feb 2025 00:47:25 +0100 Subject: [PATCH 08/11] added Zen browser input, removed unused --- flake.nix | 18 ++++++++++-------- hosts/ocean-desktop/default.nix | 2 +- hosts/ocean-t460/default.nix | 2 +- hosts/twinkpad/default.nix | 2 +- modules/users.nix | 2 +- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index c784e29..f8d2af8 100755 --- a/flake.nix +++ b/flake.nix @@ -25,10 +25,10 @@ nur.url = "github:nix-community/NUR"; vscode-ext.url = "github:nix-community/nix-vscode-extensions"; flatpaks.url = "github:GermanBread/declarative-flatpak/stable-v3"; - anyrun = { - url = "github:Kirottu/anyrun"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + #anyrun = { + # url = "github:Kirottu/anyrun"; + # inputs.nixpkgs.follows = "nixpkgs"; + #}; ## Hyprland stuff #hyprland = { @@ -45,10 +45,12 @@ #}; # Flake for testing COSMIC on NixOS - nixos-cosmic = { - url = "github:lilyinstarlight/nixos-cosmic"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + #nixos-cosmic = { + # url = "github:lilyinstarlight/nixos-cosmic"; + # inputs.nixpkgs.follows = "nixpkgs"; + #}; + + zen-browser.url = "github:0xc000022070/zen-browser-flake"; # Hoyoverse games aagl = { diff --git a/hosts/ocean-desktop/default.nix b/hosts/ocean-desktop/default.nix index c14e7aa..414e707 100755 --- a/hosts/ocean-desktop/default.nix +++ b/hosts/ocean-desktop/default.nix @@ -12,7 +12,7 @@ lib.nixosSystem { inputs.home.nixosModules.home-manager inputs.flatpaks.nixosModules.declarative-flatpak - inputs.nixos-cosmic.nixosModules.default + #inputs.nixos-cosmic.nixosModules.default # hardware modules inputs.nixHW.nixosModules.common-cpu-amd diff --git a/hosts/ocean-t460/default.nix b/hosts/ocean-t460/default.nix index 23a8fe4..f9632c1 100755 --- a/hosts/ocean-t460/default.nix +++ b/hosts/ocean-t460/default.nix @@ -13,7 +13,7 @@ lib.nixosSystem { inputs.home.nixosModules.home-manager inputs.nixHW.nixosModules.lenovo-thinkpad-t460 inputs.flatpaks.nixosModules.declarative-flatpak - inputs.nixos-cosmic.nixosModules.default + #inputs.nixos-cosmic.nixosModules.default ../shared/configuration.nix ./configuration.nix diff --git a/hosts/twinkpad/default.nix b/hosts/twinkpad/default.nix index e7b38e4..c4f6569 100755 --- a/hosts/twinkpad/default.nix +++ b/hosts/twinkpad/default.nix @@ -13,7 +13,7 @@ lib.nixosSystem { inputs.home.nixosModules.home-manager inputs.nixHW.nixosModules.lenovo-thinkpad-t460s inputs.flatpaks.nixosModules.declarative-flatpak - inputs.nixos-cosmic.nixosModules.default + #inputs.nixos-cosmic.nixosModules.default ../shared/configuration.nix ./configuration.nix diff --git a/modules/users.nix b/modules/users.nix index 865cbac..847665b 100755 --- a/modules/users.nix +++ b/modules/users.nix @@ -135,7 +135,7 @@ in useUserPackages = true; extraSpecialArgs = { inherit inputs system; }; sharedModules = [ - inputs.anyrun.homeManagerModules.default + #inputs.anyrun.homeManagerModules.default #inputs.hyprland.homeManagerModules.default inputs.plasma-manager.homeManagerModules.plasma-manager ]; From 1d06817178161e7f17b8d8fb299e6013aaf930bb Mon Sep 17 00:00:00 2001 From: Octelly Date: Sun, 2 Feb 2025 00:54:18 +0100 Subject: [PATCH 09/11] ADB permissions group --- modules/users.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/users.nix b/modules/users.nix index 847665b..55f7141 100755 --- a/modules/users.nix +++ b/modules/users.nix @@ -16,7 +16,9 @@ with lib; let isNormalUser = true; extraGroups = [ "networkmanager" "wheel" "input" "video" "audio" ] # WebDAV mounts for regular users - ++ lib.optional config.services.davfs2.enable config.services.davfs2.davGroup; + ++ lib.optional config.services.davfs2.enable config.services.davfs2.davGroup + # ADB + ++ lib.optional config.programs.adb.enable "adbusers"; homeMode = "755"; initialPassword = "gay"; shell = v.shell or null; From b526591968f2db5ae8673090d903388dff64dfe2 Mon Sep 17 00:00:00 2001 From: Octelly Date: Sun, 2 Feb 2025 00:54:44 +0100 Subject: [PATCH 10/11] elly desktop and home changes --- hosts/ocean-desktop/configuration.nix | 17 ++++-- users/octelly/default.nix | 76 +++++++++++++++++++-------- 2 files changed, 67 insertions(+), 26 deletions(-) diff --git a/hosts/ocean-desktop/configuration.nix b/hosts/ocean-desktop/configuration.nix index 3ac9780..eae0eb6 100755 --- a/hosts/ocean-desktop/configuration.nix +++ b/hosts/ocean-desktop/configuration.nix @@ -31,10 +31,13 @@ hardware.opengl = { enable = true; extraPackages = with pkgs; [ - rocmPackages.clr.icd + # p sure this was here only for Davinki + #rocmPackages.clr.icd ]; }; + programs.corectrl.enable = true; + virtualisation.vmware.host = { enable = true; extraConfig = '' @@ -47,12 +50,20 @@ # for dev stuff virtualisation.docker.enable = true; - # broken upstream - # https://github.com/NixOS/nixpkgs/issues/359680 + # VR programs.alvr = { enable = true; openFirewall = true; }; + programs.adb.enable = true; # wired ALVR + environment.systemPackages = with pkgs; [ + wlx-overlay-s + + # VRChat creation + unityhub + alcom + vrc-get + ]; # required for NixOS SteamVR to work # https://wiki.nixos.org/wiki/VR/en#SteamVR diff --git a/users/octelly/default.nix b/users/octelly/default.nix index 4cb81f6..b725a14 100755 --- a/users/octelly/default.nix +++ b/users/octelly/default.nix @@ -220,6 +220,9 @@ in # conclusion: I hate Matrix clients + nur.repos.deeunderscore.nheko-unstable + #nur.repos.deeunderscore.nheko-krunner + localsend appimage-run @@ -259,10 +262,12 @@ in #vmware-workstation bottles + gpt4all gittyup jetbrains.idea-community + ## sway #swaysome #swww @@ -320,6 +325,7 @@ in xonotic-glx #emulationstation-de inputs.aagl.packages.${pkgs.system}.sleepy-launcher + nur.repos.bandithedoge.sgdboop-bin # plasma theme thing klassy @@ -343,6 +349,8 @@ in #krdc + inputs.zen-browser.packages."${system}".default + # flameshot and dependencies #flameshot #grim @@ -625,6 +633,28 @@ in startInBackground = true; }; + programs.zed-editor = { + enable = true; + + userSettings = { + # meta + #telemetry.metrics = false; + auto_update = false; # wouldn't work anyway + + # controls + vim_mode = true; + base_keymap = "VSCode"; + + # editor font + buffer_font_family = "Maple Mono NF"; + buffer_font_size = 14; + + # UI font + ui_font_family = "Noto Sans"; + ui_font_size = 14; + }; + }; + programs.vscode = { enable = true; extensions = (with pkgs.open-vsx; [ @@ -786,29 +816,29 @@ in vimAlias = true; }; - programs.anyrun = { - enable = false; - config = - let - fraction = x: { fraction = x; }; - in - { - x = fraction 0.5; - y = fraction 0.4; - width = fraction 0.35; - ignoreExclusiveZones = true; - plugins = with inputs.anyrun.packages.${system}; [ - # desktop entries - applications - # unicode symbols - symbols - # shell commands - shell - # calculator - rink - ]; - }; - }; + #programs.anyrun = { + # enable = false; + # config = + # let + # fraction = x: { fraction = x; }; + # in + # { + # x = fraction 0.5; + # y = fraction 0.4; + # width = fraction 0.35; + # ignoreExclusiveZones = true; + # plugins = with inputs.anyrun.packages.${system}; [ + # # desktop entries + # applications + # # unicode symbols + # symbols + # # shell commands + # shell + # # calculator + # rink + # ]; + # }; + #}; home.sessionVariables = { EDITOR = "nvim"; From 6a5deb44935e7ff6ad0d4c415b46ebf79840ab07 Mon Sep 17 00:00:00 2001 From: Octelly Date: Sun, 2 Feb 2025 00:54:53 +0100 Subject: [PATCH 11/11] flake update --- flake.lock | 241 ++++++++++++++++++----------------------------------- 1 file changed, 81 insertions(+), 160 deletions(-) diff --git a/flake.lock b/flake.lock index 32099f6..d52f20c 100755 --- a/flake.lock +++ b/flake.lock @@ -21,39 +21,17 @@ "type": "github" } }, - "anyrun": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems" - }, - "locked": { - "lastModified": 1735301051, - "narHash": "sha256-jU88Q9tP4vuvWYGQcmOdFwI9e2uMPVYJHbXdiklIH9o=", - "owner": "Kirottu", - "repo": "anyrun", - "rev": "06017e753c8886d5296768dca80745ee09402a2d", - "type": "github" - }, - "original": { - "owner": "Kirottu", - "repo": "anyrun", - "type": "github" - } - }, "emacs": { "inputs": { "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1737249389, - "narHash": "sha256-VZmUzQi1XEFMOaLoSTZz++eU81Dwoh6jZNzrfKqrC5U=", + "lastModified": 1738289233, + "narHash": "sha256-n2LxA18F5ZMt+FKKegWGCUA2VjmMENJLTFA8MUCgFTU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9071d5f50ce03d1f872973516d0e5dd13179cb93", + "rev": "84447d574a9a21f6e3b04fce7c7279afb15f24c3", "type": "github" }, "original": { @@ -72,11 +50,11 @@ "parts": "parts" }, "locked": { - "lastModified": 1737255089, - "narHash": "sha256-jnqZuc9OOt3KEXQZC9YEV9NqLgQkBHgkTiFL7SaHHJ0=", + "lastModified": 1738291594, + "narHash": "sha256-Ld+SBUt1B6cMuuSnwEMSiWvyNMQkA07bm65rIAfmaiU=", "owner": "moni-dz", "repo": "nixpkgs-f2k", - "rev": "20dc69176b500debc14ea0dba7f366ad1ed370bc", + "rev": "7c373cc4cda5e57e652a8fa1ec5034520af169f0", "type": "github" }, "original": { @@ -125,22 +103,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1717312683, - "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", - "owner": "nix-community", - "repo": "flake-compat", - "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -157,27 +119,6 @@ } }, "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "anyrun", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nur", @@ -215,7 +156,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, @@ -235,7 +176,7 @@ "inputs": { "home-manager": "home-manager", "nixpkgs": "nixpkgs_3", - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1733581530, @@ -259,11 +200,11 @@ ] }, "locked": { - "lastModified": 1737221749, - "narHash": "sha256-igllW0yG+UbetvhT11jnt9RppSHXYgMykYhZJeqfHs0=", + "lastModified": 1738275749, + "narHash": "sha256-PM+cGduJ05EZ+YXulqAwUFjvfKpPmW080mcuN6R1POw=", "owner": "nix-community", "repo": "home-manager", - "rev": "97d7946b5e107dd03cc82f21165251d4e0159655", + "rev": "a8159195bfaef3c64df75d3b1e6a68d49d392be9", "type": "github" }, "original": { @@ -299,11 +240,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1737052390, - "narHash": "sha256-px/UOfTgr46ilEELRvx2f042u4UzcAU4JiH8+G+Rc6s=", + "lastModified": 1738064867, + "narHash": "sha256-vaBgjmBHdkoTDPEy4YnTDvUvrbEXYftTnCtCZmw4EDo=", "owner": "taj-ny", "repo": "kwin-effects-forceblur", - "rev": "f7bb683dde404f6df9858e2b6bb6bb7a9039751b", + "rev": "d7e46df232327f3d506c69f99177f2311ea4cd75", "type": "github" }, "original": { @@ -314,11 +255,11 @@ }, "master": { "locked": { - "lastModified": 1737296775, - "narHash": "sha256-/0zO7NWfk4Gr4qKTf7MIVKE4orD4a4lZbh1NTHlUA24=", + "lastModified": 1738353569, + "narHash": "sha256-AfHKOp1QYKMbvtoZ7UiZciBrWt4Jw3QJggfdxjxti/s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2e9a29ee1372fa8944cdd15e32062993530e02df", + "rev": "05c0a015d1ff04ad012336d13a86fd52c0f30790", "type": "github" }, "original": { @@ -330,11 +271,11 @@ }, "nixHW": { "locked": { - "lastModified": 1736978406, - "narHash": "sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk=", + "lastModified": 1737751639, + "narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "b678606690027913f3434dea3864e712b862dde5", + "rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4", "type": "github" }, "original": { @@ -344,35 +285,13 @@ "type": "github" } }, - "nixos-cosmic": { - "inputs": { - "flake-compat": "flake-compat_2", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" - }, - "locked": { - "lastModified": 1737250613, - "narHash": "sha256-0QcnnQZ/il9UPVmhJtDqjPDCCcW5vTCz7QaLu+rlrRQ=", - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "rev": "6ec08f11bbf0e936ad82f1bb532f3757f8b5e3c2", - "type": "github" - }, - "original": { - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1737062831, - "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", + "lastModified": 1738142207, + "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", + "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", "type": "github" }, "original": { @@ -419,27 +338,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1737165118, - "narHash": "sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1737165118, - "narHash": "sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs=", + "lastModified": 1738163270, + "narHash": "sha256-B/7Y1v4y+msFFBW1JAdFjNvVthvNdJKiN6EGRPnqfno=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566", + "rev": "59e618d90c065f55ae48446f307e8c09565d5ab0", "type": "github" }, "original": { @@ -483,11 +386,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1737062831, - "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", + "lastModified": 1738142207, + "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", + "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", "type": "github" }, "original": { @@ -513,18 +416,34 @@ "type": "github" } }, + "nixpkgs_6": { + "locked": { + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "nixpkgs": "nixpkgs_4", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1737291670, - "narHash": "sha256-iA+SQO8w012sS6OW0knTpOc/UNh8Ca+/I2JC+NDpdlE=", + "lastModified": 1738352726, + "narHash": "sha256-Rq7V5DzOOxbMmqJnJQ0AAgh5lkbL92P7t40KRCR5zdk=", "owner": "nix-community", "repo": "NUR", - "rev": "3d5cfb5c3d2832ec39c6565707bf30f9e8e42560", + "rev": "9fa2a0f9630671e4d717cbc3f284df7ecf3ae8c9", "type": "github" }, "original": { @@ -577,14 +496,12 @@ "root": { "inputs": { "aagl": "aagl", - "anyrun": "anyrun", "f2k": "f2k", "flatpaks": "flatpaks", "home": "home", "kwin-effects-forceblur": "kwin-effects-forceblur", "master": "master", "nixHW": "nixHW", - "nixos-cosmic": "nixos-cosmic", "nixpkgs": [ "unstable" ], @@ -592,7 +509,8 @@ "plasma-manager": "plasma-manager", "stable": "stable", "unstable": "unstable", - "vscode-ext": "vscode-ext" + "vscode-ext": "vscode-ext", + "zen-browser": "zen-browser" } }, "rust-analyzer-src": { @@ -614,11 +532,11 @@ }, "stable": { "locked": { - "lastModified": 1737165118, - "narHash": "sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs=", + "lastModified": 1738163270, + "narHash": "sha256-B/7Y1v4y+msFFBW1JAdFjNvVthvNdJKiN6EGRPnqfno=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566", + "rev": "59e618d90c065f55ae48446f307e8c09565d5ab0", "type": "github" }, "original": { @@ -644,21 +562,6 @@ } }, "systems_2": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -673,7 +576,7 @@ "type": "github" } }, - "systems_4": { + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -711,11 +614,11 @@ }, "unstable": { "locked": { - "lastModified": 1737062831, - "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", + "lastModified": 1738142207, + "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", + "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", "type": "github" }, "original": { @@ -727,7 +630,7 @@ }, "utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1726560853, @@ -745,16 +648,16 @@ }, "vscode-ext": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1737251504, - "narHash": "sha256-ge1YQWQ94AqPvqN8yKSYe842et8JnN5gbr/f/w3EFtI=", + "lastModified": 1738287944, + "narHash": "sha256-q8pOnhaA95ZZf+CJ4ahScSzt5pbnL7lShFuMwTwiw7I=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "cc90a15fc1ff395d3caa4186478aff011d2b88de", + "rev": "529e0a84346f34db86ea24203c0b2e975fefb4f2", "type": "github" }, "original": { @@ -762,6 +665,24 @@ "repo": "nix-vscode-extensions", "type": "github" } + }, + "zen-browser": { + "inputs": { + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1738304685, + "narHash": "sha256-9/33VmuaWVVLjdkiKI/mhzfvyf3FwAQUCMLrjDxgpSg=", + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "rev": "a82cff5bc15ff8aa1aa6d0bf44e1f377b16e564b", + "type": "github" + }, + "original": { + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "type": "github" + } } }, "root": "root",