Compare commits
2 commits
7a3f3e1b8c
...
c02946aba3
Author | SHA1 | Date | |
---|---|---|---|
Natsu Kagami | c02946aba3 | ||
Natsu Kagami | d0943fd8b4 |
|
@ -4,6 +4,18 @@ let
|
||||||
cfg = config.linux.graphical;
|
cfg = config.linux.graphical;
|
||||||
|
|
||||||
vscode = with pkgs; if stdenv.isAarch64 then unstable.vscode else unstable.vscode-fhs;
|
vscode = with pkgs; if stdenv.isAarch64 then unstable.vscode else unstable.vscode-fhs;
|
||||||
|
|
||||||
|
wifi-indicator = pkgs.writeScriptBin "wifi-indicator" ''
|
||||||
|
#!/usr/bin/env fish
|
||||||
|
|
||||||
|
set wifi_output (${lib.getExe pkgs.iw} wlan0 link | rg "SSID: (.+)" --replace '🛜 $1' | string trim)
|
||||||
|
|
||||||
|
if test -z $wifi_output
|
||||||
|
echo "❌ not connected"
|
||||||
|
else
|
||||||
|
echo $wifi_output
|
||||||
|
end
|
||||||
|
'';
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [ ./x11.nix ./wayland.nix ./alacritty.nix ];
|
imports = [ ./x11.nix ./wayland.nix ./alacritty.nix ];
|
||||||
|
@ -70,6 +82,7 @@ in
|
||||||
dex # .desktop file management, startup
|
dex # .desktop file management, startup
|
||||||
# sct # Display color temperature
|
# sct # Display color temperature
|
||||||
xdg-utils # Open stuff
|
xdg-utils # Open stuff
|
||||||
|
wifi-indicator
|
||||||
] ++ (if pkgs.stdenv.isAarch64 then [ ] else [
|
] ++ (if pkgs.stdenv.isAarch64 then [ ] else [
|
||||||
gnome.cheese # Webcam check, expensive
|
gnome.cheese # Webcam check, expensive
|
||||||
# Chat stuff
|
# Chat stuff
|
||||||
|
|
|
@ -1,24 +1,6 @@
|
||||||
{ pkgs, lib, config, ... }:
|
{ pkgs, lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
let
|
|
||||||
noto-fonts-emoji-blob-bin =
|
|
||||||
let
|
|
||||||
pname = "noto-fonts-emoji-blob-bin";
|
|
||||||
version = "15.0";
|
|
||||||
in
|
|
||||||
pkgs.fetchurl {
|
|
||||||
name = "${pname}-${version}";
|
|
||||||
url = "https://github.com/C1710/blobmoji/releases/download/v${version}/Blobmoji.ttf";
|
|
||||||
sha256 = "sha256-n5yVk2w9x7UVrMe0Ho6nwu1Z9E/ktjo1UHdHKStoJWc=";
|
|
||||||
|
|
||||||
downloadToTemp = true;
|
|
||||||
recursiveHash = true;
|
|
||||||
postFetch = ''
|
|
||||||
install -Dm 444 $downloadedFile $out/share/fonts/blobmoji/Blobmoji.ttf
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
imports = [ ./mounting.nix ];
|
imports = [ ./mounting.nix ];
|
||||||
# Fonts
|
# Fonts
|
||||||
|
@ -37,9 +19,9 @@ in
|
||||||
fontconfig = {
|
fontconfig = {
|
||||||
defaultFonts = {
|
defaultFonts = {
|
||||||
emoji = lib.mkBefore [ "Blobmoji" ];
|
emoji = lib.mkBefore [ "Blobmoji" ];
|
||||||
serif = lib.mkBefore [ "IBM Plex Serif" "IBM Plex Sans JP" "IBM Plex Sans KR" ];
|
serif = lib.mkBefore [ "IBM Plex Serif" "IBM Plex Sans JP" "IBM Plex Sans KR" "Blobmoji" ];
|
||||||
sansSerif = lib.mkBefore [ "IBM Plex Sans" "IBM Plex Sans JP" "IBM Plex Sans KR" ];
|
sansSerif = lib.mkBefore [ "IBM Plex Sans" "IBM Plex Sans JP" "IBM Plex Sans KR" "Blobmoji" ];
|
||||||
monospace = lib.mkBefore [ "IBM Plex Mono" ];
|
monospace = lib.mkBefore [ "IBM Plex Mono" "IBM Plex Sans JP" "Blobmoji" ];
|
||||||
};
|
};
|
||||||
localConf = ''
|
localConf = ''
|
||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
|
@ -51,6 +33,7 @@ in
|
||||||
<family>IBM Plex Sans</family>
|
<family>IBM Plex Sans</family>
|
||||||
<family>IBM Plex Sans JP</family>
|
<family>IBM Plex Sans JP</family>
|
||||||
<family>IBM Plex Sans KR</family>
|
<family>IBM Plex Sans KR</family>
|
||||||
|
<family>Blobmoji</family>
|
||||||
</prefer>
|
</prefer>
|
||||||
</alias>
|
</alias>
|
||||||
</fontconfig>
|
</fontconfig>
|
||||||
|
|
Loading…
Reference in a new issue