diff options
| author | Alex Auvolat <alex@adnab.me> | 2023-08-07 13:34:36 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2023-08-07 13:34:36 +0200 |
| commit | 7108ce6dad60eb95cfbaa89b17bc9bd3fd0401a2 (patch) | |
| tree | 73d848f777689737b089f92f43c3e99ba51752c2 /nixos | |
| parent | 5da3532a9a30616d43492ed2ef9ea07394d7722f (diff) | |
| download | user-config-7108ce6dad60eb95cfbaa89b17bc9bd3fd0401a2.tar.gz user-config-7108ce6dad60eb95cfbaa89b17bc9bd3fd0401a2.zip | |
fixed home-manager and nur hash; fix fonts
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/common.nix | 12 | ||||
| -rw-r--r-- | nixos/kusanagi.nix | 17 |
2 files changed, 21 insertions, 8 deletions
diff --git a/nixos/common.nix b/nixos/common.nix index 25b87eb..ce33b7b 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -113,11 +113,16 @@ in keep-derivations = true ''; - environment.systemPackages = with pkgs; [ - home-manager - + fonts.fonts = with pkgs; [ profont symbola + ipafont + hanazono + takao + ]; + + environment.systemPackages = with pkgs; [ + home-manager vim nixfmt @@ -153,6 +158,7 @@ in clang rustc rustfmt + rust-analyzer cargo clippy rclone diff --git a/nixos/kusanagi.nix b/nixos/kusanagi.nix index 1b3f612..d92a171 100644 --- a/nixos/kusanagi.nix +++ b/nixos/kusanagi.nix @@ -4,7 +4,15 @@ { config, lib, pkgs, modulesPath, ... }: let - home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz"; + nurSrc = builtins.fetchTarball { + url = + "https://github.com/nix-community/NUR/archive/687ed97c4379e9ad1346fc673e3e0fc88210de14.tar.gz"; + sha256 = "sha256:0pxljc5bzcwb8c43qmm5l49p03snq7piqnshglqday2dw6cfcd6l"; + }; + home-manager = builtins.fetchTarball { + url = "https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz"; + sha256 = "sha256:0dfshsgj93ikfkcihf4c5z876h4dwjds998kvgv7sqbfv0z6a4bc"; + }; in { imports = @@ -94,10 +102,9 @@ in # nur has to be imported twice, otherwise doesn't work nixpkgs.config.packageOverrides = pkgs: { - nur = import (builtins.fetchTarball - "https://github.com/nix-community/NUR/archive/master.tar.gz") { - inherit pkgs; - }; + nur = import nurSrc { + inherit pkgs; + }; }; home-manager.users.lx = import ../nixpkgs/kusanagi.nix { inherit pkgs; }; |