From ac5216413e71bc903228caa6f740938f037763c7 Mon Sep 17 00:00:00 2001 From: worble Date: Sat, 20 Sep 2025 21:12:50 +0100 Subject: [PATCH] back to docker; add npmrc for not executing scripts; update hx script; --- configuration/modules/virtualisation.nix | 24 +++++++++------ devices/tuxedo/configuration.nix | 9 +++++- devices/tuxedo/home.nix | 2 +- home-manager/base.nix | 11 +++++-- home-manager/development/helix.nix | 37 +++++++++++++++--------- 5 files changed, 57 insertions(+), 26 deletions(-) diff --git a/configuration/modules/virtualisation.nix b/configuration/modules/virtualisation.nix index 6fdff50..b8950c7 100644 --- a/configuration/modules/virtualisation.nix +++ b/configuration/modules/virtualisation.nix @@ -13,21 +13,27 @@ ovmf.enable = true; }; }; - podman = { - enable = true; - dockerSocket.enable = true; - dockerCompat = true; - }; - # remember to add the necessary users to the docker group - # docker = { + # podman = { # enable = true; - # storageDriver = "btrfs"; + # dockerSocket.enable = true; + # dockerCompat = true; + # defaultNetwork.settings.dns_enabled = true; # }; + # remember to add the necessary users to the docker group + docker = { + enable = true; + storageDriver = "btrfs"; + }; # waydroid = { # enable = true; # }; }; programs.virt-manager.enable = true; - environment.systemPackages = with pkgs;[ docker-compose podman-compose podman-tui podman-desktop ]; + # environment.systemPackages = with pkgs;[ + # docker-compose + # # podman-compose + # podman-tui + # podman-desktop + # ]; } diff --git a/devices/tuxedo/configuration.nix b/devices/tuxedo/configuration.nix index 33d0e14..45168e0 100644 --- a/devices/tuxedo/configuration.nix +++ b/devices/tuxedo/configuration.nix @@ -66,7 +66,14 @@ users.users.worble = { initialPassword = "password"; isNormalUser = true; - extraGroups = [ "wheel" "gamemode" "docker" "cdrom" "wireshark" ]; # Enable ‘sudo’ for the user. + extraGroups = [ + "wheel" + "gamemode" + "docker" + "podman" + "cdrom" + "wireshark" + ]; # Enable ‘sudo’ for the user. linger = true; }; diff --git a/devices/tuxedo/home.nix b/devices/tuxedo/home.nix index 0838ecb..e30e258 100644 --- a/devices/tuxedo/home.nix +++ b/devices/tuxedo/home.nix @@ -79,7 +79,7 @@ gpu-api = "auto"; gpu-context = "auto"; hwdec = "auto"; - screenshot-directory = "/mnt/HDD2/Pictures/"; + # screenshot-directory = "/mnt/HDD2/Pictures/"; glsl-shaders = "~~/shaders/Anime4K_Clamp_Highlights.glsl:~~/shaders/Anime4K_Restore_CNN_VL.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_VL.glsl:~~/shaders/Anime4K_AutoDownscalePre_x2.glsl:~~/shaders/Anime4K_AutoDownscalePre_x4.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_M.glsl"; }; extraInput = '' diff --git a/home-manager/base.nix b/home-manager/base.nix index 662b95e..b5c7183 100644 --- a/home-manager/base.nix +++ b/home-manager/base.nix @@ -1,4 +1,4 @@ -{ pkgs, inputs, ... }: +{ pkgs, inputs, lib, ... }: { imports = [ @@ -24,9 +24,16 @@ strawberry ]; - # set breeze as default cursor + # set breeze as default cursor + # For cursor in steam? home.file.".icons/default".source = "${pkgs.kdePackages.breeze}/share/icons/breeze_cursors"; + home.file.".npmrc".text = lib.generators.toINIWithGlobalSection { } { + globalSection = { + ignore-scripts = "true"; + }; + }; + home.sessionVariables = { NIXOS_OZONE_WL = "1"; }; diff --git a/home-manager/development/helix.nix b/home-manager/development/helix.nix index eb62fba..e4e7985 100644 --- a/home-manager/development/helix.nix +++ b/home-manager/development/helix.nix @@ -21,30 +21,41 @@ with lib; } (mkIf config.helix.fullInstall { extraPackages = with pkgs;[ - marksman - shfmt - bash-language-server - superhtml + #nix nixd nixpkgs-fmt - biome + + #dotnet omnisharp-roslyn netcoredbg + + # rust + rustfmt + clippy + rust-analyzer + lldb + + #python ruff + + # shell + shfmt + bash-language-server + fish-lsp + + # misc + hyprls + marksman + + # web + superhtml + biome ] ++ (with nodePackages;[ vscode-langservers-extracted typescript-language-server ]); languages = { language = [ - { - name = "nix"; - language-servers = [ "nixd" "nil" ]; - } - { - name = "html"; - language-servers = [ "superhtml" "vscode-html-language-server" ]; - } { name = "bash"; formatter = { command = "shfmt"; };