diff options
| -rw-r--r-- | darwinConfigurations/mairon/default.nix | 18 | ||||
| -rw-r--r-- | flake.lock | 126 | ||||
| -rw-r--r-- | flake.nix | 13 | ||||
| -rw-r--r-- | modules/common/common/nix/default.nix | 39 | ||||
| -rw-r--r-- | modules/common/common/nix/patches/prismlauncher-allow-offline-accounts.patch | 24 | ||||
| -rw-r--r-- | modules/common/git.nix | 6 | ||||
| -rw-r--r-- | modules/nixos/default.nix | 1 | ||||
| -rw-r--r-- | modules/nixos/discord.nix | 22 | ||||
| -rw-r--r-- | modules/nixos/firefox/userContent.css | 22 | ||||
| -rw-r--r-- | modules/nixos/games/minecraft.nix | 4 | ||||
| -rw-r--r-- | nixosConfigurations/eonwe/default.nix | 4 |
11 files changed, 118 insertions, 161 deletions
diff --git a/darwinConfigurations/mairon/default.nix b/darwinConfigurations/mairon/default.nix index 5df2297..807b4f8 100644 --- a/darwinConfigurations/mairon/default.nix +++ b/darwinConfigurations/mairon/default.nix @@ -4,22 +4,13 @@ ... }: with lib; { - # TODO Make this per-directory/per-remote. - hm.programs.git = { - userName = mkForce "Firstname Lastname"; - userEmail = mkForce "username@work.com"; - signing.key = mkForce "@PGP_KEY@"; - extraConfig."url \"git@gitlab.services.work.com:\"".insteadOf = "work:"; - }; + imports = [ + ./hidden.nix + ]; homebrew = { - taps = [ - {name = "kreuzwerker/homebrew-taps";} - ]; brews = [ {name = "carthage";} - {name = "go@1.21";} - {name = "m1-terraform-provider-helper";} # kreuzwerker/homebrew-taps {name = "sourcery";} {name = "xcodegen";} ]; @@ -27,14 +18,13 @@ with lib; { {name = "burp-suite";} {name = "cocoapods";} {name = "docker";} - {name = "jetbrains-toolbox";} {name = "obs";} {name = "openlens";} {name = "postman";} {name = "shadowsocksx-ng";} {name = "vial";} - {name = "vnc-viewer";} {name = "wireshark";} + {name = "xcbeautify";} {name = "xcodes";} ]; }; diff --git a/flake.lock b/flake.lock index fa38b1e..e615a2f 100644 --- a/flake.lock +++ b/flake.lock @@ -147,11 +147,11 @@ ] }, "locked": { - "lastModified": 1696360011, - "narHash": "sha256-HpPv27qMuPou4acXcZ8Klm7Zt0Elv9dgDvSJaomWb9Y=", + "lastModified": 1697723594, + "narHash": "sha256-W7lTC+kHGS1YCOutGpxUHF0cK66iY/GYr3INaTyVa/I=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "8b6ea26d5d2e8359d06278364f41fbc4b903b28a", + "rev": "19f75c2b45fbfc307ecfeb9dadc41a4c1e4fb980", "type": "github" }, "original": { @@ -287,11 +287,11 @@ ] }, "locked": { - "lastModified": 1696940889, - "narHash": "sha256-p2Wic74A1tZpFcld1wSEbFQQbrZ/tPDuLieCnspamQo=", + "lastModified": 1697688028, + "narHash": "sha256-d9CAOd9W2iTrgB31a8Dvyp6Vgn/gxASCNrD4Z9yzUOY=", "owner": "nix-community", "repo": "home-manager", - "rev": "6bba64781e4b7c1f91a733583defbd3e46b49408", + "rev": "c5c1ea85181d2bb44e46e8a944a8a3f56ad88f19", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "impermanence": { "locked": { - "lastModified": 1694622745, - "narHash": "sha256-z397+eDhKx9c2qNafL1xv75lC0Q4nOaFlhaU1TINqb8=", + "lastModified": 1697303681, + "narHash": "sha256-caJ0rXeagaih+xTgRduYtYKL1rZ9ylh06CIrt1w5B4g=", "owner": "nix-community", "repo": "impermanence", - "rev": "e9643d08d0d193a2e074a19d4d90c67a874d932e", + "rev": "0f317c2e9e56550ce12323eb39302d251618f5b5", "type": "github" }, "original": { @@ -317,22 +317,6 @@ "type": "github" } }, - "libnbtplusplus": { - "flake": false, - "locked": { - "lastModified": 1690036783, - "narHash": "sha256-A5kTgICnx+Qdq3Fir/bKTfdTt/T1NQP2SC+nhN1ENug=", - "owner": "PrismLauncher", - "repo": "libnbtplusplus", - "rev": "a5e8fd52b8bf4ab5d5bcc042b2a247867589985f", - "type": "github" - }, - "original": { - "owner": "PrismLauncher", - "repo": "libnbtplusplus", - "type": "github" - } - }, "nix-minecraft": { "inputs": { "flake-compat": [ @@ -346,11 +330,11 @@ ] }, "locked": { - "lastModified": 1697159870, - "narHash": "sha256-2ARvI9iPHzMqNgUES5LrDoa3yIqH+zKj14nn7ZlAyFM=", + "lastModified": 1697678187, + "narHash": "sha256-osGkweX7G9jJQ2nCgR+kOuhSAhJY2dk/KAjx7G/THW8=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "a2c5018185c388e2e586bd86ffb219824c9736d8", + "rev": "60eb15eb92342e4cf88b6652a83a1c4781333bf0", "type": "github" }, "original": { @@ -373,11 +357,11 @@ ] }, "locked": { - "lastModified": 1697160521, - "narHash": "sha256-+AtNj68qtib9/zehKpgActGdj63vFe1fIupJ3Nr9sKQ=", + "lastModified": 1697678467, + "narHash": "sha256-Q8nK9KJspQIgMKDr1dzl3fljubngTOahRWTameHYVAc=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "86e879077c11c76c6cc9abeb782b688c42338db7", + "rev": "23e2065c532cab6a24beb00e8545551642a7af28", "type": "github" }, "original": { @@ -389,11 +373,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1697100850, - "narHash": "sha256-qSAzJVzNRIo+r3kBjL8TcpJctcgcHlnZyqdzpWgtg0M=", + "lastModified": 1697748412, + "narHash": "sha256-5VSB63UE/O191cuZiGHbCJ9ipc7cGKB8cHp0cfusuyo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "fb6af288f6cf0f00d3af60cf9d5110433b954565", + "rev": "72d53d51704295f1645d20384cd13aecc182f624", "type": "github" }, "original": { @@ -405,11 +389,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1697009197, - "narHash": "sha256-viVRhBTFT8fPJTb1N3brQIpFZnttmwo3JVKNuWRVc3s=", + "lastModified": 1697688401, + "narHash": "sha256-61QlajY7R9PbK25uFl55zh968CVNspwXX1zzimic4Uo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "01441e14af5e29c9d27ace398e6dd0b293e25a54", + "rev": "458ef9126aa380996d77d44f53f886c2d8485f53", "type": "github" }, "original": { @@ -421,11 +405,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1697193098, - "narHash": "sha256-ImFPj1jDhrkUKI6zH59JDuvSjDueRBNGR+koPNObuqA=", + "lastModified": 1697750666, + "narHash": "sha256-j1jBgTizTneR80ykZcG/282d2J4XY0gBZpLi4iXhYhE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "784bf5dd5e78d565f8cdccfb4950a32ef13c8e7d", + "rev": "083d89547d1d1204e314b06d19451c6e840ecfe4", "type": "github" }, "original": { @@ -437,11 +421,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1697165465, - "narHash": "sha256-yhdZ20thGM79xKSnRx4bjxVc6JdgUv51kqJbF+Ypr+s=", + "lastModified": 1697734951, + "narHash": "sha256-LLRWbosbP8X/m65aZXUcb2gPjaxPNK89u7Ax3MJMyic=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c4f6ddbbc9677882a3f90ddc24860af71530bfb", + "rev": "f4cf0233c58eeb549531a1d096711909f3b0a546", "type": "github" }, "original": { @@ -465,11 +449,11 @@ ] }, "locked": { - "lastModified": 1697021599, - "narHash": "sha256-hyBRPjcGIwMxpL/vw29WRgPzKiBzJa45QLSZ9ja85h0=", + "lastModified": 1697646003, + "narHash": "sha256-RNg0aTTxpEH+tO5Cxj3DuihfiZBo8veZAttCW1FscO4=", "owner": "nix-community", "repo": "nixvim", - "rev": "752f0481cecabb104f30aaec1010721a4a5dfb95", + "rev": "d560fc6183b4c6bf68f0846e6b1ef906f2c78929", "type": "github" }, "original": { @@ -515,11 +499,11 @@ }, "nur": { "locked": { - "lastModified": 1697194029, - "narHash": "sha256-SfmWfd6NXgPy7ZfkSRo+0/WQfjj6ZyKzAMm5GPQ+Vcc=", + "lastModified": 1697751683, + "narHash": "sha256-QA3mZdILLte7fvfyai+eX3jdU91/zgLRmaompUluB8Q=", "owner": "nix-community", "repo": "NUR", - "rev": "5c94a59b03b744fe305c6300e16ab9526d0c6cf3", + "rev": "a2212d436f621baef2c42f2e5832a7595e935b82", "type": "github" }, "original": { @@ -556,37 +540,6 @@ "type": "github" } }, - "pollymc": { - "inputs": { - "flake-compat": [ - "flake-compat" - ], - "flake-parts": [ - "flake-parts" - ], - "libnbtplusplus": "libnbtplusplus", - "nixpkgs": [ - "nixpkgs" - ], - "pre-commit-hooks": [ - "pre-commit-hooks" - ] - }, - "locked": { - "lastModified": 1691783054, - "narHash": "sha256-yl9IFe1HTNkMUdwjEyhnfmzoGQrJLl3ZQghxGtbpsMw=", - "owner": "fn2006", - "repo": "PollyMC", - "rev": "abcbd4ab4ed92205bcf2e2ce6198f919f7d652b8", - "type": "github" - }, - "original": { - "owner": "fn2006", - "ref": "7.2", - "repo": "PollyMC", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { "flake-compat": [ @@ -606,11 +559,11 @@ ] }, "locked": { - "lastModified": 1696846637, - "narHash": "sha256-0hv4kbXxci2+pxhuXlVgftj/Jq79VSmtAyvfabCCtYk=", + "lastModified": 1697746376, + "narHash": "sha256-gu77VkgdfaHgNCVufeb6WP9oqFLjwK4jHcoPZmBVF3E=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "42e1b6095ef80a51f79595d9951eb38e91c4e6ca", + "rev": "8cc349bfd082da8782b989cad2158c9ad5bd70fd", "type": "github" }, "original": { @@ -645,7 +598,6 @@ "nmap-vulners": "nmap-vulners", "nmap-vulscan": "nmap-vulscan", "nur": "nur", - "pollymc": "pollymc", "pre-commit-hooks": "pre-commit-hooks", "simple-nixos-mailserver": "simple-nixos-mailserver", "xmonad-ng": "xmonad-ng" @@ -671,11 +623,11 @@ ] }, "locked": { - "lastModified": 1689976554, - "narHash": "sha256-uWJq3sIhkqfzPmfB2RWd5XFVooGFfSuJH9ER/r302xQ=", + "lastModified": 1695910380, + "narHash": "sha256-CyzeiXQGm8ceEOSK1dffBCfO7JNp8XhQeNkUiJ5HxgY=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "c63f6e7b053c18325194ff0e274dba44e8d2271e", + "rev": "84783b661ecf33927c534b6476beb74ea3308968", "type": "gitlab" }, "original": { diff --git a/flake.nix b/flake.nix index b23943e..e1d5b8e 100644 --- a/flake.nix +++ b/flake.nix @@ -124,19 +124,6 @@ }; }; - pollymc = { - type = "github"; - owner = "fn2006"; - repo = "PollyMC"; - ref = "7.2"; - inputs = { - flake-compat.follows = "flake-compat"; - flake-parts.follows = "flake-parts"; - nixpkgs.follows = "nixpkgs"; - pre-commit-hooks.follows = "pre-commit-hooks"; - }; - }; - dns-nix = { type = "github"; owner = "kirelagin"; diff --git a/modules/common/common/nix/default.nix b/modules/common/common/nix/default.nix index bbb06d0..03918d7 100644 --- a/modules/common/common/nix/default.nix +++ b/modules/common/common/nix/default.nix @@ -87,22 +87,19 @@ with lib; { ( _: super: { grc = super.grc.overrideAttrs (_: final: { - version = "devel"; - + version = "unstable-2021-08-12"; src = super.fetchFromGitHub { owner = "garabik"; repo = "grc"; rev = "4d6a51fd78ad7e19af8dd12b2a828d1807267079"; hash = "sha256-SmOZrgV0lgLryFoxADU15IKJ7jhxXar0MgbsV/z1GaE="; }; - patches = [ (super.fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/garabik/grc/pull/214.patch"; hash = "sha256-VNr9jl5oFbFNJbGsjflwFV3oTbCzJ0lBIZA4eyeoXLY="; }) ]; - postPatch = final.postPatch + '' @@ -112,14 +109,36 @@ with lib; { }); alejandra = super.alejandra.overrideAttrs (_: final: { - patches = final.patches ++ [./patches/alejandra-no-ads.patch]; - }); - - telegram-desktop = super.telegram-desktop.overrideAttrs (_: final: { - patches = final.patches ++ [./patches/telegram-desktop-no-ads.patch]; + patches = + final.patches + ++ [ + ./patches/alejandra-no-ads.patch + ]; }); - inherit (pkgsPr 245433 "sha256-FF1WW0+/pJ15+mPVjv0bkrh0dpHfQU08HNat2gu1PQk=") openmw; + prismlauncher-unwrapped = + (super.prismlauncher-unwrapped.override (finalAttrs: { + stdenv = pkgs.useMoldLinker finalAttrs.stdenv; + })) + .overrideAttrs (_: final: { + patches = + final.patches + ++ [ + ./patches/prismlauncher-allow-offline-accounts.patch + ]; + }); + + telegram-desktop = + (super.telegram-desktop.override (finalAttrs: { + stdenv = pkgs.useMoldLinker finalAttrs.stdenv; + })) + .overrideAttrs (_: final: { + patches = + final.patches + ++ [ + ./patches/telegram-desktop-no-ads.patch + ]; + }); } ) ]; diff --git a/modules/common/common/nix/patches/prismlauncher-allow-offline-accounts.patch b/modules/common/common/nix/patches/prismlauncher-allow-offline-accounts.patch new file mode 100644 index 0000000..c245066 --- /dev/null +++ b/modules/common/common/nix/patches/prismlauncher-allow-offline-accounts.patch @@ -0,0 +1,24 @@ +diff --git i/launcher/ui/pages/global/AccountListPage.cpp w/launcher/ui/pages/global/AccountListPage.cpp +index 278f45c4..b65cbbfb 100644 +--- i/launcher/ui/pages/global/AccountListPage.cpp ++++ w/launcher/ui/pages/global/AccountListPage.cpp +@@ -188,19 +188,6 @@ void AccountListPage::on_actionAddMicrosoft_triggered() + + void AccountListPage::on_actionAddOffline_triggered() + { +- if (!m_accounts->anyAccountIsValid()) { +- QMessageBox::warning( +- this, +- tr("Error"), +- tr( +- "You must add a Microsoft or Mojang account that owns Minecraft before you can add an offline account." +- "<br><br>" +- "If you have lost your account you can contact Microsoft for support." +- ) +- ); +- return; +- } +- + MinecraftAccountPtr account = OfflineLoginDialog::newAccount( + this, + tr("Please enter your desired username to add your offline account.") diff --git a/modules/common/git.nix b/modules/common/git.nix index 70fb7c7..de401fb 100644 --- a/modules/common/git.nix +++ b/modules/common/git.nix @@ -68,6 +68,7 @@ in { submodule = "log"; }; init.defaultBranch = "master"; + push.autoSetupRemote = true; status.submoduleSummary = true; github.user = my.username; gitlab.user = my.username; @@ -96,6 +97,11 @@ in { in { fuck = "!${git} reset --hard && ${git} clean -fdx"; gud = ''commit -m "git gud"''; + review = "!${git} lg @{push}.."; + reword = "commit --amend"; + tree = "log --graph --date=relative --pretty=tformat:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%an %ad)%Creset'"; + uncommit = "reset --soft HEAD~1"; + untrack = "rm --cache --"; wtc = "!${curl} -sq whatthecommit.com/index.txt | ${git} commit -F -"; }; diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 5b9a3be..e8c9467 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -8,7 +8,6 @@ _: { ./chromium.nix ./clickhouse.nix ./common - ./discord.nix ./docker.nix ./dwm.nix ./emacs.nix diff --git a/modules/nixos/discord.nix b/modules/nixos/discord.nix deleted file mode 100644 index 69ab525..0000000 --- a/modules/nixos/discord.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -with lib; let - cfg = config.nixfiles.modules.discord; -in { - options.nixfiles.modules.discord.enable = - mkEnableOption "Steam runtime"; - - config = mkIf cfg.enable { - nixfiles.modules.common.nix.allowedUnfreePackages = ["discord"]; - - hm.home.packages = with pkgs; [ - (discord.override { - withOpenASAR = false; # This doesnt work. - }) - ]; - }; -} diff --git a/modules/nixos/firefox/userContent.css b/modules/nixos/firefox/userContent.css index 5a297ab..e95c733 100644 --- a/modules/nixos/firefox/userContent.css +++ b/modules/nixos/firefox/userContent.css @@ -49,27 +49,31 @@ @-moz-document regexp("https?://(.*\.)?github.com.*") { - #org-repo-pin-select-menu, - #sponsor-button, - .dropdown-divider, - .footer, - .octicon.octicon-info, + .Overlay-footer, + .color-fg-muted.f6.mt-4, /* GitHub profile guide. */ + .flex-order-1.flex-md-order-none, /* Follow button. */ + .js-user-status-item, + .protip, .pt-3.mt-3.d-none.d-md-block, /* Profile achievements. */ - .starring-container, - .user-following-container, - .user-profile-link, + .text-small.color-fg-muted.mx-md-2.mt-3.mt-md-2.mb-2, /* Community guidelines. */ .user-status-circle-badge-container, .user-status-container, a[href^="/account/choose?action=upgrade"], a[href^="/codespaces"], a[href^="/collections"], + a[href^="/contact/report-content"], a[href^="/events"], a[href^="/explore"], + a[href^="/github-copilot"], a[href^="/marketplace"], a[href^="/organizations/enterprise"], + a[href^="/settings/enterprises"], a[href^="/sponsors"], a[href^="/topics"], - a[href^="/trending"] { + a[href^="/trending"], + details[id^="funding-links-modal"], + footer + { display: none !important; } diff --git a/modules/nixos/games/minecraft.nix b/modules/nixos/games/minecraft.nix index f738c33..2242df4 100644 --- a/modules/nixos/games/minecraft.nix +++ b/modules/nixos/games/minecraft.nix @@ -31,9 +31,7 @@ in { config = mkMerge [ (mkIf cfg.client.enable { - hm.home.packages = with pkgs; [pollymc-unwrapped]; - - nixpkgs.overlays = [inputs.pollymc.overlays.default]; + hm.home.packages = [pkgs.prismlauncher]; }) (mkIf cfg.server.enable { nixfiles.modules.common.nix.allowedUnfreePackages = ["minecraft-server"]; diff --git a/nixosConfigurations/eonwe/default.nix b/nixosConfigurations/eonwe/default.nix index 21e4558..e6c6e5e 100644 --- a/nixosConfigurations/eonwe/default.nix +++ b/nixosConfigurations/eonwe/default.nix @@ -6,7 +6,7 @@ }: with lib; { imports = [ - ./work.nix + ./hidden.nix ]; nixfiles.modules = { @@ -39,7 +39,6 @@ with lib; { gzdoom iaito kdenlive - krdc obs-studio openmw openttd @@ -47,6 +46,7 @@ with lib; { qzdl radeontop vcmi + vesktop vial wireshark xonotic |