diff --git a/flake.lock b/flake.lock index aa774d8..0795758 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1694793763, - "narHash": "sha256-y6gTE1C9mIoSkymRYyzCmv62PFgy+hbZ5j8fuiQK5KI=", + "lastModified": 1703260116, + "narHash": "sha256-ipqShkBmHKC9ft1ZAsA6aeKps32k7+XZSPwfxeHLsAU=", "owner": "ryantm", "repo": "agenix", - "rev": "572baca9b0c592f71982fca0790db4ce311e3c75", + "rev": "d0d4ad5be611da43da04321f49684ad72d705c7e", "type": "github" }, "original": { @@ -101,11 +101,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1695224363, - "narHash": "sha256-+hfjJLUMck5G92RVFDZA7LWkR3kOxs5zQ7RPW9t3eM8=", + "lastModified": 1703265279, + "narHash": "sha256-5jVtOwyMH1FzclxHrsFWzBdB+VyjUUSu1wyZhZlR6WU=", "owner": "nix-community", "repo": "home-manager", - "rev": "408ba13188ff9ce309fa2bdd2f81287d79773b00", + "rev": "07c322a7cff03267fd881adae1afe63367c5d608", "type": "github" }, "original": { @@ -132,11 +132,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1695109627, - "narHash": "sha256-4rpyoVzmunIG6xWA/EonnSSqC69bDBzciFi6SjBze/0=", + "lastModified": 1702453208, + "narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cb4dc98f776ddb6af165e6f06b2902efe31ca67a", + "rev": "7763c6fd1f299cb9361ff2abf755ed9619ef01d6", "type": "github" }, "original": { @@ -163,11 +163,11 @@ }, "nixpkgs-latest": { "locked": { - "lastModified": 1694959747, - "narHash": "sha256-CXQ2MuledDVlVM5dLC4pB41cFlBWxRw4tCBsFrq3cRk=", + "lastModified": 1703013332, + "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "970a59bd19eff3752ce552935687100c46e820a5", + "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", "type": "github" }, "original": { @@ -179,11 +179,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1694959747, - "narHash": "sha256-CXQ2MuledDVlVM5dLC4pB41cFlBWxRw4tCBsFrq3cRk=", + "lastModified": 1702312524, + "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "970a59bd19eff3752ce552935687100c46e820a5", + "rev": "a9bf124c46ef298113270b1f84a164865987a91c", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1694959747, - "narHash": "sha256-CXQ2MuledDVlVM5dLC4pB41cFlBWxRw4tCBsFrq3cRk=", + "lastModified": 1703013332, + "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "970a59bd19eff3752ce552935687100c46e820a5", + "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", "type": "github" }, "original": { @@ -231,11 +231,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1695175880, - "narHash": "sha256-TBR5/K3jkrd+U5mjxvRvUhlcT1Hw9jFywz1TjAGZRm4=", + "lastModified": 1703297543, + "narHash": "sha256-d4QlzcoSNzb/iZheWtjOyRxoBSaLETSpViENGEkxv9g=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e054ca37ee416efe9d8fc72d249ec332ef74b6d4", + "rev": "fc77c8b416b1537522d30c710baaaaebf769f816", "type": "github" }, "original": { diff --git a/shared/core/gui.nix b/shared/core/gui.nix index 2c2f326..33a3966 100644 --- a/shared/core/gui.nix +++ b/shared/core/gui.nix @@ -23,11 +23,13 @@ in { }; services.pipewire = { - enable = true; + enable = false; pulse.enable = true; wireplumber.enable = true; }; + hardware.pulseaudio.enable = true; + services.dbus.enable = true; programs.sway = { diff --git a/shared/home/gui/sway.nix b/shared/home/gui/sway.nix index ae7140f..8233d3a 100644 --- a/shared/home/gui/sway.nix +++ b/shared/home/gui/sway.nix @@ -57,8 +57,9 @@ in with lib; { extraConfig = '' bindsym --release ${mod}+d exec ${sc}/bin/sc + '' + (if !config.isNixos then '' exec "${(import nixpkgs-latest {}).google-chrome}/bin/google-chrome-stable --ozone-platform-hint=auto --enable-features=VaapiVideoDecoder,VaapiVideoEncoder --app=https://calendar.google.com" - ''; + '' else ""); config = rec { output."*".bg = "${../../data/time-warp.jpg} fill"; diff --git a/shared/overlay.nix b/shared/overlay.nix index 0e737b0..ed31f9a 100644 --- a/shared/overlay.nix +++ b/shared/overlay.nix @@ -10,7 +10,7 @@ with (import ./lib.nix final); { prev.tor-browser-bundle-bin.override { useHardenedMalloc = false; }; - python311Packages.deemix = prev.python311Packages.deemix.overrideAttrs (old: { - patches = [./patch/dont_write_arl.patch]; - }); + # python311Packages.deemix = prev.python311Packages.deemix.overrideAttrs (old: { + # patches = [./patch/dont_write_arl.patch]; + # }); } diff --git a/system/strawberry/core.nix b/system/strawberry/core.nix index 9150b54..bc67aca 100644 --- a/system/strawberry/core.nix +++ b/system/strawberry/core.nix @@ -57,6 +57,8 @@ { device = "/dev/nixos/swap"; } ]; + programs.steam.enable = true; + services.xserver.videoDrivers = [ "nvidia" ]; hardware.nvidia.modesetting.enable = true;