diff options
| -rw-r--r-- | flake.lock | 26 | ||||
| -rw-r--r-- | home/default.nix | 2 | ||||
| -rw-r--r-- | home/profiles/base/default.nix | 4 | ||||
| -rw-r--r-- | home/profiles/messaging/default.nix | 10 | ||||
| -rw-r--r-- | nixos/modules/cachix/caches/chaotic-nixpkgs.nix | 12 | ||||
| -rw-r--r-- | packages/default.nix | 5 |
6 files changed, 36 insertions, 23 deletions
diff --git a/flake.lock b/flake.lock index 3422bdd..325dff2 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1642336372, - "narHash": "sha256-1N+9qs4oFIp5tixvScZnVYKzDaaWfqDAPnbf0pWxKQE=", + "lastModified": 1642513691, + "narHash": "sha256-gV8GRAzPzyKaVi9gmcrIKLAPj8GXNx+RLG88gO38MYM=", "ref": "main", - "rev": "4f26096c0b3a717beaccf2fa96752a95f298d1f9", - "revCount": 11, + "rev": "b7db31c1783ac2bf0d410328bfa3c87ebb4d0bba", + "revCount": 13, "type": "git", "url": "https://git.sr.ht/~boppy/chaotic-nixpkgs" }, @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1642463060, - "narHash": "sha256-6xXRxvMk4OV/k6VwJq54pahToT4FCZzOKfbvG7f6l1E=", + "lastModified": 1642463065, + "narHash": "sha256-Db53xzDOouhsDAQ/QCvLeM0r7p+my5Zb5jgWGpCrOVo=", "owner": "nix-community", "repo": "home-manager", - "rev": "8cf13abffc0808b337590a9e382604ab6c2cb3e7", + "rev": "c491331718bd41722a2982a5532eb0ff51c3ca28", "type": "github" }, "original": { @@ -121,11 +121,11 @@ }, "master": { "locked": { - "lastModified": 1642462659, - "narHash": "sha256-vNFD3y54atPP5kgXwrnfUhCtHXqj4frmP0tmWS38eNo=", + "lastModified": 1642512474, + "narHash": "sha256-JiVTf7cDmREHF0UWC3Dg3/oBvpxf/ssvSliVAHAta28=", "owner": "nixos", "repo": "nixpkgs", - "rev": "13e3f202d27e96a1e0fc3ad288899bb46add775b", + "rev": "70630b4a199b43fe7421b06184d0d3774c82ed37", "type": "github" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1642387353, - "narHash": "sha256-CmpIo2whHN1ESXuKl9lL9CRJVK8YuEfV2JURFqmWNmw=", + "lastModified": 1642473686, + "narHash": "sha256-VUbbTu6NJFlGaVEsXfwWQeypQPGAobs4UUbyxNZVzA0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c76db6730b6bc150c49c9dcefc2323785516d1dc", + "rev": "37c9180fb097943e5427de21acba86a47c5f0f71", "type": "github" }, "original": { diff --git a/home/default.nix b/home/default.nix index 62e6aea..bb2c430 100644 --- a/home/default.nix +++ b/home/default.nix @@ -5,7 +5,7 @@ username = "boopy"; hostname = "alpha"; system = "x86_64-linux"; - pkgs = import nixpkgs { system = "x86_64-linux"; overlays = [ inputs.rust-overlay.overlay ]; }; + pkgs = import nixpkgs { system = "x86_64-linux"; overlays = [ inputs.rust-overlay.overlay inputs.chaotic-nixpkgs.overlay ]; }; extraModules = [ ./profiles diff --git a/home/profiles/base/default.nix b/home/profiles/base/default.nix index 2e7fee1..45e8209 100644 --- a/home/profiles/base/default.nix +++ b/home/profiles/base/default.nix @@ -4,7 +4,7 @@ let neotheme = config.neotheme; - inherit (self.packages.x86_64-linux) neovim iosevka-pure-bin phocus; + inherit (self.packages.x86_64-linux) neovim phocus; in { imports = [ @@ -68,7 +68,7 @@ in neovim # Fonts - iosevka-pure-bin + pkgs.iosevka-pure-bin pkgs.dina-font pkgs.sarasa-gothic pkgs.scientifica diff --git a/home/profiles/messaging/default.nix b/home/profiles/messaging/default.nix index 73a721f..a8b42fe 100644 --- a/home/profiles/messaging/default.nix +++ b/home/profiles/messaging/default.nix @@ -10,8 +10,14 @@ in }; config = lib.mkIf cfg.enable { - home.packages = with pkgs; [ discord-canary aerc weechat element slack ]; + home.packages = with pkgs; [ + aerc + (discord-canary-openasar.override { waylandSupport = true; }) + element + slack + weechat + ]; - nixpkgs.allowedUnfree = [ "discord-canary" "slack" ]; + nixpkgs.allowedUnfree = [ "slack" ]; }; } diff --git a/nixos/modules/cachix/caches/chaotic-nixpkgs.nix b/nixos/modules/cachix/caches/chaotic-nixpkgs.nix new file mode 100644 index 0000000..7131c9b --- /dev/null +++ b/nixos/modules/cachix/caches/chaotic-nixpkgs.nix @@ -0,0 +1,12 @@ +{ config, lib, ... }: + +{ + nix = { + binaryCaches = [ + "https://chaotic-nixpkgs.cachix.org" + ]; + binaryCachePublicKeys = [ + "chaotic-nixpkgs.cachix.org-1:xm/PZVLgwIlMc8K5+ZxGIkEXovfL9Bll5HolvzN1wIQ=" + ]; + }; +} diff --git a/packages/default.nix b/packages/default.nix index 93f451f..fabee1c 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -1,13 +1,8 @@ { self, neovim, rust-overlay, ... } @ inputs: let pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; - chaoticPkgs = inputs.chaotic-nixpkgs.packages.x86_64-linux; - - rustPkgs = import inputs.nixpkgs { system = "x86_64-linux"; overlays = [ rust-overlay.overlay ]; }; in { "neovim" = neovim.packages.x86_64-linux.neovim; - "iosevka-pure-bin" = chaoticPkgs.iosevka-pure-bin; "phocus" = pkgs.callPackage ./phocus { src = inputs.phocus; }; - "rust-nightly" = rustPkgs.rust-bin.nightly.latest.default.override { extensions = [ "rust-src" ]; }; } |