diff --git a/configuration.nix b/configuration.nix index e2f1aee..2d425f3 100644 --- a/configuration.nix +++ b/configuration.nix @@ -207,24 +207,13 @@ in pinentryPackage = pkgs.pinentry-curses; }; - # programs.steam = { - # enable = true; - # package = pkgs.millennium-steam.override { - # extraEnv = { - # LD_AUDIT = "${ - # sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam - # }/library-inject.so:${ - # sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam - # }/SLSsteam.so"; - # }; - # }; - # }; - programs.steam = { enable = true; package = pkgs.millennium-steam.override { extraEnv = { - LD_AUDIT = "/home/user/Downloads/SLSsteam 20260722152506/bin/library-inject.so:/home/user/Downloads/SLSsteam 20260722152506/bin/SLSsteam.so"; + LD_AUDIT = "${sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam}/library-inject.so:${ + sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam + }/SLSsteam.so"; }; }; }; diff --git a/flake.lock b/flake.lock index bebbc73..e9974aa 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,23 @@ { "nodes": { + "bcdl-free": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1785350661, + "narHash": "sha256-IEFWX9+OQkvYry8ODdVmRZkD8K0WiPVLRAo/GItzBJs=", + "ref": "refs/heads/main", + "rev": "8b9fa0ef8047861ca1b8959afdf8079b39a64d53", + "revCount": 74, + "type": "git", + "url": "https://git.pizzasucht.net/KeksNino/free-bandcamp-downloader" + }, + "original": { + "type": "git", + "url": "https://git.pizzasucht.net/KeksNino/free-bandcamp-downloader" + } + }, "crane": { "locked": { "lastModified": 1766774972, @@ -97,11 +115,11 @@ ] }, "locked": { - "lastModified": 1785239295, - "narHash": "sha256-aYFoftXjm7Df7CAoR0XoMQjJ9rTZ/l9d1jr9EqD7sHM=", + "lastModified": 1785306346, + "narHash": "sha256-DScBkW0fOgpGPK2trNoX3ryLTlaC14+gglFo/BhGJ4g=", "owner": "nix-community", "repo": "home-manager", - "rev": "42bb40f7aaab63a107b64a20c4a4ade6550758d0", + "rev": "e705714e918c3b11affcdd15db2cbe3a070420a0", "type": "github" }, "original": { @@ -134,7 +152,7 @@ "millennium": { "inputs": { "millennium-src": "millennium-src", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "dir": "packages/nix", @@ -169,39 +187,18 @@ "type": "github" } }, - "nix-index-database": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1785046085, - "narHash": "sha256-UiK+mmZJuLWQVhJ5b2wDzogIYWAesyRm6LA3h3Ulh3Y=", - "owner": "nix-community", - "repo": "nix-index-database", - "rev": "11665045df8b9938ef811a3bfdc65cffb02b4b70", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-index-database", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1781577229, - "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", - "owner": "nixos", + "lastModified": 1785350410, + "narHash": "sha256-wXYrsdit8Z54aOAUf7/83LDhkY9+RgSuFBO/rFJeHb8=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", + "rev": "00d4d9bc4d406965d1e0081300dd8c854fd4ba11", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", "type": "github" } }, @@ -222,11 +219,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1785239275, - "narHash": "sha256-T/qG4MmyCmFzqo9YMQwkjK7va3Tukr2OZI4xkcUSCqQ=", + "lastModified": 1781577229, + "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1785332987, + "narHash": "sha256-Eiw4ie++bC7tDWyBEZmcbEeKv1xv0UAihkVTjD4C5VM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f536d5c00cd7ad28be33108ec9d67fe50b28e2a2", + "rev": "97478ef76c1f4c40b12fd4a42c1feba41e60650d", "type": "github" }, "original": { @@ -235,7 +248,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1767026758, "narHash": "sha256-7fsac/f7nh/VaKJ/qm3I338+wAJa/3J57cOGpXi0Sbg=", @@ -251,7 +264,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1783279667, "narHash": "sha256-/NAkDSsve+GNM0Bt6tleJdCGfsTlK89nPjkVOzZMo0s=", @@ -267,7 +280,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1784007870, "narHash": "sha256-djcLt/JJphyNt4eDY9XTly+/WbCK5lqWq9lSgCmJkkQ=", @@ -283,34 +296,13 @@ "type": "github" } }, - "noctalia": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1785240175, - "narHash": "sha256-mv6ZTvqozDYvs8aygyo0q76kWoi+7mcLWFijWVDknCU=", - "owner": "noctalia-dev", - "repo": "noctalia", - "rev": "c73f168db529b0a5a37e3c13442637848b71658a", - "type": "github" - }, - "original": { - "owner": "noctalia-dev", - "repo": "noctalia", - "type": "github" - } - }, "root": { "inputs": { + "bcdl-free": "bcdl-free", "gsr-ui": "gsr-ui", "home-manager": "home-manager", "millennium": "millennium", - "nix-index-database": "nix-index-database", - "nixpkgs": "nixpkgs_2", - "noctalia": "noctalia", + "nixpkgs": "nixpkgs_3", "sls-steam": "sls-steam", "xremap-flake": "xremap-flake", "yazi": "yazi", @@ -345,11 +337,11 @@ ] }, "locked": { - "lastModified": 1785224226, - "narHash": "sha256-Aj0ZA0boiYSPrvN+5ECpcYmx8OFEF+M1OoVY7ko0H/E=", + "lastModified": 1785275929, + "narHash": "sha256-3IbhTuHEqh2tokPGNKnv6x0HcsjOu3hk1MbLYRtzyRQ=", "owner": "AceSLS", "repo": "SLSsteam", - "rev": "4f7b79143a47a8ecb97c323745c7593d55fd6f20", + "rev": "1906382a482f35b2bc9b124f3849538ab432e4f3", "type": "github" }, "original": { @@ -409,7 +401,7 @@ "inputs": { "crane": "crane", "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "xremap": "xremap" }, "locked": { @@ -429,15 +421,15 @@ "yazi": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1785208381, - "narHash": "sha256-oHCAhBClJmg2XTKwHNAyfTLnUXpwPk0Qq4oc3UiYgBA=", + "lastModified": 1785301727, + "narHash": "sha256-Z9g04KWv8aEowWW+QIiADE6ct36oIZmrykTzEh5sQ4M=", "owner": "sxyazi", "repo": "yazi", - "rev": "e58022b9aafc8dabf586e2cc29b79a230071716f", + "rev": "319f90e0eab185a231eef5562215ba322e320286", "type": "github" }, "original": { @@ -449,7 +441,7 @@ "zen-browser": { "inputs": { "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1785224333, diff --git a/flake.nix b/flake.nix index 378252e..2e5f9ee 100644 --- a/flake.nix +++ b/flake.nix @@ -9,10 +9,6 @@ url = "github:AceSLS/SLSsteam"; inputs.nixpkgs.follows = "nixpkgs"; }; - noctalia = { - url = "github:noctalia-dev/noctalia"; - inputs.nixpkgs.follows = "nixpkgs"; - }; zen-browser.url = "github:0xc000022070/zen-browser-flake"; xremap-flake.url = "github:xremap/nix-flake"; yazi.url = "github:sxyazi/yazi"; @@ -21,10 +17,7 @@ url = "github:rPlakama/gsr-ui-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - nix-index-database = { - url = "github:nix-community/nix-index-database"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + bcdl-free.url = "git+https://git.pizzasucht.net/KeksNino/free-bandcamp-downloader"; }; outputs = @@ -36,9 +29,8 @@ sls-steam, yazi, millennium, - noctalia, gsr-ui, - nix-index-database, + bcdl-free, ... }: let @@ -56,23 +48,21 @@ home-manager.nixosModules.home-manager xremap-flake.nixosModules.default gsr-ui.nixosModules.default - nix-index-database.nixosModules.default { nixpkgs.overlays = [ - (final: prev: { - samrewritten = final.callPackage ./package.nix { }; - }) yazi.overlays.default millennium.overlays.default ]; + environment.systemPackages = [ bcdl-free.packages.${system}.default ]; + home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.users.user = import ./home-manager/home.nix; home-manager.extraSpecialArgs = { - inherit noctalia zen-browser; + inherit zen-browser; }; home-manager.backupFileExtension = "backup"; diff --git a/home-manager/home.nix b/home-manager/home.nix index c603755..6def3e2 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -1,19 +1,15 @@ { pkgs, config, - noctalia, zen-browser, ... }: { imports = [ ./mpd.nix - noctalia.homeModules.default zen-browser.homeModules.beta ]; - # programs.noctalia.enable = true; - home.username = "user"; home.homeDirectory = "/home/user"; @@ -116,7 +112,6 @@ programs.gcc.enable = true; programs.mpv.enable = true; programs.imv.enable = true; - programs.hexchat.enable = true; programs.aria2.enable = true; programs.qutebrowser = { enable = true;