diff --git a/Hosts/rose/hardware-configuration.nix b/Hosts/rose/hardware-configuration.nix index d34c415..0a7f9d2 100644 --- a/Hosts/rose/hardware-configuration.nix +++ b/Hosts/rose/hardware-configuration.nix @@ -14,15 +14,15 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/0d45bdbe-5542-4f60-878e-5d9cae9be310"; + { device = "/dev/disk/by-uuid/406eb55d-7eea-42ba-8af1-878617c40b6c"; fsType = "btrfs"; options = [ "subvol=@" "compress=zstd" ]; }; - boot.initrd.luks.devices."luks-735556dc-f934-4c07-a75e-6287448a4d1b".device = "/dev/disk/by-uuid/735556dc-f934-4c07-a75e-6287448a4d1b"; + boot.initrd.luks.devices."luks-2fdce7f8-f538-4671-90e8-476ae26ea069".device = "/dev/disk/by-uuid/2fdce7f8-f538-4671-90e8-476ae26ea069"; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/CCD3-4946"; + { device = "/dev/disk/by-uuid/EE1F-3752"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; }; @@ -35,6 +35,7 @@ # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; # networking.interfaces.eno1.useDHCP = lib.mkDefault true; + # networking.interfaces.enp0s20f0u5.useDHCP = lib.mkDefault true; # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; diff --git a/Modules/Home/Core/CLI/default.nix b/Modules/Home/Core/CLI/default.nix index ff901cd..aa18bff 100644 --- a/Modules/Home/Core/CLI/default.nix +++ b/Modules/Home/Core/CLI/default.nix @@ -2,7 +2,7 @@ { imports = [ - ./flatpak.nix + #./flatpak.nix ./syncthing.nix ./kdeconnect.nix #./gpg.nix diff --git a/Modules/Home/Core/Games/Minecraft/default.nix b/Modules/Home/Core/Games/Minecraft/default.nix index 00f6a5e..ec206dd 100644 --- a/Modules/Home/Core/Games/Minecraft/default.nix +++ b/Modules/Home/Core/Games/Minecraft/default.nix @@ -14,8 +14,8 @@ services.minecraft-servers = { servers = { mx = { enable = true; - package = pkgs.fabricServers.fabric-1_20_1.override { - loaderVersion = "0.16.7"; + package = pkgs.fabricServers.fabric-1_21_4.override { + #loaderVersion = "0.16.7"; #jre_headless = pkgs.temurin-jre-bin-21; }; openFirewall = true; @@ -48,197 +48,197 @@ services.minecraft-servers = { "server-icon.png" = ./server-icon.png; # Fetching from the internet - mods = pkgs.linkFarmFromDrvs "mods" (builtins.attrValues { - MixinConflictHelper = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/MR1VIQJJ/versions/8dRAFcey/MixinConflictHelper-1.2.0.jar"; - sha256 = "sha256-TWM30iINbCZYE1LyWitO68Bxe9NzH7zRhl4id97mBLo="; - }; -# bettercombat = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/5sy6g3kz/versions/qxfX3jsR/bettercombat-fabric-1.8.6%2B1.20.1.jar"; -# sha256 = "sha256-9CB8QuoLiA2hDgrXff1h2e7uoVT8RsMTMNxZXaHhdt4="; -# }; - ferritecore = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/uXXizFIs/versions/unerR5MN/ferritecore-6.0.1-fabric.jar"; - sha256 = "sha256-x7oRGKBbLakA0cNp++EBej4+w8r+XlE5i4USebm+zyQ="; - }; - krypton = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/fQEb0iXm/versions/jiDwS0W1/krypton-0.2.3.jar"; - sha256 = "sha256-aa0YECBs4SGBsbCDZA8ETn4lB4HDbJbGVerDYgkFdpg="; - }; - lithium = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/ZSNsJrPI/lithium-fabric-mc1.20.1-0.11.2.jar"; - sha256 = "sha256-oMWVNV1oDgyHv46uuv7f9pANTncajWiU7m0tQ3Tejfk="; - }; - chunky = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/fALzjamp/versions/NHWYq9at/Chunky-1.3.146.jar"; - sha256 = "sha256-rn+501o6nZ1PIQSurnsxqQHF5YQokeLt2d3MQsJkajg="; - }; - chunkyborder = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/s86X568j/versions/74w5ono0/ChunkyBorder-1.1.53.jar"; - sha256 = "sha256-gugJX8t90qIIlvq/Nj1IOdIM0WSquMJNYYET6eIQn1U="; - }; - ccapi = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/9s6osm5g/versions/2xQdCMyG/cloth-config-11.1.136-fabric.jar"; - sha256 = "sha256-hE9JwznI8xROFnqyG30AWfDVcQVOJihaB0k0jaJcSfo="; - }; - fabapi = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/P7uGFii0/fabric-api-0.92.2%2B1.20.1.jar"; - sha256 = "sha256-RQD4RMRVc9A51o05Y8mIWqnedxJnAhbgrT5d8WxncPw="; - }; - ybd = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/o1C1Dkj5/versions/nidyvq2m/YungsBetterDungeons-1.20-Fabric-4.0.4.jar"; - sha256 = "sha256-bGn9AxbESM+ccLctvqQkqFvogfmtw+elbo8LCONhH/8="; - }; - ye = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/ZYgyPyfq/versions/pfVTUz1L/YungsExtras-1.20-Fabric-4.0.3.jar"; - sha256 = "sha256-F2XQiF6OvlMK6B8rKuPW2TyEK7BOA7294A8rRckYyXo="; - }; - ybm = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/HjmxVlSr/versions/qLnQnqXS/YungsBetterMineshafts-1.20-Fabric-4.0.4.jar"; - sha256 = "sha256-CkZXaJIXM5ofYHmi2d2gP20BvqysWcFOCT3tM1fbK4Y="; - }; - ybdt = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/XNlO7sBv/versions/1Z9HNWpj/YungsBetterDesertTemples-1.20-Fabric-3.0.3.jar"; - sha256 = "sha256-eQ4xwqGRlLgcoNwTRpSlufk1xcGcUKrc+0+QphPBm/8="; - }; - ybom = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/3dT9sgt4/versions/4c00pjbt/YungsBetterOceanMonuments-1.20-Fabric-3.0.4.jar"; - sha256 = "sha256-MBNIS87uclQKHrdtQDoMNtsP1tmaHhtaOYs3ylDyf7I="; - }; - yb = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/Ht4BfYp6/versions/hvfjXu8d/YungsBridges-1.20-Fabric-4.0.3.jar"; - sha256 = "sha256-mkVIcn/SL9Bu+lpwtL2gIxJJvhB6pbkazGFZgdVY67A="; - }; - yapi = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/Ua7DFN59/versions/lscV1N5k/YungsApi-1.20-Fabric-4.0.6.jar"; - sha256 = "sha256-Jrbcgfh2qr89U+rVnlkIqLD1Q01GwVDP03bAJ6xUBT4="; - }; - ybs = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/kidLKymU/versions/yV6hn0bB/YungsBetterStrongholds-1.20-Fabric-4.0.3.jar"; - sha256 = "sha256-Eit01ZYpv3VWYyY6TOQ+WKXRO3Tme+ozLUSpvttRt0o="; - }; - ybwh = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/t5FRdP87/versions/lYpHN3iF/YungsBetterWitchHuts-1.20-Fabric-3.0.3.jar"; - sha256 = "sha256-ehoivpUDu3VW6G60RxpQrNYY/IhZDVQWTTWZyf26lOg="; - }; - ybnf = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/Z2mXHnxP/versions/FL88RLRu/YungsBetterNetherFortresses-1.20-Fabric-2.0.6.jar"; - sha256 = "sha256-k+DlN/zyCxjA6jQObU8sICJaKcRSUrnPeOIFEHq08Do="; - }; - ybnt = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/z9Ve58Ih/versions/6LPrzuB0/YungsBetterJungleTemples-1.20-Fabric-2.0.5.jar"; - sha256 = "sha256-RL7iDn9RLYRobsU2rI3WvQeBG45k0A6kjEcMk91eKeg="; - }; - ybei = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/2BwBOmBQ/versions/qJTsmyiE/YungsBetterEndIsland-1.20-Fabric-2.0.6.jar"; - sha256 = "sha256-jmGDo4DBdnfSPV13kNBL8YWJ7RKGdGDs4yMn6HZQRvo="; - }; -# nethermap = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/fdtm99de/versions/w97ixzc7/nethermap-3.0.0-1.20.1.jar"; -# sha256 = "sha256-2ivOs5Xxyl9tQ1Vj/2NHOshIsbYvVizye5tMonCAJCs="; -# }; - treeharvester = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/abooMhox/versions/eeRIweZ0/treeharvester-1.20.1-9.1.jar"; - sha256 = "sha256-1nVch4clnSfbYyprpkzOmzQ15LDh+S+5RNobmagxLxA="; - }; - plasmovoice = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/1bZhdhsH/versions/9ha1XP2j/plasmovoice-fabric-1.20.1-2.1.1.jar"; - sha256 = "sha256-wq5PSK1+oc6M6f+wkJ7J3zrh1zDfCCthBwjMS8L2DXk="; - }; - collective = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/e0M1UDsY/versions/aNzU64AT/collective-1.20.1-7.87.jar"; - sha256 = "sha256-VwIjJoCPMc57qx5MFp27/sMggVyawQ0KykDxdLWmmfM="; - }; - pv-addon-groups = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/g2HFPeCl/versions/UrbDrJ9B/pv-addon-groups-1.1.0.jar"; - sha256 = "sha256-gKonbs0+ppSegQzOBanJ50KXO3hQFGwgLbShI5fdf0Y="; - }; - pv-addon-sculk = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/7dI2zrDy/versions/HmseAzbt/pv-addon-sculk-1.1.0.jar"; - sha256 = "sha256-bjwZXJdr4p0g436j6Ny0iTQsgT6E6cNWGznP4KVDIo8="; - }; - pv-addon-broadcast = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/ZI9h3Y7k/versions/RNSzWpVe/pv-addon-broadcast-1.1.0.jar"; - sha256 = "sha256-PE45WC17cjYSmpzKQkEtX679G6VPLmN+0QJ8B5HzHQg="; - }; - pv-addon-spectator = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/bZwNKr3n/versions/ugWqtFbc/pv-addon-spectator-1.1.0.jar"; - sha256 = "sha256-ZHA+/D6FIakV/R6EDlIoUvFarMrK8gL8d8fAIpxkb9o="; - }; - pv-addon-whisper = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/pZxauj81/versions/ZgizC1Oe/pv-addon-whisper-1.1.0.jar"; - sha256 = "sha256-Asim/kQNojegS6G7SMYbCzZGUPdvNY0AvneMRZUbYAI="; - }; - pv-addon-priority = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/DoKOaUOC/versions/xPHUGv4E/pv-addon-priority-1.1.0.jar"; - sha256 = "sha256-OL3l6ocXJlnm3CRv0mbsWTzKIMMDN5HpamJM+BgUfG8="; - }; - pv-addon-lavaplayer-lib = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/Kx9d4acU/versions/9mqvAql8/pv-addon-lavaplayer-lib-1.1.0.jar"; - sha256 = "sha256-4Ot+Akw0DM++6eVIs8MzLxSp/mZIngPWeV1KQro8XkA="; - }; - spark = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/l6YH9Als/versions/XGW2fviP/spark-1.10.53-fabric.jar"; - sha256 = "sha256-AMA05oT6RHG0FTncKajTnMbyLrKbL6QjiV78l4o5HS0="; - }; - sleep = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/WTzuSu8P/versions/R5tblQON/sleep-v.2.1.2.jar"; - sha256 = "sha256-9ykEnw0qtvhfkHpD299KHEKCjvLRJaJ95Y9rShRQl1c="; - }; - tcdcommons-api = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/Eldc1g37/versions/2mfYVOhd/tcdcommons-3.9.7%2Bfabric-1.20.1.jar"; - sha256 = "sha256-fOGKYmcY/9BI6CPmECOMzV7DqXUQiY+//vBMtOxHpYI="; - }; -# rei = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/nfn13YXA/versions/Lg9Hl5NP/RoughlyEnoughItems-12.1.780-fabric.jar"; -# sha256 = "sha256-PjTDlAkj324GBWlYqDTnGkdJrurfTktMEPGQD+Svolc="; -# }; - terralith = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/8oi3bsk5/versions/YFeeBgIL/Terralith_1.20_v2.5.4.zip"; - sha256 = "sha256-9oItTcUMfo5NPcCncAxiOm3pqd9yOhtsIwdaWy34YMw="; - }; - player-animation-lib = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/gedNE4y2/versions/yDqYTUaf/player-animation-lib-fabric-1.0.2-rc1%2B1.20.jar"; - sha256 = "sha256-CxACH6Y4mXOYEQd3dHcmsct6J7w/j/GxLiuTrAF4QBg="; - }; - emi = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/fRiHVvU7/versions/L452maHz/emi-1.1.16%2B1.20.1%2Bfabric.jar"; - sha256 = "sha256-yJ6uB5xPiI0OIsIUjrTFFDYSfK3XbHWSLxuAs35yNhQ="; - }; - gauntlets = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/daIJrdNd/versions/w7gNtOs3/gauntlets-1.0.0.jar"; - sha256 = "sha256-yrOiVbf/KD8CPTauMNEg5r4OBAdej8665Ctbju/jj1Q="; - }; - addadd = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/R4TvILfj/versions/1ljqbdZZ/AdditionalAdditions-6.0.1.jar"; - sha256 = "sha256-4S1WwlTyUqQpQ8MlEZHj89cRjseNEkTOy/BK8zySu28="; - }; - morevanillashields = pkgs.fetchurl { url = "https://mediafilez.forgecdn.net/files/5841/255/morevanillashields-1.0.5-1.20.1.jar"; - sha256 = "sha256-EbFe+9S11E+kohMjYlNdjBtnW7nGOnB5Lm9stPxGiLQ="; - }; - simplyswords = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/bK3Ubu9p/versions/xe5E39uw/simplyswords-fabric-1.56.0-1.20.1.jar"; - sha256 = "sha256-3br4q4WmsAOoF9DA6Bfcvfn8/muInHKf9yxLajsfPpo="; - }; - architectury = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/lhGA9TYQ/versions/WbL7MStR/architectury-9.2.14-fabric.jar"; - sha256 = "sha256-vXpwMr7bL/lsaZGoRqRMhXM2pRRCoQX1hZAX6LqdEyE="; - }; - wthit = pkgs.fetchurl { url = "https://mediafilez.forgecdn.net/files/5721/800/wthit-fabric-8.15.2.jar"; - sha256 = "sha256-UmiT6uXRN65uQVz8OfWnOI7d4QNUYah05F7NsB02HCk="; - }; - badpackets = pkgs.fetchurl { url = "https://mediafilez.forgecdn.net/files/4784/394/badpackets-fabric-0.4.3.jar"; - sha256 = "sha256-SmuEziDXo10X74b+KUF95vJXBPR47i9fksfC7nbqiZ4="; - }; - reputation = pkgs.fetchurl { url = "https://mediafilez.forgecdn.net/files/4594/936/your-reputation-0.2.4%2Bwthit.1.20.jar"; - sha256 = "sha256-zGmr3hYc80TAjdl8yHXNYY20qCRopgPqp9lapcSrVeM="; - }; - alloy-forgery = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/jhl28YkY/versions/j3GoCoCc/alloy-forgery-2.1.2%2B1.20.jar"; - sha256 = "sha256-6ujgZRPEWPirqDlhiAeKIuLGXxIo9I9SiNF1VDlRhmY="; - }; - mythicmetals = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/bAWzYNRd/versions/usAeRRkO/mythicmetals-0.19.9%2B1.20.1.jar"; - sha256 = "sha256-OLGfB3LG6CJbgXFGcBqPyBQAp3sNXNjxlD6IpYBDjec="; - }; - basic_fluid_hopper = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/P5cDzldd/versions/pb2kE9LA/basic_fluid_hopper-fabric-0.4.0-1.20.1.jar"; - sha256 = "sha256-Vqg+gToU6PSl15e0S56kkn+FjA9NLF2BVIMp3fcS2y0="; - }; - largefluidtank = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/uMlJQMHT/versions/llOBsGfb/largefluidtank-fabric-20.7.5.jar"; - sha256 = "sha256-kXXP75LMBs2epoYzskRQtYGxAfBFCddaj8OG8sG9X2o="; - }; - YetAnotherConfigLib = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/1eAoo2KR/versions/nYfjbBJd/YetAnotherConfigLib-3.6.1%2B1.20.1-fabric.jar"; - sha256 = "sha256-pKmEPHKEYkOgbnKWHwMOMWfQmX8Y6uo6FIL4TO3m8kU="; - }; - fluidlogged = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/BnXpPaut/versions/BQ0t7nK0/fluidlogged-2.0.1-beta.2-fabric-mc1.20.1.jar"; - sha256 = "sha256-VuF3PVcYjRTU9JfZh16yLFIOIJlEKDicJ1PkmlwVKvE="; - }; -# owo-lib = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/ccKDOlHs/versions/zyOBB7J4/owo-lib-0.11.2%2B1.20.jar"; -# sha256 = "sha256-HCScMNPlC7pcs14MOs6/S9X5ab0zQC3i86amGf1ojRI="; -# }; - scalablecatsforce = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/zr0QMQMo/versions/hFiNqs6b/scalable-cats-force-fabric-3.1.2.jar"; - sha256 = "sha256-MoU61/KWLwas6eAmElZ67WMgHkUqCuLzh3YL1bJ/CHU="; - }; -# harvestwithease = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/W4Ajthd2/versions/F0rAkd7c/harvest-with-ease-fabric-1.20.1-9.2.0.jar"; -# sha256 = "sha256-dSjk58el51klnU6hfPGIqJbTrQzFE9GrPdzpLea21tQ="; -# }; - veganrecipes = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/LlKsFkYG/versions/OeKZ7GLp/All%20Vegan%20Recipes%20v1.3%20%281.20-1.21.2%29.zip"; - sha256 = "sha256-FCNN7ljVaAL0K60U8hAbKfAnEiiBqAmt69t7jm7Ltm8="; - }; - farmersdelight = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/7vxePowz/versions/NoioB3or/FarmersDelight-1.20.1-2.1.6%2Brefabricated.jar"; - sha256 = "sha256-OaHLQTB16OM8c4Sd1o7ytY+N/dTlWtzcnxNBnc6B5tw="; - }; - moredelight = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/znHQQtuU/versions/zst5fZig/moredelight-24.09.27-1.20-fabric.jar"; - sha256 = "sha256-eWcvzPAo76fTm/A8WTqKpkvUvj03+hwn03TPi2IPk7U="; - }; - Vegandelight = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/vtNhfMsL/versions/NtTxqoSb/VeganDelightFabric-1.1.0.jar"; - sha256 = "sha256-EOijCuqqWNT44g8TTvtcvbP6p98Xc7psMmJTY9Yq6K4="; - }; - forge-config-api = pkgs.fetchurl { url = "https://modrinth.com/mod/forge-config-api-port/version/v8.0.0-1.20.1-Fabric"; - sha256 = "sha256-I9sbpmWwaXoeugONZ8yt3S8ca6IIn+QV98+Oqx74TRo="; - }; - essential = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/k2ZPuTBm/versions/dpx10jgF/essential_1-3-4-3_forge_1-20-1.jar"; - sha256 = "sha256-U8W3XT35h7v1/7jj4a674E4QqsfkQHPvHkV7gYiAuNI="; - }; - cobweb = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/dQcfqGbl/versions/AyWecby3/cobweb-fabric-1.20.1-1.0.0.jar"; - sha256 = "sha256-zdMRaZwBOmlP93xZk3P6zzc/ZeCkxMYwE7at02lXlu0="; - }; - }); +# mods = pkgs.linkFarmFromDrvs "mods" (builtins.attrValues { +# MixinConflictHelper = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/MR1VIQJJ/versions/8dRAFcey/MixinConflictHelper-1.2.0.jar"; +# sha256 = "sha256-TWM30iINbCZYE1LyWitO68Bxe9NzH7zRhl4id97mBLo="; +# }; +# # bettercombat = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/5sy6g3kz/versions/qxfX3jsR/bettercombat-fabric-1.8.6%2B1.20.1.jar"; +# # sha256 = "sha256-9CB8QuoLiA2hDgrXff1h2e7uoVT8RsMTMNxZXaHhdt4="; +# # }; +# ferritecore = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/uXXizFIs/versions/unerR5MN/ferritecore-6.0.1-fabric.jar"; +# sha256 = "sha256-x7oRGKBbLakA0cNp++EBej4+w8r+XlE5i4USebm+zyQ="; +# }; +# krypton = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/fQEb0iXm/versions/jiDwS0W1/krypton-0.2.3.jar"; +# sha256 = "sha256-aa0YECBs4SGBsbCDZA8ETn4lB4HDbJbGVerDYgkFdpg="; +# }; +# lithium = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/ZSNsJrPI/lithium-fabric-mc1.20.1-0.11.2.jar"; +# sha256 = "sha256-oMWVNV1oDgyHv46uuv7f9pANTncajWiU7m0tQ3Tejfk="; +# }; +# chunky = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/fALzjamp/versions/NHWYq9at/Chunky-1.3.146.jar"; +# sha256 = "sha256-rn+501o6nZ1PIQSurnsxqQHF5YQokeLt2d3MQsJkajg="; +# }; +# chunkyborder = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/s86X568j/versions/74w5ono0/ChunkyBorder-1.1.53.jar"; +# sha256 = "sha256-gugJX8t90qIIlvq/Nj1IOdIM0WSquMJNYYET6eIQn1U="; +# }; +# ccapi = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/9s6osm5g/versions/2xQdCMyG/cloth-config-11.1.136-fabric.jar"; +# sha256 = "sha256-hE9JwznI8xROFnqyG30AWfDVcQVOJihaB0k0jaJcSfo="; +# }; +# fabapi = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/P7uGFii0/fabric-api-0.92.2%2B1.20.1.jar"; +# sha256 = "sha256-RQD4RMRVc9A51o05Y8mIWqnedxJnAhbgrT5d8WxncPw="; +# }; +# ybd = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/o1C1Dkj5/versions/nidyvq2m/YungsBetterDungeons-1.20-Fabric-4.0.4.jar"; +# sha256 = "sha256-bGn9AxbESM+ccLctvqQkqFvogfmtw+elbo8LCONhH/8="; +# }; +# ye = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/ZYgyPyfq/versions/pfVTUz1L/YungsExtras-1.20-Fabric-4.0.3.jar"; +# sha256 = "sha256-F2XQiF6OvlMK6B8rKuPW2TyEK7BOA7294A8rRckYyXo="; +# }; +# ybm = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/HjmxVlSr/versions/qLnQnqXS/YungsBetterMineshafts-1.20-Fabric-4.0.4.jar"; +# sha256 = "sha256-CkZXaJIXM5ofYHmi2d2gP20BvqysWcFOCT3tM1fbK4Y="; +# }; +# ybdt = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/XNlO7sBv/versions/1Z9HNWpj/YungsBetterDesertTemples-1.20-Fabric-3.0.3.jar"; +# sha256 = "sha256-eQ4xwqGRlLgcoNwTRpSlufk1xcGcUKrc+0+QphPBm/8="; +# }; +# ybom = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/3dT9sgt4/versions/4c00pjbt/YungsBetterOceanMonuments-1.20-Fabric-3.0.4.jar"; +# sha256 = "sha256-MBNIS87uclQKHrdtQDoMNtsP1tmaHhtaOYs3ylDyf7I="; +# }; +# yb = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/Ht4BfYp6/versions/hvfjXu8d/YungsBridges-1.20-Fabric-4.0.3.jar"; +# sha256 = "sha256-mkVIcn/SL9Bu+lpwtL2gIxJJvhB6pbkazGFZgdVY67A="; +# }; +# yapi = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/Ua7DFN59/versions/lscV1N5k/YungsApi-1.20-Fabric-4.0.6.jar"; +# sha256 = "sha256-Jrbcgfh2qr89U+rVnlkIqLD1Q01GwVDP03bAJ6xUBT4="; +# }; +# ybs = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/kidLKymU/versions/yV6hn0bB/YungsBetterStrongholds-1.20-Fabric-4.0.3.jar"; +# sha256 = "sha256-Eit01ZYpv3VWYyY6TOQ+WKXRO3Tme+ozLUSpvttRt0o="; +# }; +# ybwh = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/t5FRdP87/versions/lYpHN3iF/YungsBetterWitchHuts-1.20-Fabric-3.0.3.jar"; +# sha256 = "sha256-ehoivpUDu3VW6G60RxpQrNYY/IhZDVQWTTWZyf26lOg="; +# }; +# ybnf = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/Z2mXHnxP/versions/FL88RLRu/YungsBetterNetherFortresses-1.20-Fabric-2.0.6.jar"; +# sha256 = "sha256-k+DlN/zyCxjA6jQObU8sICJaKcRSUrnPeOIFEHq08Do="; +# }; +# ybnt = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/z9Ve58Ih/versions/6LPrzuB0/YungsBetterJungleTemples-1.20-Fabric-2.0.5.jar"; +# sha256 = "sha256-RL7iDn9RLYRobsU2rI3WvQeBG45k0A6kjEcMk91eKeg="; +# }; +# ybei = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/2BwBOmBQ/versions/qJTsmyiE/YungsBetterEndIsland-1.20-Fabric-2.0.6.jar"; +# sha256 = "sha256-jmGDo4DBdnfSPV13kNBL8YWJ7RKGdGDs4yMn6HZQRvo="; +# }; +# # nethermap = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/fdtm99de/versions/w97ixzc7/nethermap-3.0.0-1.20.1.jar"; +# # sha256 = "sha256-2ivOs5Xxyl9tQ1Vj/2NHOshIsbYvVizye5tMonCAJCs="; +# # }; +# treeharvester = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/abooMhox/versions/eeRIweZ0/treeharvester-1.20.1-9.1.jar"; +# sha256 = "sha256-1nVch4clnSfbYyprpkzOmzQ15LDh+S+5RNobmagxLxA="; +# }; +# plasmovoice = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/1bZhdhsH/versions/9ha1XP2j/plasmovoice-fabric-1.20.1-2.1.1.jar"; +# sha256 = "sha256-wq5PSK1+oc6M6f+wkJ7J3zrh1zDfCCthBwjMS8L2DXk="; +# }; +# collective = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/e0M1UDsY/versions/aNzU64AT/collective-1.20.1-7.87.jar"; +# sha256 = "sha256-VwIjJoCPMc57qx5MFp27/sMggVyawQ0KykDxdLWmmfM="; +# }; +# pv-addon-groups = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/g2HFPeCl/versions/UrbDrJ9B/pv-addon-groups-1.1.0.jar"; +# sha256 = "sha256-gKonbs0+ppSegQzOBanJ50KXO3hQFGwgLbShI5fdf0Y="; +# }; +# pv-addon-sculk = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/7dI2zrDy/versions/HmseAzbt/pv-addon-sculk-1.1.0.jar"; +# sha256 = "sha256-bjwZXJdr4p0g436j6Ny0iTQsgT6E6cNWGznP4KVDIo8="; +# }; +# pv-addon-broadcast = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/ZI9h3Y7k/versions/RNSzWpVe/pv-addon-broadcast-1.1.0.jar"; +# sha256 = "sha256-PE45WC17cjYSmpzKQkEtX679G6VPLmN+0QJ8B5HzHQg="; +# }; +# pv-addon-spectator = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/bZwNKr3n/versions/ugWqtFbc/pv-addon-spectator-1.1.0.jar"; +# sha256 = "sha256-ZHA+/D6FIakV/R6EDlIoUvFarMrK8gL8d8fAIpxkb9o="; +# }; +# pv-addon-whisper = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/pZxauj81/versions/ZgizC1Oe/pv-addon-whisper-1.1.0.jar"; +# sha256 = "sha256-Asim/kQNojegS6G7SMYbCzZGUPdvNY0AvneMRZUbYAI="; +# }; +# pv-addon-priority = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/DoKOaUOC/versions/xPHUGv4E/pv-addon-priority-1.1.0.jar"; +# sha256 = "sha256-OL3l6ocXJlnm3CRv0mbsWTzKIMMDN5HpamJM+BgUfG8="; +# }; +# pv-addon-lavaplayer-lib = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/Kx9d4acU/versions/9mqvAql8/pv-addon-lavaplayer-lib-1.1.0.jar"; +# sha256 = "sha256-4Ot+Akw0DM++6eVIs8MzLxSp/mZIngPWeV1KQro8XkA="; +# }; +# spark = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/l6YH9Als/versions/XGW2fviP/spark-1.10.53-fabric.jar"; +# sha256 = "sha256-AMA05oT6RHG0FTncKajTnMbyLrKbL6QjiV78l4o5HS0="; +# }; +# sleep = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/WTzuSu8P/versions/R5tblQON/sleep-v.2.1.2.jar"; +# sha256 = "sha256-9ykEnw0qtvhfkHpD299KHEKCjvLRJaJ95Y9rShRQl1c="; +# }; +# tcdcommons-api = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/Eldc1g37/versions/2mfYVOhd/tcdcommons-3.9.7%2Bfabric-1.20.1.jar"; +# sha256 = "sha256-fOGKYmcY/9BI6CPmECOMzV7DqXUQiY+//vBMtOxHpYI="; +# }; +# # rei = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/nfn13YXA/versions/Lg9Hl5NP/RoughlyEnoughItems-12.1.780-fabric.jar"; +# # sha256 = "sha256-PjTDlAkj324GBWlYqDTnGkdJrurfTktMEPGQD+Svolc="; +# # }; +# terralith = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/8oi3bsk5/versions/YFeeBgIL/Terralith_1.20_v2.5.4.zip"; +# sha256 = "sha256-9oItTcUMfo5NPcCncAxiOm3pqd9yOhtsIwdaWy34YMw="; +# }; +# player-animation-lib = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/gedNE4y2/versions/yDqYTUaf/player-animation-lib-fabric-1.0.2-rc1%2B1.20.jar"; +# sha256 = "sha256-CxACH6Y4mXOYEQd3dHcmsct6J7w/j/GxLiuTrAF4QBg="; +# }; +# emi = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/fRiHVvU7/versions/L452maHz/emi-1.1.16%2B1.20.1%2Bfabric.jar"; +# sha256 = "sha256-yJ6uB5xPiI0OIsIUjrTFFDYSfK3XbHWSLxuAs35yNhQ="; +# }; +# gauntlets = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/daIJrdNd/versions/w7gNtOs3/gauntlets-1.0.0.jar"; +# sha256 = "sha256-yrOiVbf/KD8CPTauMNEg5r4OBAdej8665Ctbju/jj1Q="; +# }; +# addadd = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/R4TvILfj/versions/1ljqbdZZ/AdditionalAdditions-6.0.1.jar"; +# sha256 = "sha256-4S1WwlTyUqQpQ8MlEZHj89cRjseNEkTOy/BK8zySu28="; +# }; +# morevanillashields = pkgs.fetchurl { url = "https://mediafilez.forgecdn.net/files/5841/255/morevanillashields-1.0.5-1.20.1.jar"; +# sha256 = "sha256-EbFe+9S11E+kohMjYlNdjBtnW7nGOnB5Lm9stPxGiLQ="; +# }; +# simplyswords = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/bK3Ubu9p/versions/xe5E39uw/simplyswords-fabric-1.56.0-1.20.1.jar"; +# sha256 = "sha256-3br4q4WmsAOoF9DA6Bfcvfn8/muInHKf9yxLajsfPpo="; +# }; +# architectury = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/lhGA9TYQ/versions/WbL7MStR/architectury-9.2.14-fabric.jar"; +# sha256 = "sha256-vXpwMr7bL/lsaZGoRqRMhXM2pRRCoQX1hZAX6LqdEyE="; +# }; +# wthit = pkgs.fetchurl { url = "https://mediafilez.forgecdn.net/files/5721/800/wthit-fabric-8.15.2.jar"; +# sha256 = "sha256-UmiT6uXRN65uQVz8OfWnOI7d4QNUYah05F7NsB02HCk="; +# }; +# badpackets = pkgs.fetchurl { url = "https://mediafilez.forgecdn.net/files/4784/394/badpackets-fabric-0.4.3.jar"; +# sha256 = "sha256-SmuEziDXo10X74b+KUF95vJXBPR47i9fksfC7nbqiZ4="; +# }; +# reputation = pkgs.fetchurl { url = "https://mediafilez.forgecdn.net/files/4594/936/your-reputation-0.2.4%2Bwthit.1.20.jar"; +# sha256 = "sha256-zGmr3hYc80TAjdl8yHXNYY20qCRopgPqp9lapcSrVeM="; +# }; +# alloy-forgery = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/jhl28YkY/versions/j3GoCoCc/alloy-forgery-2.1.2%2B1.20.jar"; +# sha256 = "sha256-6ujgZRPEWPirqDlhiAeKIuLGXxIo9I9SiNF1VDlRhmY="; +# }; +# mythicmetals = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/bAWzYNRd/versions/usAeRRkO/mythicmetals-0.19.9%2B1.20.1.jar"; +# sha256 = "sha256-OLGfB3LG6CJbgXFGcBqPyBQAp3sNXNjxlD6IpYBDjec="; +# }; +# basic_fluid_hopper = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/P5cDzldd/versions/pb2kE9LA/basic_fluid_hopper-fabric-0.4.0-1.20.1.jar"; +# sha256 = "sha256-Vqg+gToU6PSl15e0S56kkn+FjA9NLF2BVIMp3fcS2y0="; +# }; +# largefluidtank = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/uMlJQMHT/versions/llOBsGfb/largefluidtank-fabric-20.7.5.jar"; +# sha256 = "sha256-kXXP75LMBs2epoYzskRQtYGxAfBFCddaj8OG8sG9X2o="; +# }; +# YetAnotherConfigLib = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/1eAoo2KR/versions/nYfjbBJd/YetAnotherConfigLib-3.6.1%2B1.20.1-fabric.jar"; +# sha256 = "sha256-pKmEPHKEYkOgbnKWHwMOMWfQmX8Y6uo6FIL4TO3m8kU="; +# }; +# fluidlogged = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/BnXpPaut/versions/BQ0t7nK0/fluidlogged-2.0.1-beta.2-fabric-mc1.20.1.jar"; +# sha256 = "sha256-VuF3PVcYjRTU9JfZh16yLFIOIJlEKDicJ1PkmlwVKvE="; +# }; +# # owo-lib = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/ccKDOlHs/versions/zyOBB7J4/owo-lib-0.11.2%2B1.20.jar"; +# # sha256 = "sha256-HCScMNPlC7pcs14MOs6/S9X5ab0zQC3i86amGf1ojRI="; +# # }; +# scalablecatsforce = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/zr0QMQMo/versions/hFiNqs6b/scalable-cats-force-fabric-3.1.2.jar"; +# sha256 = "sha256-MoU61/KWLwas6eAmElZ67WMgHkUqCuLzh3YL1bJ/CHU="; +# }; +# # harvestwithease = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/W4Ajthd2/versions/F0rAkd7c/harvest-with-ease-fabric-1.20.1-9.2.0.jar"; +# # sha256 = "sha256-dSjk58el51klnU6hfPGIqJbTrQzFE9GrPdzpLea21tQ="; +# # }; +# veganrecipes = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/LlKsFkYG/versions/OeKZ7GLp/All%20Vegan%20Recipes%20v1.3%20%281.20-1.21.2%29.zip"; +# sha256 = "sha256-FCNN7ljVaAL0K60U8hAbKfAnEiiBqAmt69t7jm7Ltm8="; +# }; +# farmersdelight = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/7vxePowz/versions/NoioB3or/FarmersDelight-1.20.1-2.1.6%2Brefabricated.jar"; +# sha256 = "sha256-OaHLQTB16OM8c4Sd1o7ytY+N/dTlWtzcnxNBnc6B5tw="; +# }; +# moredelight = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/znHQQtuU/versions/zst5fZig/moredelight-24.09.27-1.20-fabric.jar"; +# sha256 = "sha256-eWcvzPAo76fTm/A8WTqKpkvUvj03+hwn03TPi2IPk7U="; +# }; +# Vegandelight = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/vtNhfMsL/versions/NtTxqoSb/VeganDelightFabric-1.1.0.jar"; +# sha256 = "sha256-EOijCuqqWNT44g8TTvtcvbP6p98Xc7psMmJTY9Yq6K4="; +# }; +# forge-config-api = pkgs.fetchurl { url = "https://modrinth.com/mod/forge-config-api-port/version/v8.0.0-1.20.1-Fabric"; +# sha256 = "sha256-I9sbpmWwaXoeugONZ8yt3S8ca6IIn+QV98+Oqx74TRo="; +# }; +# essential = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/k2ZPuTBm/versions/dpx10jgF/essential_1-3-4-3_forge_1-20-1.jar"; +# sha256 = "sha256-U8W3XT35h7v1/7jj4a674E4QqsfkQHPvHkV7gYiAuNI="; +# }; +# cobweb = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/dQcfqGbl/versions/AyWecby3/cobweb-fabric-1.20.1-1.0.0.jar"; +# sha256 = "sha256-zdMRaZwBOmlP93xZk3P6zzc/ZeCkxMYwE7at02lXlu0="; +# }; +# }); }; }; }; diff --git a/Modules/Home/Core/Games/default.nix b/Modules/Home/Core/Games/default.nix index 0fc37e6..fd4a532 100644 --- a/Modules/Home/Core/Games/default.nix +++ b/Modules/Home/Core/Games/default.nix @@ -2,6 +2,6 @@ { imports = [ ./steam.nix - #./Minecraft + ./Minecraft ]; } diff --git a/Modules/Home/Core/Network/Browser/chromium.nix b/Modules/Home/Core/Network/Browser/chromium.nix index 39a4ed7..0b40322 100644 --- a/Modules/Home/Core/Network/Browser/chromium.nix +++ b/Modules/Home/Core/Network/Browser/chromium.nix @@ -22,13 +22,13 @@ (createChromiumExtension { # ublock origin id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; - sha256 = "sha256:1h7hkch680kp40mrc1121l8rl1qxwplqwbl53ysy5kbp9jn77v1r"; + sha256 = "sha256:0lj0b5a2vga9x8nr12f9ijv1n0f8zcyzml19bzvw722jb98mic88"; version = "1.60.0"; }) (createChromiumExtension { # dark reader id = "eimadpbcbfnmbkopoojfekhnkhdbieeh"; - sha256 = "sha256:0169harv9niwsjhi8pn3p063k1yhnlgjspih6gcfa6wxil50djzp"; + sha256 = "sha256:1lih8zbil1jwbzg7m1lnbx41d9smaqbs472lya7dgh36iwgsnpsr"; version = "4.9.95"; }) (createChromiumExtension { diff --git a/Modules/Home/Core/Video/mpv/default.nix b/Modules/Home/Core/Video/mpv/default.nix index 7500885..b512ce4 100644 --- a/Modules/Home/Core/Video/mpv/default.nix +++ b/Modules/Home/Core/Video/mpv/default.nix @@ -39,8 +39,9 @@ config = { deband = "no"; deband-iterations = 4; deband-grain = 48; + dither-depth = 8; # Set sub-ass-override to "no" as we only need to enable it for specific cases - sub-ass-override = "no"; + sub-ass-override = "force"; sub-ass-style-overrides = "playresx=1920,playresy=1080,Kerning=yes"; sub-color = "#FFFFFF"; sub-border-size = 2.4; diff --git a/Modules/Home/Desktop/KDE/default.nix b/Modules/Home/Desktop/KDE/default.nix index e889f91..22d816b 100644 --- a/Modules/Home/Desktop/KDE/default.nix +++ b/Modules/Home/Desktop/KDE/default.nix @@ -3,7 +3,7 @@ # Enable the kde plasma desktop environment & sddm services = { - xserver.enable = true; + xserver.enable = false; desktopManager.plasma6.enable = true; displayManager.sddm = { enable = true; @@ -26,5 +26,5 @@ services = { ") ]; - programs.xwayland.enable = true; + #programs.xwayland.enable = false; } diff --git a/Modules/NixOS/Hardware/zram.nix b/Modules/NixOS/Hardware/zram.nix index 5a71f2c..5c6c28a 100755 --- a/Modules/NixOS/Hardware/zram.nix +++ b/Modules/NixOS/Hardware/zram.nix @@ -14,7 +14,7 @@ zramSwap = { services.zram-generator.enable = true; boot.kernel = { sysctl = { - "vm.swappiness" = lib.mkForce 180; + #"vm.swappiness" = lib.mkForce 180; "vm.watermark_boost_factor" = 0; "vm.watermark_scale_factor" = 125; "vm.page-cluster" = 0; diff --git a/flake.lock b/flake.lock index 9f52d92..3425161 100755 --- a/flake.lock +++ b/flake.lock @@ -131,11 +131,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1733630610, - "narHash": "sha256-ygrT4DEeQ4fFpDXIT53ZTsr6cA3pvQTAwQp1GMMq3dI=", + "lastModified": 1734149010, + "narHash": "sha256-KZytuAK2m+YTXnRY88sIMmVLJTpxc8yGWukkJlQiad4=", "owner": "rycee", "repo": "nur-expressions", - "rev": "8a0b6c1bb922a406f3ce4debe5823d7b4850b6dc", + "rev": "a51fd7b8d7221a806c1ece4bcca2db387d555ba1", "type": "gitlab" }, "original": { @@ -467,11 +467,11 @@ ] }, "locked": { - "lastModified": 1733484277, - "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", + "lastModified": 1734093295, + "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", "owner": "nix-community", "repo": "home-manager", - "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", + "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", "type": "github" }, "original": { @@ -586,11 +586,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1733444216, - "narHash": "sha256-Xs+HcLsnMy6Z1FpHr0ULsGMc1mI6ESq1dTBAYwlpuVY=", + "lastModified": 1734127708, + "narHash": "sha256-fXDr93nc3zUDCGS5qhrXAtwBJfiI40jIdoMncLAzbUY=", "owner": "musnix", "repo": "musnix", - "rev": "a38011b5b96624b7f6527c0bc6df530a263297ad", + "rev": "0a2bbd1e2ec78ef268698eb682f39015c1f3ca1d", "type": "github" }, "original": { @@ -622,11 +622,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1733623390, - "narHash": "sha256-2NcNHpofUCVam1gLhj71nbszEzki7Q/PtjH1X0MqCso=", + "lastModified": 1733968549, + "narHash": "sha256-r18fyuignDxOTgmgSRAvR2XRvdwoZOtPxqgRBuafqFQ=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "d63629179143d079d6e4975f8c68bb71a5d3ea08", + "rev": "8f4795cc29b2a1e62e0d1856d9f7dcf219829748", "type": "github" }, "original": { @@ -637,11 +637,11 @@ }, "nixlib": { "locked": { - "lastModified": 1733015484, - "narHash": "sha256-qiyO0GrTvbp869U4VGX5GhAZ00fSiPXszvosY1AgKQ8=", + "lastModified": 1733620091, + "narHash": "sha256-5WoMeCkaXqTZwwCNLRzyLxEJn8ISwjx4cNqLgqKwg9s=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "0e4fdd4a0ab733276b6d2274ff84ae353f17129e", + "rev": "f4dc9a6c02e5e14d91d158522f69f6ab4194eb5b", "type": "github" }, "original": { @@ -658,11 +658,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1733621779, - "narHash": "sha256-oeBPiHmg8T/Qsf4qMkUqOrn6/xkJwREGo1jA+4xDssk=", + "lastModified": 1734142491, + "narHash": "sha256-FkcW2uOOZePE9ZaBusIziBAiNkEUup/7FVi78E2G+7c=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "b9ec66ed4e1430061ca044e938bb10f3ab629ba3", + "rev": "01a253ee83b7394626aeac9e89dcba0e085412eb", "type": "github" }, "original": { @@ -679,11 +679,11 @@ ] }, "locked": { - "lastModified": 1733360821, - "narHash": "sha256-bNXO+OGxrOjAxv/Lnyj84tNDicJ/FdLyLJHzOKSzYU8=", + "lastModified": 1733965598, + "narHash": "sha256-0tlZU8xfQGPcBOdXZee7P3vJLyPjTrXw7WbIgXD34gM=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "8cdaf8885c9c85d9d27b594dbe882406aadfe00e", + "rev": "d162ffdf0a30f3d19e67df5091d6744ab8b9229f", "type": "github" }, "original": { @@ -742,11 +742,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1733412085, - "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=", + "lastModified": 1733808091, + "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541", + "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", "type": "github" }, "original": { @@ -758,11 +758,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1733412085, - "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=", + "lastModified": 1733808091, + "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541", + "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", "type": "github" }, "original": { @@ -774,11 +774,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733581040, - "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", "type": "github" }, "original": { @@ -806,11 +806,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1732837521, - "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", + "lastModified": 1733392399, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", + "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "type": "github" }, "original": { @@ -838,11 +838,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1733392399, - "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", "type": "github" }, "original": { @@ -968,11 +968,11 @@ ] }, "locked": { - "lastModified": 1733538766, - "narHash": "sha256-FEDfBpM82XGdHDbLDJC4lV+QXSVN1rERt1MqtBGJZds=", + "lastModified": 1734057252, + "narHash": "sha256-fpSFuiW+O2L0ru2GrXBS0wcAYV9+yDE0Gf800UsWutY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "66526479b295ad238843a8a7367d2da7ec102757", + "rev": "1f56a5c88e4dcaa0ab1ba04c4bc5a977cff840b2", "type": "github" }, "original": { @@ -998,11 +998,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1733510476, - "narHash": "sha256-RH/8yIuo+fNLCjQ6e1mnXwmmxymjvfWC9JcbDuIA8TM=", + "lastModified": 1734110168, + "narHash": "sha256-Q0eeLYn45ErXlqGQyXmLLHGe1mqnUiK0Y9wZRa1SNFI=", "owner": "danth", "repo": "stylix", - "rev": "e309d64fe7f203274a7913e1d2b74307d15ba122", + "rev": "a9e3779949925ef22f5a215c5f49cf520dea30b1", "type": "github" }, "original": { @@ -1144,11 +1144,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1733509971, - "narHash": "sha256-LZIrb7HNWyLMU+dSI4fhbo2dMzJbbKKFWwYOpJwVXKE=", + "lastModified": 1733681789, + "narHash": "sha256-cwTTwiYkUdFpJFpFlnalteT0bn7s7bC3ngj2tdKWhZk=", "ref": "refs/heads/main", - "rev": "562e3900eebde0fb276dd2f425c097c8b44ccb92", - "revCount": 865, + "rev": "b0c0d44e0e533b42790360d30430a69b330849d6", + "revCount": 867, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" diff --git a/home.nix b/home.nix index 054fda7..cfa991c 100755 --- a/home.nix +++ b/home.nix @@ -125,9 +125,9 @@ #kdePackages.konversation heroic #minigalaxy - #(discord.override { - #withVencord = true; - #withOpenASAR = false; + #(discord-canary.override { + # withVencord = true; + # withOpenASAR = true; #}) legcord #arrpc diff --git a/justfile b/justfile index fa17963..ab66ef9 100755 --- a/justfile +++ b/justfile @@ -17,8 +17,8 @@ history: nix profile history --profile /nix/var/nix/profiles/system gc: - # remove all generations older than 7 days - sudo nix profile wipe-history --profile /nix/var/nix/profiles/system --older-than 7d + # remove all generations older than 1 day + sudo nix profile wipe-history --profile /nix/var/nix/profiles/system --older-than 1d # garbage collect all unused nix store entries sudo nix store gc --debug