diff --git a/modules/core/default.nix b/modules/core/default.nix index b5a3820..91d24fb 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -14,11 +14,7 @@ "steam-unwrapped" ]; - nixpkgs.config.permittedInsecurePackages = [ - "jitsi-meet-1.0.8043" - "electron-28.3.3" - "electron-27.3.11" - ]; + nixpkgs.config.permittedInsecurePackages = []; documentation = { enable = true; @@ -37,18 +33,10 @@ settings = { # hardlink duplicate files in the nix store auto-optimise-store = true; + experimental-features = [ "nix-command" "flakes" "pipe-operators" ]; + builders-use-substitutes = true; }; - extraOptions = '' - experimental-features = nix-command flakes - - # keep intermediary deps alive (no redownloading to rebuild after gc) - keep-outputs = true - keep-derivations = true - - builders-use-substitutes = true - ''; - # flake registries are used by the new nix commands. # this binds the nixpkgs registry to the one in `flake.nix`. registry = { @@ -72,7 +60,7 @@ speedFactor = 100; maxJobs = 16; sshUser = "nix-remote-build"; - sshKey = "/root/.ssh/id_build_server"; + sshKey = "/root/.ssh/id_ed25519"; } ]; }; diff --git a/modules/overlay-pkgs/default.nix b/modules/overlay-pkgs/default.nix index 1635670..c05233e 100644 --- a/modules/overlay-pkgs/default.nix +++ b/modules/overlay-pkgs/default.nix @@ -6,6 +6,7 @@ kwrite = final.kdePackages.callPackage ./kwrite.nix {}; mcontrolcenter = final.callPackage ./mcontrolcenter.nix {}; cantata = final.qt6Packages.callPackage ./cantata {}; + tws = final.callPackage ./tws.nix {}; }) ]; } diff --git a/modules/overlay-pkgs/tws.nix b/modules/overlay-pkgs/tws.nix index 29d7f9c..9822526 100644 --- a/modules/overlay-pkgs/tws.nix +++ b/modules/overlay-pkgs/tws.nix @@ -153,8 +153,8 @@ in stdenv.mkDerivation { $out/tws -J-DjtsConfigDir="\$TWS_DIR" EOF - mkdir -p "$out/share/icons/hicolor/128x128" - mv "$out/.install4j/tws.png" "$out/share/icons/hicolor/128x128/tws.png" + mkdir -p "$out/share/icons/hicolor/128x128/apps" + mv "$out/.install4j/tws.png" "$out/share/icons/hicolor/128x128/apps/tws.png" mkdir -p "$out/share/applications" cat < "$out/share/applications/tws.desktop" diff --git a/modules/system.nix b/modules/system.nix index 38c2bbd..7f43aca 100644 --- a/modules/system.nix +++ b/modules/system.nix @@ -41,7 +41,7 @@ dnssec = "false"; }; - services.dnsmasq = { + /*services.dnsmasq = { enable = true; resolveLocalQueries = false; @@ -51,7 +51,7 @@ address = [ "/foo.site/127.1.0.1" ]; server = [ "9.9.9.9" ]; }; - }; + };*/ systemd.network = { networks.wlp4s0 = { @@ -61,7 +61,7 @@ dhcpV6Config.UseDNS = "no"; }; - wait-online.anyInterface = true; + wait-online.enable = false; }; # removable disks in file manager diff --git a/modules/user/dev-support.nix b/modules/user/dev-support.nix index 2c57f34..41ba047 100644 --- a/modules/user/dev-support.nix +++ b/modules/user/dev-support.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { home.packages = with pkgs; [ rust-analyzer - clang-tools_16 + clang-tools jdt-language-server kotlin-language-server typescript-language-server @@ -9,6 +9,7 @@ haskell-language-server glslls zls + eslint bear gdb diff --git a/modules/user/general.nix b/modules/user/general.nix index 24cbf6f..6e2aeaa 100644 --- a/modules/user/general.nix +++ b/modules/user/general.nix @@ -8,6 +8,7 @@ programs.steam = { enable = true; + protontricks.enable = true; extraCompatPackages = [ pkgs.proton-ge-bin ]; @@ -134,6 +135,8 @@ freetube jujutsu + tws + distrobox xdg-utils light