From 4dfef18b95146fd574e2e2c2f0bf491cec95972e Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sat, 4 May 2024 23:32:31 +0200 Subject: [PATCH] update: get rid of some patches --- common/gaming.nix | 10 +++- common/hardware/laptop.nix | 6 +- common/tooling/default.nix | 1 + common/tooling/nix.nix | 2 +- flake.lock | 55 ++++++++++--------- flake.nix | 7 +-- modules/users.nix | 1 - .../hardware-configuration.nix | 9 +++ 8 files changed, 51 insertions(+), 40 deletions(-) diff --git a/common/gaming.nix b/common/gaming.nix index 36f451a..d31648e 100644 --- a/common/gaming.nix +++ b/common/gaming.nix @@ -10,6 +10,10 @@ in gamescopeSession.env = { DRI_PRIME = "1"; }; + extraCompatPackages = with pkgs; [ + proton-ge-bin + ]; + # extest.enable = true; }; programs.gamemode = { @@ -23,7 +27,7 @@ in start = "${lib.getExe pkgs.libnotify} 'GameMode started'"; end = "${lib.getExe pkgs.libnotify} 'GameMode ended'"; }; - }; + }; }; services.udev.packages = [ pkgs.wooting-udev-rules ]; @@ -35,8 +39,8 @@ in environment.systemPackages = with pkgs; [ heroic prismlauncher - mangohud - wootility + mangohud + the-powder-toy (pkgs.symlinkJoin { name = "osu"; paths = [ diff --git a/common/hardware/laptop.nix b/common/hardware/laptop.nix index 2b604c7..1e87567 100644 --- a/common/hardware/laptop.nix +++ b/common/hardware/laptop.nix @@ -15,6 +15,7 @@ in (writeShellScriptBin "lsiommu" ./lsiommu) ] ++ lib.optionals graphical [ ddcui + wootility ]; hardware.i2c.enable = true; @@ -46,8 +47,8 @@ in boot = { kernelParams = [ - # "splash" - # "quiet" + # "splash" + "quiet" # "intel_iommu=on" # "iommu=force" # "pcie_acs_override=downstream" @@ -82,6 +83,7 @@ in # "vfio" "ddcci_backlight" "i2c-dev" + "ec_sys" ]; # blacklistedKernelModules = [ "i2c_nvidia_gpu" ]; }; diff --git a/common/tooling/default.nix b/common/tooling/default.nix index 84e3084..aac45a3 100644 --- a/common/tooling/default.nix +++ b/common/tooling/default.nix @@ -65,6 +65,7 @@ in core.autocrlf = "input"; commit.gpgsign = true; pull.rebase = true; + alias.pfusch= "push --force-with-lease"; }; }; diff --git a/common/tooling/nix.nix b/common/tooling/nix.nix index 510cc01..e200a0f 100644 --- a/common/tooling/nix.nix +++ b/common/tooling/nix.nix @@ -36,7 +36,7 @@ in dates = "weekly"; options = "--delete-older-than 30d"; }; - nix.package = pkgs.nixVersions.unstable; + nix.package = pkgs.nixVersions.latest; nix.optimise.automatic = true; nixpkgs.hostPlatform = system; diff --git a/flake.lock b/flake.lock index 2ac7712..4a97f7d 100644 --- a/flake.lock +++ b/flake.lock @@ -78,11 +78,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1714566321, - "narHash": "sha256-cTWwPbwYtE8r6MuR+0ybG4CFeE8Sid5XHbFJq4itO+A=", + "lastModified": 1714768132, + "narHash": "sha256-Ln0WH0tGA4ZHF9oCVtKsa7yHHhMtdJ2v8oajefpgit4=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "5939d3fb76b25a48a8c0db716ebb6fe28eab3719", + "rev": "e00c0592bf535a2608326263182340c1df2f5f78", "type": "github" }, "original": { @@ -109,15 +109,16 @@ "complement": { "flake": false, "locked": { - "lastModified": 1713458251, - "narHash": "sha256-hom/Lt0gZzLWqFhUJG0X2i88CAMIILInO5w0tPj6G3s=", + "lastModified": 1714472853, + "narHash": "sha256-CNRHSZe3TE+3tFj2dHNyxTMjDqL0MKY3P/3jqUgA7YE=", "owner": "matrix-org", "repo": "complement", - "rev": "d73c81a091604b0fc5b6b0617dcac58c25763f57", + "rev": "891d18872c153d39a9ce63b545045efddb845738", "type": "github" }, "original": { "owner": "matrix-org", + "ref": "main", "repo": "complement", "type": "github" } @@ -156,11 +157,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1714111420, - "narHash": "sha256-ax+Z3K9y2N43C/+1gwyTbtXKHuWYY1NYN+tV5NcJ+zI=", + "lastModified": 1714717104, + "narHash": "sha256-c+LnBnWKPQxNK6ebEe9RYlvGDkhEKJbSO6n0pZrKjdY=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "341bafb91e77cd95775d9cfa4f0810309889b176", + "rev": "42e3567153f20ace6f287d46fff2d7c070b68840", "type": "github" }, "original": { @@ -382,11 +383,11 @@ ] }, "locked": { - "lastModified": 1714515075, - "narHash": "sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY=", + "lastModified": 1714679908, + "narHash": "sha256-KzcXzDvDJjX34en8f3Zimm396x6idbt+cu4tWDVS2FI=", "owner": "nix-community", "repo": "home-manager", - "rev": "6d3b6dc9222c12b951169becdf4b0592ee9576ef", + "rev": "9036fe9ef8e15a819fa76f47a8b1f287903fb848", "type": "github" }, "original": { @@ -404,11 +405,11 @@ ] }, "locked": { - "lastModified": 1714464433, - "narHash": "sha256-ztvukQ2LvrRQBtiRiut8FgCOyKXgqLTIp3Deg/OguUY=", + "lastModified": 1714720101, + "narHash": "sha256-Dxlj52coLzQZVV4a9IMMc/2xU5FIpj0iaHBigPwoNjM=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "2a5194b960801b68cfc4c811eb1733cf3aa8ece6", + "rev": "68b6bfacf67fcb1660c024b8dcd9376af38bbafe", "type": "github" }, "original": { @@ -430,11 +431,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1714532637, - "narHash": "sha256-2oWMEjkJKYzxLXy3OZ/M41VdbZgZLWmwttry551lUE4=", + "lastModified": 1714717012, + "narHash": "sha256-NBwvJqxD0JE7qhy6yZVyunrxAj8j8pn3XiFQxO2YOWI=", "owner": "martinvonz", "repo": "jj", - "rev": "7093d5d359fb3649be0d12a975f26d5607ad8f61", + "rev": "0d630ac1bce0a87cf54a084c17a84225caa5fd6e", "type": "github" }, "original": { @@ -467,11 +468,11 @@ ] }, "locked": { - "lastModified": 1714551038, - "narHash": "sha256-/b4HT/RYfNkKUUpIzIwsHThLLAuKA70O8W/32sh2N0M=", + "lastModified": 1714729593, + "narHash": "sha256-qJyx6NFn/aDrZ06WzJoi2irDyKrApMjDjKJ6UTkLD10=", "owner": "YaLTeR", "repo": "niri", - "rev": "af9caa1d9b176fe3606323a8c05c0c741c1f6c0a", + "rev": "85680a57dac965973644e9e96159716c0608bb57", "type": "github" }, "original": { @@ -562,11 +563,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", + "lastModified": 1714635257, + "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", + "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", "type": "github" }, "original": { @@ -612,11 +613,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1714409183, - "narHash": "sha256-Wacm/DrzLD7mjFGnSxxyGkJgg2unU/dNdNgdngBH+RU=", + "lastModified": 1714685007, + "narHash": "sha256-Q4ddhb5eC5pwci0QhAapFwnsc8X8H9ZMQiWpsofBsDc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "576ecd43d3b864966b4423a853412d6177775e8b", + "rev": "383ffe076d9b633a2e97b6e4dd97fc15fcf30159", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1ea7214..67f18de 100644 --- a/flake.nix +++ b/flake.nix @@ -39,11 +39,6 @@ url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/305278.patch"; hash = "sha256-8RvPI8Id+Ttgv07IMBTAxkSc+K00WhiWgdgrCcULd7o="; } - { - # rmenu 1.2.2 - url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/307541.patch"; - hash = "sha256-cyxiWCxBOKrET710C8o9Cwksy64HRez6mB1qF+anHMI="; - } { # cpupower meta.mainProgram url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/308476.patch"; @@ -52,7 +47,7 @@ { # xdg term url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/303225.patch"; - hash = "sha256-XEwkHOY6Ye0IwEPXWHMH6kST/x6TOeLONfdDQymgw40="; + hash = "sha256-+CBCMeBc5NqtjaUUTX1DBKhlFlKf1G6ovWrAo6xHH+I="; } ]; diff --git a/modules/users.nix b/modules/users.nix index d3d200c..7c29ea4 100644 --- a/modules/users.nix +++ b/modules/users.nix @@ -35,7 +35,6 @@ obs-studio element-desktop ghidra - kcalc rmview arena ]; diff --git a/specific/grimm-nixos-laptop/hardware-configuration.nix b/specific/grimm-nixos-laptop/hardware-configuration.nix index 28e3cbd..f4d8688 100644 --- a/specific/grimm-nixos-laptop/hardware-configuration.nix +++ b/specific/grimm-nixos-laptop/hardware-configuration.nix @@ -39,6 +39,15 @@ in OMP_NUM_THREADS = cpus; }; + environment.systemPackages = with pkgs; [ + (callPackage + (fetchurl { + url = "https://raw.githubusercontent.com/NixOS/nixpkgs/2efffaa70e6de4cb34fd694798af5d433250f4e8/pkgs/by-name/mc/mcontrolcenter/package.nix"; + hash = "sha256-WnjSrSAurmN6dWOzjjZMXXxh0lUigyRPlXlg3OC0lu8="; + }) + { }) + ]; + grimmShared = { screens = { external = {