From f1ec08935489c6ff78c93a8a0f84a5f27bd0af8b Mon Sep 17 00:00:00 2001 From: muon Date: Mon, 13 Jan 2025 15:40:24 +0000 Subject: [PATCH] Update nix --- flake.lock | 18 +++++++++--------- flake.nix | 28 ++-------------------------- hosts/muho/home.nix | 2 +- utils.nix | 12 ++---------- 4 files changed, 14 insertions(+), 46 deletions(-) diff --git a/flake.lock b/flake.lock index afd7760..0318f55 100644 --- a/flake.lock +++ b/flake.lock @@ -279,11 +279,11 @@ ] }, "locked": { - "lastModified": 1736277415, - "narHash": "sha256-kPDXF6cIPsVqSK08XF5EC6KM7BdMnM9vtJDzsnf+lLU=", + "lastModified": 1736781604, + "narHash": "sha256-nIjcN89nxaI5ZnwU/1gzc3rBVQ/te5sHraYeG4cyJX4=", "owner": "nix-community", "repo": "home-manager", - "rev": "5c4302313d9207f7ec0886d68f8ff4a3c71209a1", + "rev": "9616d81f98032d1ee9bec68ab4b6a8c833add88c", "type": "github" }, "original": { @@ -425,11 +425,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1736701207, + "narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6", "type": "github" }, "original": { @@ -484,11 +484,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1736300059, - "narHash": "sha256-z3mR+0gBN/iVM8UgfCSIxjgw4jm1bu1kjMKyQx9mGBc=", + "lastModified": 1736779864, + "narHash": "sha256-OgKIMua33t0ZcdcFiUntFKidwhZrRZUTLlVHJ+mAiZQ=", "owner": "danth", "repo": "stylix", - "rev": "168306ce7f5d823ccee8b7d4e112ea20671c2b8f", + "rev": "934e2bfe7954d6c94f25d45cb12a8b3547825699", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5f0f309..16e3fad 100644 --- a/flake.nix +++ b/flake.nix @@ -14,33 +14,9 @@ let system = "x86_64-linux"; - pkgs' = (import inputs.nixpkgs { inherit system; }).applyPatches { - name = "nixpkgs-unstable-patched"; - src = inputs.nixpkgs; - patches = [ - (builtins.fetchurl { - url = - "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/369042.patch"; - sha256 = - "sha256:08asxmd34rzaxb8dr4nccy26k3vxnx7psy2imnp40fdplqna0a85"; - }) - (builtins.fetchurl { - url = - "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/368790.patch"; - sha256 = - "sha256:1blsawm4l30wkrdkvvq0fw2aki7v921isdwrk9dw8yh09cglbfd9"; - }) - (builtins.fetchurl { - url = - "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/368091.patch"; - sha256 = - "sha256:11qnwrq8sgbmxiy9qvv7q2lbl824x90p2iklf3kjf9yb3c2dx9nj"; - }) - ]; - }; - pkgs = import pkgs' { inherit system; }; + pkgs = import inputs.nixpkgs { inherit system; }; - utils = import ./utils.nix { inherit builtins inputs system pkgs; }; + utils = import ./utils.nix { inherit inputs system; }; in { nixosConfigurations = { # desktop diff --git a/hosts/muho/home.nix b/hosts/muho/home.nix index 6e991ea..497772b 100644 --- a/hosts/muho/home.nix +++ b/hosts/muho/home.nix @@ -3,7 +3,7 @@ let cfg = osConfig.mods; in { # Modules mods.xdg.enable = true; - mods.social.enable = true; + mods.social.enable = false; mods.i3.enable = false; mods.terminal.zsh.enable = true; mods.terminal.emulator.enable = false; diff --git a/utils.nix b/utils.nix index e532287..d81775d 100644 --- a/utils.nix +++ b/utils.nix @@ -1,15 +1,7 @@ -{ builtins, inputs, system, pkgs, ... }: { +{ inputs, system, ... }: { mkHost = host: inputs.nixpkgs.lib.nixosSystem { - specialArgs = with builtins; - let - hasInfix = infix: content: match ".*${infix}.*" "${content}" != null; - muho = hasInfix "/muho/" (toString host); - in if muho then { - inherit inputs system pkgs; - } else { - inherit inputs system; - }; + specialArgs = { inherit inputs system; }; modules = [ host