diff --git a/flake.lock b/flake.lock index 741f2cd..04aed5e 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1755946532, - "narHash": "sha256-POePremlUY5GyA1zfbtic6XLxDaQcqHN6l+bIxdT5gc=", + "lastModified": 1753216019, + "narHash": "sha256-zik7WISrR1ks2l6T1MZqZHb/OqroHdJnSnAehkE0kCk=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "81584dae2df6ac79f6b6dae0ecb7705e95129ada", + "rev": "be166e11d86ba4186db93e10c54a141058bdce49", "type": "github" }, "original": { @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1759136203, - "narHash": "sha256-2uCGdXBdgftTYLWYAgLuGe6GNDBGYg8ywPhF76sWtD0=", + "lastModified": 1753410343, + "narHash": "sha256-chcs8JU2LWVK0Mb/+SgUTUSM0LVr00wR5eWoAsfw7BU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "fa5660576dbbd2ae3a68f2e4e6ce8d2855cd4e9e", + "rev": "f95d76f855a08eada6da509bc53e6227d8e4803f", "type": "github" }, "original": { @@ -59,11 +59,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -122,11 +122,11 @@ ] }, "locked": { - "lastModified": 1759106866, - "narHash": "sha256-GjLvAl7qxGxKtop6ghasxjQ1biTT7pA+WU45byzMl/4=", + "lastModified": 1753387274, + "narHash": "sha256-Y1hAI9h+9DLBbgKvZBsHaeptFIcRw4iC6ySPmzyqmlM=", "owner": "nix-community", "repo": "home-manager", - "rev": "619ae569293b6427d23cce4854eb4f3c33af3eec", + "rev": "a35f6b60430ff0c7803bd2a727df84c87569c167", "type": "github" }, "original": { @@ -151,11 +151,11 @@ ] }, "locked": { - "lastModified": 1753964049, - "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=", + "lastModified": 1749155331, + "narHash": "sha256-XR9fsI0zwLiFWfqi/pdS/VD+YNorKb3XIykgTg4l1nA=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5", + "rev": "45fcc10b4c282746d93ec406a740c43b48b4ef80", "type": "github" }, "original": { @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1758192433, - "narHash": "sha256-CR6RnqEJSTiFgA6KQY4TTLUWbZ8RBnb+hxQqesuQNzQ=", + "lastModified": 1752149140, + "narHash": "sha256-gbh1HL98Fdqu0jJIWN4OJQN7Kkth7+rbkFpSZLm/62A=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "c44e749dd611521dee940d00f7c444ee0ae4cfb7", + "rev": "340494a38b5ec453dfc542c6226481f736cc8a9a", "type": "github" }, "original": { @@ -217,11 +217,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1759094452, - "narHash": "sha256-j7IOTFnQRDjX4PzYb2p6CPviAc8cDrcorzGpM8J89uM=", + "lastModified": 1753310189, + "narHash": "sha256-56A/JkduXotowfl8G4jhXMGrlLgRbQLwIBOE5kM0iNU=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "f854b5bffbdd13cfe7edad0ee157d6947ff99619", + "rev": "31cc7f3b87d1d9670b66e73e3720da2e2da49acd", "type": "github" }, "original": { @@ -237,11 +237,11 @@ ] }, "locked": { - "lastModified": 1759126670, - "narHash": "sha256-p+HObKRf2j3DfI4mcrJoF+WR7IIg9demMioYBsRH0GM=", + "lastModified": 1753092469, + "narHash": "sha256-Q6iW6pfgJoqMY7UVFhunEyn/bt8lvmLZ21k0i/3Z0xc=", "owner": "outfoxxed", "repo": "hy3", - "rev": "af94b011af255de87b2b026121fab1e6f2c56c6d", + "rev": "b813c13a10cc39c60eada511f6e6a7947d941aab", "type": "github" }, "original": { @@ -330,11 +330,11 @@ ] }, "locked": { - "lastModified": 1757694755, - "narHash": "sha256-j+w5QUUr2QT/jkxgVKecGYV8J7fpzXCMgzEEr6LG9ug=", + "lastModified": 1750371812, + "narHash": "sha256-D868K1dVEACw17elVxRgXC6hOxY+54wIEjURztDWLk8=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "5ffdfc13ed03df1dae5084468d935f0a3f2c9a4c", + "rev": "b13c7481e37856f322177010bdf75fccacd1adc8", "type": "github" }, "original": { @@ -356,11 +356,11 @@ ] }, "locked": { - "lastModified": 1758927902, - "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=", + "lastModified": 1750371198, + "narHash": "sha256-/iuJ1paQOBoSLqHflRNNGyroqfF/yvPNurxzcCT0cAE=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da", + "rev": "cee01452bca58d6cadb3224e21e370de8bc20f0b", "type": "github" }, "original": { @@ -379,11 +379,11 @@ ] }, "locked": { - "lastModified": 1759010491, - "narHash": "sha256-xU/k9yUPVRlJwlnEtFAbUONVckEX+LFXZo3c4DjAF1E=", + "lastModified": 1753265677, + "narHash": "sha256-Fq/pAeiC9re9DKUHCBdb8Kyhp+z7e7f/xuSS8TdFLo8=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "64446e1a4c00ec9bb90ccdbeb3470be6e9bde83a", + "rev": "8dd20c73e05ed2f919b174022015a60f76ac5899", "type": "github" }, "original": { @@ -404,11 +404,11 @@ ] }, "locked": { - "lastModified": 1755184602, - "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", + "lastModified": 1751897909, + "narHash": "sha256-FnhBENxihITZldThvbO7883PdXC/2dzW4eiNvtoV5Ao=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", + "rev": "fcca0c61f988a9d092cbb33e906775014c61579d", "type": "github" }, "original": { @@ -439,11 +439,11 @@ ] }, "locked": { - "lastModified": 1759032422, - "narHash": "sha256-WZf+FhebP2/1pK2np5xj/NuDjD6fXK2BHnq/tPUN18o=", + "lastModified": 1752985182, + "narHash": "sha256-sX8Neff8lp3TCHai6QmgLr5AD8MdsQQX3b52C1DVXR8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "ec7a78cb0e098832d8acac091a4df393259c4839", + "rev": "fafdcb505ba605157ff7a7eeea452bc6d6cbc23c", "type": "github" }, "original": { @@ -474,11 +474,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1758690382, - "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", + "lastModified": 1753250450, + "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e643668fd71b949c53f8626614b21ff71a07379d", + "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", "type": "github" }, "original": { @@ -495,11 +495,11 @@ ] }, "locked": { - "lastModified": 1759136191, - "narHash": "sha256-1FhgEzYRwLWUWjm/csTr+OmzRVGgvlUDySqhFOyhPGM=", + "lastModified": 1753410150, + "narHash": "sha256-/NgbxnRClVoYDYAAtn8uxLP5sPZLy0B9t8RxUpDyr1A=", "owner": "nix-community", "repo": "NUR", - "rev": "c7f19a28eaa25be9451bd48508eabf2b386fb72d", + "rev": "460e9b64154a67dc0ed87e2d9e0404136ac1c936", "type": "github" }, "original": { @@ -518,11 +518,11 @@ ] }, "locked": { - "lastModified": 1758108966, - "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -538,11 +538,11 @@ ] }, "locked": { - "lastModified": 1759128992, - "narHash": "sha256-crjxt1g3zc3OtmE4xfbFouiDwAxqUmRfpTtfnkkJ8/0=", + "lastModified": 1753402503, + "narHash": "sha256-cc1seYNwhhk9f74NpJSFRmQFjDzXInq66/dSVs2eK4Y=", "ref": "refs/heads/master", - "rev": "1d94144976252a922e03e4c0fbb921ee8b8bb079", - "revCount": 682, + "rev": "4dad44757085a42423f758bf0177cebcd07b4a4a", + "revCount": 656, "type": "git", "url": "https://git.outfoxxed.me/quickshell/quickshell" }, @@ -571,11 +571,11 @@ }, "stable": { "locked": { - "lastModified": 1758791193, - "narHash": "sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e+HYf0=", + "lastModified": 1753345091, + "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "25e53aa156d47bad5082ff7618f5feb1f5e02d01", + "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", "type": "github" }, "original": { @@ -627,11 +627,11 @@ ] }, "locked": { - "lastModified": 1755354946, - "narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=", + "lastModified": 1751300244, + "narHash": "sha256-PFuv1TZVYvQhha0ac53E3YgdtmLShrN0t4T6xqHl0jE=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0", + "rev": "6115f3fdcb2c1a57b4a80a69f3c797e47607b90a", "type": "github" }, "original": { diff --git a/modules/core/default.nix b/modules/core/default.nix index 91d24fb..b5a3820 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -14,7 +14,11 @@ "steam-unwrapped" ]; - nixpkgs.config.permittedInsecurePackages = []; + nixpkgs.config.permittedInsecurePackages = [ + "jitsi-meet-1.0.8043" + "electron-28.3.3" + "electron-27.3.11" + ]; documentation = { enable = true; @@ -33,10 +37,18 @@ 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 = { @@ -60,7 +72,7 @@ speedFactor = 100; maxJobs = 16; sshUser = "nix-remote-build"; - sshKey = "/root/.ssh/id_ed25519"; + sshKey = "/root/.ssh/id_build_server"; } ]; }; diff --git a/modules/hyprland/hyprland.conf b/modules/hyprland/hyprland.conf index 9fb22c8..70b2203 100644 --- a/modules/hyprland/hyprland.conf +++ b/modules/hyprland/hyprland.conf @@ -40,6 +40,7 @@ decoration { animations { enabled = yes + first_launch_animation = no bezier = windowIn, 0.06, 0.71, 0.25, 1 bezier = windowResize, 0.04, 0.67, 0.38, 1 @@ -53,10 +54,11 @@ animations { animation = layers, 1, 4, windowIn, slide } -gesture = 3, vertical, workspace - gestures { + workspace_swipe = true + workspace_swipe_invert = true workspace_swipe_direction_lock = false + workspace_swipe_fingers = 4 workspace_swipe_forever = true workspace_swipe_cancel_ratio = 0.15 } diff --git a/modules/overlay-pkgs/default.nix b/modules/overlay-pkgs/default.nix index c05233e..1635670 100644 --- a/modules/overlay-pkgs/default.nix +++ b/modules/overlay-pkgs/default.nix @@ -6,7 +6,6 @@ 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 9822526..29d7f9c 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/apps" - mv "$out/.install4j/tws.png" "$out/share/icons/hicolor/128x128/apps/tws.png" + mkdir -p "$out/share/icons/hicolor/128x128" + mv "$out/.install4j/tws.png" "$out/share/icons/hicolor/128x128/tws.png" mkdir -p "$out/share/applications" cat < "$out/share/applications/tws.desktop" diff --git a/modules/system.nix b/modules/system.nix index 7f43aca..38c2bbd 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.enable = false; + wait-online.anyInterface = true; }; # removable disks in file manager diff --git a/modules/user/dev-support.nix b/modules/user/dev-support.nix index 41ba047..2c57f34 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 + clang-tools_16 jdt-language-server kotlin-language-server typescript-language-server @@ -9,7 +9,6 @@ haskell-language-server glslls zls - eslint bear gdb diff --git a/modules/user/general.nix b/modules/user/general.nix index 6e2aeaa..24cbf6f 100644 --- a/modules/user/general.nix +++ b/modules/user/general.nix @@ -8,7 +8,6 @@ programs.steam = { enable = true; - protontricks.enable = true; extraCompatPackages = [ pkgs.proton-ge-bin ]; @@ -135,8 +134,6 @@ freetube jujutsu - tws - distrobox xdg-utils light diff --git a/systems/msi/hardware.nix b/systems/msi/hardware.nix index 4234582..0c194af 100644 --- a/systems/msi/hardware.nix +++ b/systems/msi/hardware.nix @@ -8,6 +8,15 @@ hardware.graphics = { enable = true; + #driSupport = true; enable32Bit = true; + + extraPackages = with pkgs; [ + amdvlk + ]; + + extraPackages32 = with pkgs.driversi686Linux; [ + amdvlk + ]; }; }