From 0141f3ab943337f29996024553b8cf2c55194afc Mon Sep 17 00:00:00 2001 From: vancycles-knak Date: Mon, 8 Sep 2025 15:58:37 -0700 Subject: [PATCH] fixed a few bugs --- nix-darwin/flake.lock | 84 +++++++++---------- nix-darwin/flake.nix | 17 +++- nix-darwin/home-modules/programs/spotify.nix | 9 +- .../henri.vandersleyen/configuration.nix | 3 +- nix-darwin/users/henri.vandersleyen/home.nix | 5 +- 5 files changed, 67 insertions(+), 51 deletions(-) diff --git a/nix-darwin/flake.lock b/nix-darwin/flake.lock index beedae7c..968779af 100644 --- a/nix-darwin/flake.lock +++ b/nix-darwin/flake.lock @@ -38,11 +38,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1756741629, - "narHash": "sha256-n+mgH3NoQf8d1jd8cDp/9Mt++hhyuE3LO3ZAxzjWRZw=", + "lastModified": 1757320803, + "narHash": "sha256-7PUIQOMQSJLkNtV42SAYUDw0mRdbBNl6q8pLN8GViwM=", "owner": "catppuccin", "repo": "nix", - "rev": "cd22197da06df1eb6fabdaa2fc22c170c4f67382", + "rev": "d75e3fe67f49728cb5035bc791f4b9065ff3a2c9", "type": "github" }, "original": { @@ -58,11 +58,11 @@ ] }, "locked": { - "lastModified": 1755825449, - "narHash": "sha256-XkiN4NM9Xdy59h69Pc+Vg4PxkSm9EWl6u7k6D5FZ5cM=", + "lastModified": 1757130842, + "narHash": "sha256-4i7KKuXesSZGUv0cLPLfxbmF1S72Gf/3aSypgvVkwuA=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "8df64f819698c1fee0c2969696f54a843b2231e8", + "rev": "15f067638e2887c58c4b6ba1bdb65a0b61dc58c5", "type": "github" }, "original": { @@ -79,11 +79,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1756785812, - "narHash": "sha256-B3cR5keCkTTaI7hCI1YIopLWT3CviWf/uwOjC9AQ27Y=", + "lastModified": 1757304222, + "narHash": "sha256-s070stByAXxeCLgftTXxFxZ2ynJhghne4Y6cTuqGAaw=", "owner": "rycee", "repo": "nur-expressions", - "rev": "eeb9ccaba785ca13fc2dcf9d83613633a0605feb", + "rev": "fa312c0175ffb82bc67da095439b9cb683ac52bd", "type": "gitlab" }, "original": { @@ -117,11 +117,11 @@ ] }, "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -177,11 +177,11 @@ ] }, "locked": { - "lastModified": 1756788591, - "narHash": "sha256-LOrOfPWpJU/ADWDyVwPv9XNuYPq5KJtmAmSzplpccmE=", + "lastModified": 1757256385, + "narHash": "sha256-WK7tOhWwr15mipcckhDg2no/eSpM1nIh4C9le8HgHhk=", "owner": "nix-community", "repo": "home-manager", - "rev": "f3d3b4592a73fb64b5423234c01985ea73976596", + "rev": "f35703b412c67b48e97beb6e27a6ab96a084cd37", "type": "github" }, "original": { @@ -197,11 +197,11 @@ ] }, "locked": { - "lastModified": 1756517606, - "narHash": "sha256-FlYlQZ/NqG0Z6tyakwVYJihs0jYi/gBoKF2694O/TSw=", + "lastModified": 1757086236, + "narHash": "sha256-bcQnByOCtEbdKQmtaESIM4xrPakuhrpCIqeh79UDUxE=", "owner": "StevenBlack", "repo": "hosts", - "rev": "7df1533fb045b419b78ccdf7e88f1eb8dc7feffb", + "rev": "b0781e7975c0c09fe7e33fbcf9222193c9f36a25", "type": "github" }, "original": { @@ -255,11 +255,11 @@ ] }, "locked": { - "lastModified": 1755678602, - "narHash": "sha256-uEC5O/NIUNs1zmc1aH1+G3GRACbODjk2iS0ET5hXtuk=", + "lastModified": 1756891319, + "narHash": "sha256-/e6OXxzbAj/o97Z1dZgHre4bNaVjapDGscAujSCQSbI=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "157cc52065a104fc3b8fa542ae648b992421d1c7", + "rev": "621e2e00f1736aa18c68f7dfbf2b9cff94b8cc4d", "type": "github" }, "original": { @@ -286,11 +286,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1756811803, - "narHash": "sha256-03zmDvAU+VLPWHv5uxfGVR6bs/SnCYeZ8hbedK/Eb/M=", + "lastModified": 1757359491, + "narHash": "sha256-NT6lAoNk8iv5SVG0rUCAIJlPSIvoyogvnEUGSfeeZ6I=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "127aab815908ecbd3db4d23f127d2e96b79855f9", + "rev": "1e3a06560fa6b2d906f8ecc9ec41b50e9b034cef", "type": "github" }, "original": { @@ -408,11 +408,11 @@ ] }, "locked": { - "lastModified": 1753622892, - "narHash": "sha256-0K+A+gmOI8IklSg5It1nyRNv0kCNL51duwnhUO/B8JA=", + "lastModified": 1756810301, + "narHash": "sha256-wgZ3VW4VVtjK5dr0EiK9zKdJ/SOqGIBXVG85C3LVxQA=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "23f0debd2003f17bd65f851cd3f930cff8a8c809", + "rev": "3d63fb4a42c819f198deabd18c0c2c1ded1de931", "type": "github" }, "original": { @@ -539,11 +539,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1756542300, - "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", + "lastModified": 1757068644, + "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", + "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", "type": "github" }, "original": { @@ -563,11 +563,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1756727835, - "narHash": "sha256-767guSN146cmLD1lvjYzU4Bh7Ry3fzXzj+6hXEtF7rY=", + "lastModified": 1757343218, + "narHash": "sha256-GqyytaTh5JFJVraOQefSnxuQNVVSFFGwsJPT/M6St84=", "owner": "nix-community", "repo": "nixvim", - "rev": "f5026663f68261a201cd0700ced14971945d8dd9", + "rev": "d38eb947272dd4e6d138648b1b49360301db6859", "type": "github" }, "original": { @@ -586,11 +586,11 @@ ] }, "locked": { - "lastModified": 1755555503, - "narHash": "sha256-WiOO7GUOsJ4/DoMy2IC5InnqRDSo2U11la48vCCIjjY=", + "lastModified": 1756738487, + "narHash": "sha256-8QX7Ab5CcICp7zktL47VQVS+QeaU4YDNAjzty7l7TQE=", "owner": "NuschtOS", "repo": "search", - "rev": "6f3efef888b92e6520f10eae15b86ff537e1d2ea", + "rev": "5feeaeefb571e6ca2700888b944f436f7c05149b", "type": "github" }, "original": { @@ -609,11 +609,11 @@ ] }, "locked": { - "lastModified": 1755960406, - "narHash": "sha256-RF7j6C1TmSTK9tYWO6CdEMtg6XZaUKcvZwOCD2SICZs=", + "lastModified": 1757239681, + "narHash": "sha256-E9spYi9lxm2f1zWQLQ7xQt8Xs2nWgr1T4QM7ZjLFphM=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "e891a93b193fcaf2fc8012d890dc7f0befe86ec2", + "rev": "ab82ab08d6bf74085bd328de2a8722c12d97bd9d", "type": "github" }, "original": { @@ -687,11 +687,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1756614537, - "narHash": "sha256-qyszmZO9CEKAlj5NBQo1AIIADm5Fgqs5ZggW1sU1TVo=", + "lastModified": 1757219159, + "narHash": "sha256-bpiaovTLPeScpnOdqfgq3oy4B/sD2Wnb5EdQZZM2tCY=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "374eb5d97092b97f7aaafd58a2012943b388c0df", + "rev": "404130798716449bbd02e5f1b54272be55218644", "type": "github" }, "original": { diff --git a/nix-darwin/flake.nix b/nix-darwin/flake.nix index b04659be..32ccb7cd 100644 --- a/nix-darwin/flake.nix +++ b/nix-darwin/flake.nix @@ -82,6 +82,7 @@ { darwinConfigurations = { #nix run nix-darwin -- switch --flake ./nix-darwin + #nh darwin switch Henris-MacBook-Pro = darwin.lib.darwinSystem { system = "aarch64-darwin"; specialArgs = { @@ -89,6 +90,16 @@ meta = darwinMeta; }; modules = [ + { + nixpkgs = { + config = { + allowUnfree = true; + permittedInsecurePackages = [ + "arc-browser-1.109.0-67185" + ]; + }; + }; + } ./users/henri.vandersleyen/configuration.nix home-manager.darwinModules.home-manager { @@ -116,8 +127,7 @@ specialArgs = { inherit inputs; meta = linuxMeta; - } - // inputs; + } // inputs; modules = [ { nixpkgs = { @@ -157,8 +167,7 @@ specialArgs = { inherit inputs; meta = mediaMeta; - } - // inputs; + } // inputs; modules = [ ./users/medialab/configuration.nix home-manager.nixosModules.home-manager diff --git a/nix-darwin/home-modules/programs/spotify.nix b/nix-darwin/home-modules/programs/spotify.nix index e56ce431..599e2d3f 100644 --- a/nix-darwin/home-modules/programs/spotify.nix +++ b/nix-darwin/home-modules/programs/spotify.nix @@ -12,6 +12,11 @@ description = "Enables paid music"; default = true; }; + program.spicetify.enable = lib.mkOption { + type = lib.types.bool; + description = "pretty"; + default = true; + }; }; imports = [ inputs.spicetify-nix.homeManagerModules.default ]; @@ -23,9 +28,9 @@ ]; programs.spicetify = let - spicetifyPkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; + spicetifyPkgs = inputs.spicetify-nix.homeManager.${pkgs.system}; in - { + lib.mkIf config.program.spicetify.enable { theme = spicetifyPkgs.themes.catppuccin; colorScheme = "mocha"; enable = true; diff --git a/nix-darwin/users/henri.vandersleyen/configuration.nix b/nix-darwin/users/henri.vandersleyen/configuration.nix index 8a50edf8..2dddfc4a 100644 --- a/nix-darwin/users/henri.vandersleyen/configuration.nix +++ b/nix-darwin/users/henri.vandersleyen/configuration.nix @@ -45,7 +45,7 @@ }; home-manager.backupFileExtension = "backup"; fonts.packages = with pkgs; [ - jetbrains-mono + # jetbrains-mono ]; environment = { @@ -70,6 +70,7 @@ "rectangle" "iterm2" "postman" + "arc" # "nikitabobko/tap/aerospace" # not vetted on work laptop ]; brews = [ diff --git a/nix-darwin/users/henri.vandersleyen/home.nix b/nix-darwin/users/henri.vandersleyen/home.nix index f5560ee3..8b286077 100644 --- a/nix-darwin/users/henri.vandersleyen/home.nix +++ b/nix-darwin/users/henri.vandersleyen/home.nix @@ -60,13 +60,14 @@ # languages languages = { - python.lsp.enable = true; + python.lsp.enable = false; jsts.lsp.enable = true; }; # programs program = { - arc-browser.enable = true; + spicetify.enable = false; + arc-browser.enable = false; # INFO unmaintained codium.enable = false; fish.enable = true; zsh.enable = true;