From 7108ce6dad60eb95cfbaa89b17bc9bd3fd0401a2 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Mon, 7 Aug 2023 13:34:36 +0200
Subject: fixed home-manager and nur hash; fix fonts

---
 icewm/keys           |  4 ++--
 nixos/common.nix     | 12 +++++++++---
 nixos/kusanagi.nix   | 17 ++++++++++++-----
 nixpkgs/kusanagi.nix | 14 +++++++++-----
 4 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/icewm/keys b/icewm/keys
index 875040f..7a52b28 100644
--- a/icewm/keys
+++ b/icewm/keys
@@ -3,8 +3,8 @@ key "Super+p" dmenu_run
 key "Super+Shift+r" icewm --restart
 key "Super+Shift+x" i3lock -c 000000
 
-key "XF86MonBrightnessDown" brightnessctl set +10%
-key "XF86MonBrightnessUp" brightnessctl set 10%-
+key "XF86MonBrightnessDown" brightnessctl set 10%-
+key "XF86MonBrightnessUp" brightnessctl set +10%
 
 key "XF86AudioMute" pactl set-sink-mute @DEFAULT_SINK@ toggle
 key "XF86AudioRaiseVolume" sh -c "pactl set-sink-mute @DEFAULT_SINK@ false && pactl set-sink-volume @DEFAULT_SINK@ +5%"
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; };
 
diff --git a/nixpkgs/kusanagi.nix b/nixpkgs/kusanagi.nix
index bb61451..72d67e9 100644
--- a/nixpkgs/kusanagi.nix
+++ b/nixpkgs/kusanagi.nix
@@ -1,4 +1,11 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+let
+  nurSrc = builtins.fetchTarball {
+    url =
+      "https://github.com/nix-community/NUR/archive/687ed97c4379e9ad1346fc673e3e0fc88210de14.tar.gz";
+    sha256 = "sha256:0pxljc5bzcwb8c43qmm5l49p03snq7piqnshglqday2dw6cfcd6l";
+  };
+in {
   imports = [ ./common.nix ];
 
   programs.bash.profileExtra = ''
@@ -12,10 +19,7 @@
   '';
 
   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.file.".config/qutebrowser/quickmarks".source = ../qutebrowser/quickmarks;
-- 
cgit v1.2.3