diff --git a/flake.lock b/flake.lock index ef7705c..a02f7c8 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1673433023, - "narHash": "sha256-wF5qhT3UvGk1Ouog+wEvm21oeD6rvzXg+/wcfPJq0BI=", + "lastModified": 1676628719, + "narHash": "sha256-yZM1hLxPS3OuKNduQSWmiYLAjIZeJ7ExWbCL3A3bi0U=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d85438fe16bfef13004bc90a50661d0c74252970", + "rev": "cd34501a9bcec341533c7131af77572456c100d8", "type": "github" }, "original": { @@ -75,11 +75,11 @@ }, "flake-utils_2": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", "type": "github" }, "original": { @@ -169,11 +169,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1673343300, - "narHash": "sha256-5Xdj6kpXYMie0MlnGwqK5FaMdsedxvyuakWtyKB3zaQ=", + "lastModified": 1676367705, + "narHash": "sha256-un5UbRat9TwruyImtwUGcKF823rCEp4fQxnsaLFL7CM=", "owner": "nix-community", "repo": "home-manager", - "rev": "176e455371a8371586e8a3ff0d56ee9f3ca2324e", + "rev": "da72e6fc6b7dc0c3f94edbd310aae7cd95c678b5", "type": "github" }, "original": { @@ -381,11 +381,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1673390851, - "narHash": "sha256-dAhsJUIxfg5gWE+uQ3e0ICssS0QPQZt7Pa+75NKtAEw=", + "lastModified": 1675933606, + "narHash": "sha256-y427VhPQHOKkYvkc9MMsL/2R7M11rQxzsRdRLM3htx8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9335068481026234c1f41079ad54e28ad92453de", + "rev": "44ae00e02e8036a66c08f4decdece7e3bbbefee2", "type": "github" }, "original": { @@ -413,15 +413,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1672617983, - "narHash": "sha256-68WDiCBs631mbDDk4UAKdGURKcsfW6hjb7wgudTAe5o=", - "path": "/nix/store/xaz5fk93mij8i1p7gpccq34mzpm73diq-source", - "rev": "0fc9fca9c8d43edd79d33fea0dd8409d7c4580f4", - "type": "path" + "lastModified": 1673540789, + "narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf", + "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-unstable": { @@ -442,11 +445,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1671983799, - "narHash": "sha256-Z2Ro6hFPZHkBqkVXY5/aBUzxi5xizQGvuHQ9+T5B/ks=", + "lastModified": 1675115703, + "narHash": "sha256-4zetAPSyY0D77x+Ww9QBe8RHn1akvIvHJ/kgg8kGDbk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fad51abd42ca17a60fc1d4cb9382e2d79ae31836", + "rev": "2caf4ef5005ecc68141ecb4aac271079f7371c44", "type": "github" }, "original": { @@ -458,11 +461,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1673226411, - "narHash": "sha256-b6cGb5Ln7Zy80YO66+cbTyGdjZKtkoqB/iIIhDX9gRA=", + "lastModified": 1676481215, + "narHash": "sha256-afma/1RU0EePRyrBPcjBdOt+dV8z1bJH9dtpTN/WXmY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "aa1d74709f5dac623adb4d48fdfb27cc2c92a4d4", + "rev": "28319deb5ab05458d9cd5c7d99e1a24ec2e8fc4b", "type": "github" }, "original": { @@ -564,11 +567,11 @@ }, "nur": { "locked": { - "lastModified": 1673426865, - "narHash": "sha256-zNoCWLOqq2X9d188BlIDG46KcTkQ8AGaY9g4yozl2Zs=", + "lastModified": 1676633667, + "narHash": "sha256-Lao/f52stjtuifmNK0aFGUxOhAafSbiN+csI686DsDg=", "owner": "nix-community", "repo": "nur", - "rev": "a77112aa2598b741261a2af1383ac372e6f9c104", + "rev": "7eb9eec5cb2a3ef77646cb451ce546c301ecf884", "type": "github" }, "original": { diff --git a/hosts/miku.nix b/hosts/miku.nix index 855e9e1..f7a46a7 100644 --- a/hosts/miku.nix +++ b/hosts/miku.nix @@ -93,10 +93,6 @@ gamemode.enable = true; gnome.enable = false; logiops.enable = true; - input-remapper = { - enable = true; - postStartCommand = "${pkgs.input-remapper}/bin/input-remapper-control --command start --preset NOOP --device \"Razer Razer Tartarus V2\""; - }; gdm = { enable = false; }; @@ -110,7 +106,7 @@ }; virtualisation = { enable = true; - gaming.enable = true; + gaming.enable = false; }; }; programs = { diff --git a/modules/programs/emacs/dotemacs b/modules/programs/emacs/dotemacs index 9f62372..f309e93 100644 --- a/modules/programs/emacs/dotemacs +++ b/modules/programs/emacs/dotemacs @@ -9,6 +9,9 @@ (setq fast-but-imprecise-scrolling t) (setq make-backup-files nil) (setq create-lockfiles nil) +; Disable the bell sounds +(setq ring-bell-function 'ignore) + ;; A trick for faster startup is to just disable GC for the init phase ;;; See: https://github.com/nilcons/emacs-use-package-fast#a-trick-less-gc-during-startup (setq gc-cons-threshold 64000000) diff --git a/modules/programs/firefox/default.nix b/modules/programs/firefox/default.nix index b4b54c1..496d8de 100644 --- a/modules/programs/firefox/default.nix +++ b/modules/programs/firefox/default.nix @@ -24,17 +24,18 @@ in { home-manager.users."${config.ptw.system.singleUser}".programs.firefox = { enable = true; - extensions = with pkgs.nur.repos.rycee.firefox-addons; [ - #https-everywhere - ublock-origin - umatrix - decentraleyes - privacy-redirect - ]; profiles.default = { id = 0; # NOTE: This is important isDefault = true; name = "Default Profile"; + extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + #https-everywhere + ublock-origin + umatrix + decentraleyes + privacy-redirect + ]; + settings = { "browser.search.suggest.enabled" = false; "browser.tabs.drawInTitlebar" = true; diff --git a/modules/programs/gaming/default.nix b/modules/programs/gaming/default.nix index c93bde2..19aa2c2 100644 --- a/modules/programs/gaming/default.nix +++ b/modules/programs/gaming/default.nix @@ -22,17 +22,17 @@ in { #steam-wrapped # Custom package - #gamescope + gamescope corectrl ]; - security.wrappers.gamescope = { - owner = "root"; - group = "root"; - source = "${pkgs.gamescope}/bin/gamescope"; - capabilities = "cap_sys_nice+ep,cap_setgid+ep,cap_setuid+ep"; - }; + # security.wrappers.gamescope = { + # owner = "alexander"; + # group = "alexander"; + # source = "${pkgs.gamescope}/bin/gamescope"; + # capabilities = "CAP_SYS_NICE=eip"; + # }; hardware.steam-hardware.enable = true; }; diff --git a/overlays/simple.nix b/overlays/simple.nix index 37c210d..ba35329 100644 --- a/overlays/simple.nix +++ b/overlays/simple.nix @@ -68,4 +68,9 @@ final: prev: }; discord-app = prev.discord-app.override { chromium = prev.ungoogled-chromium; }; + + # Work around https://github.com/NixOS/nixpkgs/issues/216294 + pkgsi686Linux = prev.pkgsi686Linux.extend (pfinal: pprev: { + directx-shader-compiler = pprev.directx-shader-compiler.override {stdenv = pfinal.gcc11Stdenv;}; + }); } diff --git a/packages/misc/video/animdl/default.nix b/packages/misc/video/animdl/default.nix index 85b7e24..3609a3f 100644 --- a/packages/misc/video/animdl/default.nix +++ b/packages/misc/video/animdl/default.nix @@ -6,14 +6,14 @@ poetry2nix.mkPoetryApplication rec { src = fetchFromGitHub { owner = "justfoolingaround"; repo = "animdl"; - ref = "9167e03ecb60c21ae1ead90d1472cd7157e1d8b7"; + rev = "9167e03ecb60c21ae1ead90d1472cd7157e1d8b7"; sha256 = "1v33kxlxc38awdpxqsb6bfdw0sc45dibg0b4c0qld0pddlppm0qh"; }; - prijectDir = src; + projectDir = src; doCheck = false; meta = with lib; { inherit (python.meta) platforms; }; -}; +}