mirror of
https://github.com/donovanglover/nix-config.git
synced 2024-11-22 00:03:55 +01:00
chore: Fix nixd / statix errors
I'm okay with editing hardware-configuration.nix now that I understand how it works.
This commit is contained in:
Donovan Glover
parent
b397048a31
commit
f73e302f2e
12
flake.nix
12
flake.nix
@ -90,7 +90,7 @@
|
||||
let
|
||||
directory = replaceStrings flakeOutputs flakeDirectories attributeName;
|
||||
|
||||
attributeValue = (listToAttrs
|
||||
attributeValue = listToAttrs
|
||||
(map
|
||||
(file: {
|
||||
name = replaceStrings [ ".nix" ] [ "" ] file;
|
||||
@ -107,9 +107,9 @@
|
||||
}
|
||||
else import ./${directory}/${file};
|
||||
})
|
||||
(attrNames (readDir ./${directory}))));
|
||||
(attrNames (readDir ./${directory})));
|
||||
|
||||
aarch64Packages = (listToAttrs
|
||||
aarch64Packages = listToAttrs
|
||||
(map
|
||||
(file: {
|
||||
name = replaceStrings [ ".nix" ] [ "" ] file;
|
||||
@ -118,7 +118,7 @@
|
||||
then aarch64-linux.callPackage ./${directory}/${file} { }
|
||||
else null;
|
||||
})
|
||||
(attrNames (readDir ./${directory}))));
|
||||
(attrNames (readDir ./${directory})));
|
||||
|
||||
attributeSet =
|
||||
if directory == "packages"
|
||||
@ -133,7 +133,7 @@
|
||||
}
|
||||
else attributeValue;
|
||||
in
|
||||
(attributeSet);
|
||||
attributeSet;
|
||||
})
|
||||
(flakeOutputs)));
|
||||
flakeOutputs));
|
||||
}
|
||||
|
||||
@ -261,80 +261,82 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
xdg.configFile.${gapsScript} = {
|
||||
executable = true;
|
||||
text = /* fish */ ''
|
||||
#!/usr/bin/env fish
|
||||
xdg.configFile = {
|
||||
${gapsScript} = {
|
||||
executable = true;
|
||||
text = /* fish */ ''
|
||||
#!/usr/bin/env fish
|
||||
|
||||
hyprctl keyword general:gaps_out $(math 10 - $(hyprctl getoption general:gaps_out -j | jq -r ".custom" | choose 1))
|
||||
hyprctl keyword general:gaps_in $(math 5 - $(hyprctl getoption general:gaps_in -j | jq -r ".custom" | choose 1))
|
||||
hyprctl keyword general:border_size $(math 2 - $(hyprctl getoption general:border_size -j | jq -r ".int"))
|
||||
hyprctl keyword decoration:rounding $(math 8 - $(hyprctl getoption decoration:rounding -j | jq -r ".int"))
|
||||
'';
|
||||
};
|
||||
hyprctl keyword general:gaps_out $(math 10 - $(hyprctl getoption general:gaps_out -j | jq -r ".custom" | choose 1))
|
||||
hyprctl keyword general:gaps_in $(math 5 - $(hyprctl getoption general:gaps_in -j | jq -r ".custom" | choose 1))
|
||||
hyprctl keyword general:border_size $(math 2 - $(hyprctl getoption general:border_size -j | jq -r ".int"))
|
||||
hyprctl keyword decoration:rounding $(math 8 - $(hyprctl getoption decoration:rounding -j | jq -r ".int"))
|
||||
'';
|
||||
};
|
||||
|
||||
xdg.configFile.${setBackgroundScript} = {
|
||||
executable = true;
|
||||
text = /* fish */ ''
|
||||
#!/usr/bin/env fish
|
||||
${setBackgroundScript} = {
|
||||
executable = true;
|
||||
text = /* fish */ ''
|
||||
#!/usr/bin/env fish
|
||||
|
||||
if [ (hyprctl getoption animations:enabled -j | jq -r ".int") = "1" ]
|
||||
swww img \
|
||||
--transition-type $(random choice grow wave outer) \
|
||||
--transition-wave 80,40 \
|
||||
--transition-angle $(random choice 45 90 135 225 270 315) \
|
||||
--transition-pos $(random choice center top left right bottom top-left top-right bottom-left bottom-right) \
|
||||
--transition-step 200 \
|
||||
--transition-duration 1.5 \
|
||||
--transition-fps 240 \
|
||||
--outputs "$argv[1]" \
|
||||
"$argv[2]"
|
||||
else
|
||||
swww img \
|
||||
--transition-type simple \
|
||||
--transition-step 255 \
|
||||
--outputs "$argv[1]" \
|
||||
"$argv[2]"
|
||||
end
|
||||
'';
|
||||
};
|
||||
if [ (hyprctl getoption animations:enabled -j | jq -r ".int") = "1" ]
|
||||
swww img \
|
||||
--transition-type $(random choice grow wave outer) \
|
||||
--transition-wave 80,40 \
|
||||
--transition-angle $(random choice 45 90 135 225 270 315) \
|
||||
--transition-pos $(random choice center top left right bottom top-left top-right bottom-left bottom-right) \
|
||||
--transition-step 200 \
|
||||
--transition-duration 1.5 \
|
||||
--transition-fps 240 \
|
||||
--outputs "$argv[1]" \
|
||||
"$argv[2]"
|
||||
else
|
||||
swww img \
|
||||
--transition-type simple \
|
||||
--transition-step 255 \
|
||||
--outputs "$argv[1]" \
|
||||
"$argv[2]"
|
||||
end
|
||||
'';
|
||||
};
|
||||
|
||||
xdg.configFile.${randomBackgroundScript} = {
|
||||
executable = true;
|
||||
text = /* fish */ ''
|
||||
#!/usr/bin/env fish
|
||||
${randomBackgroundScript} = {
|
||||
executable = true;
|
||||
text = /* fish */ ''
|
||||
#!/usr/bin/env fish
|
||||
|
||||
for monitor in (hyprctl monitors -j | jq -r '.[].name')
|
||||
~/.config/${setBackgroundScript} "$monitor" "$(random choice $(fd . ${osu-backgrounds}/2024-07-15-Aerial-Antics-Art-Contest-All-Entries --follow -e jpg -e png))"
|
||||
end
|
||||
'';
|
||||
};
|
||||
for monitor in (hyprctl monitors -j | jq -r '.[].name')
|
||||
~/.config/${setBackgroundScript} "$monitor" "$(random choice $(fd . ${osu-backgrounds}/2024-07-15-Aerial-Antics-Art-Contest-All-Entries --follow -e jpg -e png))"
|
||||
end
|
||||
'';
|
||||
};
|
||||
|
||||
xdg.configFile.${swapBackgroundScript} = {
|
||||
executable = true;
|
||||
text = /* fish */ ''
|
||||
#!/usr/bin/env fish
|
||||
${swapBackgroundScript} = {
|
||||
executable = true;
|
||||
text = /* fish */ ''
|
||||
#!/usr/bin/env fish
|
||||
|
||||
set M "$(swww query | cut -d ':' -f 5)"
|
||||
set M1 "$(echo "$M" | head -n 1 | awk '{$1=$1};1')"
|
||||
set M2 "$(echo "$M" | tail -n 1 | awk '{$1=$1};1')"
|
||||
set M "$(swww query | cut -d ':' -f 5)"
|
||||
set M1 "$(echo "$M" | head -n 1 | awk '{$1=$1};1')"
|
||||
set M2 "$(echo "$M" | tail -n 1 | awk '{$1=$1};1')"
|
||||
|
||||
~/.config/${setBackgroundScript} "$(swww query | choose 0 | choose -c 0..-1 | tail -n 1)" "$M1"
|
||||
~/.config/${setBackgroundScript} "$(swww query | choose 0 | choose -c 0..-1 | head -n 1)" "$M2"
|
||||
'';
|
||||
};
|
||||
~/.config/${setBackgroundScript} "$(swww query | choose 0 | choose -c 0..-1 | tail -n 1)" "$M1"
|
||||
~/.config/${setBackgroundScript} "$(swww query | choose 0 | choose -c 0..-1 | head -n 1)" "$M2"
|
||||
'';
|
||||
};
|
||||
|
||||
xdg.configFile.${monitorScript} = {
|
||||
executable = true;
|
||||
text = /* fish */ ''
|
||||
#!/usr/bin/env fish
|
||||
${monitorScript} = {
|
||||
executable = true;
|
||||
text = /* fish */ ''
|
||||
#!/usr/bin/env fish
|
||||
|
||||
if test -n "$(hyprctl monitors -j | jq -r '.[] | select(.name | contains("eDP-1"))')"
|
||||
hyprctl keyword monitor eDP-1,disable
|
||||
else
|
||||
hyprctl keyword monitor eDP-1,preferred,auto-left,1
|
||||
end
|
||||
'';
|
||||
if test -n "$(hyprctl monitors -j | jq -r '.[] | select(.name | contains("eDP-1"))')"
|
||||
hyprctl keyword monitor eDP-1,disable
|
||||
else
|
||||
hyprctl keyword monitor eDP-1,preferred,auto-left,1
|
||||
end
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
programs.hyprlock = {
|
||||
|
||||
448
home/ironbar.nix
448
home/ironbar.nix
@ -13,259 +13,261 @@ in
|
||||
{
|
||||
home.packages = [ ironbar ];
|
||||
|
||||
xdg.configFile."ironbar/config.json".text = toJSON {
|
||||
name = "main";
|
||||
icon_theme = "Fluent-dark";
|
||||
position = "bottom";
|
||||
anchor_to_edges = true;
|
||||
xdg.configFile = {
|
||||
"ironbar/config.json".text = toJSON {
|
||||
name = "main";
|
||||
icon_theme = "Fluent-dark";
|
||||
position = "bottom";
|
||||
anchor_to_edges = true;
|
||||
|
||||
start = [
|
||||
{
|
||||
name = "startMenu";
|
||||
type = "label";
|
||||
label = "❄";
|
||||
on_mouse_enter = "rofi -show drun";
|
||||
}
|
||||
{
|
||||
type = "script";
|
||||
on_click_left = "mullvad relay set location any && mullvad relay set location us";
|
||||
cmd = "~/.config/${mullvadScript}";
|
||||
mode = "watch";
|
||||
}
|
||||
];
|
||||
start = [
|
||||
{
|
||||
name = "startMenu";
|
||||
type = "label";
|
||||
label = "❄";
|
||||
on_mouse_enter = "rofi -show drun";
|
||||
}
|
||||
{
|
||||
type = "script";
|
||||
on_click_left = "mullvad relay set location any && mullvad relay set location us";
|
||||
cmd = "~/.config/${mullvadScript}";
|
||||
mode = "watch";
|
||||
}
|
||||
];
|
||||
|
||||
center = singleton {
|
||||
type = "launcher";
|
||||
icon_size = 39;
|
||||
favorites = [
|
||||
"librewolf"
|
||||
"kitty"
|
||||
"thunar"
|
||||
"org.qutebrowser.qutebrowser"
|
||||
"anki"
|
||||
center = singleton {
|
||||
type = "launcher";
|
||||
icon_size = 39;
|
||||
favorites = [
|
||||
"librewolf"
|
||||
"kitty"
|
||||
"thunar"
|
||||
"org.qutebrowser.qutebrowser"
|
||||
"anki"
|
||||
];
|
||||
};
|
||||
|
||||
end = [
|
||||
{
|
||||
type = "script";
|
||||
cmd = "~/.config/${volumeScript}";
|
||||
on_click_left = "swayosd-client --output-volume raise";
|
||||
on_click_right = "swayosd-client --output-volume lower";
|
||||
mode = "watch";
|
||||
}
|
||||
{
|
||||
type = "upower";
|
||||
show_if = "upower -e | grep BAT";
|
||||
}
|
||||
{
|
||||
type = "clock";
|
||||
format = "%x（%a）%R";
|
||||
}
|
||||
{
|
||||
type = "notifications";
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
end = [
|
||||
{
|
||||
type = "script";
|
||||
cmd = "~/.config/${volumeScript}";
|
||||
on_click_left = "swayosd-client --output-volume raise";
|
||||
on_click_right = "swayosd-client --output-volume lower";
|
||||
mode = "watch";
|
||||
"ironbar/style.css".text = /* css */ ''
|
||||
* {
|
||||
font-family: "Noto Sans CJK JP", "Font Awesome 6 Free Solid";
|
||||
font-size: 16px;
|
||||
text-shadow: 2px 2px #${base00};
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
outline: none;
|
||||
font-weight: 500;
|
||||
background: none;
|
||||
color: #${base05};
|
||||
}
|
||||
{
|
||||
type = "upower";
|
||||
show_if = "upower -e | grep BAT";
|
||||
|
||||
.background {
|
||||
background: alpha(#${base00}, 0.925);
|
||||
}
|
||||
{
|
||||
type = "clock";
|
||||
format = "%x（%a）%R";
|
||||
|
||||
button:hover {
|
||||
background: #${base01};
|
||||
}
|
||||
{
|
||||
type = "notifications";
|
||||
|
||||
#bar {
|
||||
border-top: 1px solid #${base01};
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
xdg.configFile."ironbar/style.css".text = /* css */ ''
|
||||
* {
|
||||
font-family: "Noto Sans CJK JP", "Font Awesome 6 Free Solid";
|
||||
font-size: 16px;
|
||||
text-shadow: 2px 2px #${base00};
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
outline: none;
|
||||
font-weight: 500;
|
||||
background: none;
|
||||
color: #${base05};
|
||||
}
|
||||
.label, .script, .tray {
|
||||
padding-left: 0.5em;
|
||||
padding-right: 0.5em;
|
||||
}
|
||||
|
||||
.background {
|
||||
background: alpha(#${base00}, 0.925);
|
||||
}
|
||||
.notifications button {
|
||||
padding-left: 0.2em;
|
||||
padding-right: 0.7em;
|
||||
}
|
||||
|
||||
button:hover {
|
||||
background: #${base01};
|
||||
}
|
||||
.upower {
|
||||
padding-left: 0.2em;
|
||||
padding-right: 0.2em;
|
||||
}
|
||||
|
||||
#bar {
|
||||
border-top: 1px solid #${base01};
|
||||
}
|
||||
.upower .label {
|
||||
padding-left: 0;
|
||||
padding-right: 0;
|
||||
}
|
||||
|
||||
.label, .script, .tray {
|
||||
padding-left: 0.5em;
|
||||
padding-right: 0.5em;
|
||||
}
|
||||
.popup {
|
||||
border: 1px solid #${base01};
|
||||
padding: 1em;
|
||||
}
|
||||
|
||||
.notifications button {
|
||||
padding-left: 0.2em;
|
||||
padding-right: 0.7em;
|
||||
}
|
||||
.clock {
|
||||
padding-right: 0.4em;
|
||||
}
|
||||
|
||||
.upower {
|
||||
padding-left: 0.2em;
|
||||
padding-right: 0.2em;
|
||||
}
|
||||
.popup-clock .calendar-clock {
|
||||
font-family: "Maple Mono";
|
||||
font-size: 2.5em;
|
||||
padding-bottom: 0.1em;
|
||||
}
|
||||
|
||||
.upower .label {
|
||||
padding-left: 0;
|
||||
padding-right: 0;
|
||||
}
|
||||
.popup-clock .calendar .header {
|
||||
padding-top: 1em;
|
||||
border-top: 1px solid #${base01};
|
||||
font-size: 1.5em;
|
||||
}
|
||||
|
||||
.popup {
|
||||
border: 1px solid #${base01};
|
||||
padding: 1em;
|
||||
}
|
||||
.popup-clock .calendar {
|
||||
padding: 0.2em 0.4em;
|
||||
}
|
||||
|
||||
.clock {
|
||||
padding-right: 0.4em;
|
||||
}
|
||||
.popup-clock .calendar:selected {
|
||||
color: #${base0D};
|
||||
}
|
||||
|
||||
.popup-clock .calendar-clock {
|
||||
font-family: "Maple Mono";
|
||||
font-size: 2.5em;
|
||||
padding-bottom: 0.1em;
|
||||
}
|
||||
.launcher .item {
|
||||
padding-left: 1em;
|
||||
padding-right: 1em;
|
||||
margin-right: 4px;
|
||||
}
|
||||
|
||||
.popup-clock .calendar .header {
|
||||
padding-top: 1em;
|
||||
border-top: 1px solid #${base01};
|
||||
font-size: 1.5em;
|
||||
}
|
||||
button:active {
|
||||
background: #${base04};
|
||||
}
|
||||
|
||||
.popup-clock .calendar {
|
||||
padding: 0.2em 0.4em;
|
||||
}
|
||||
.launcher .open {
|
||||
box-shadow: inset 0 -2px #${base04};
|
||||
}
|
||||
|
||||
.popup-clock .calendar:selected {
|
||||
color: #${base0D};
|
||||
}
|
||||
.launcher .focused {
|
||||
box-shadow: inset 0 -2px #${base0D};
|
||||
background: #${base01};
|
||||
}
|
||||
|
||||
.launcher .item {
|
||||
padding-left: 1em;
|
||||
padding-right: 1em;
|
||||
margin-right: 4px;
|
||||
}
|
||||
.popup-launcher {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
button:active {
|
||||
background: #${base04};
|
||||
}
|
||||
.popup-launcher .popup-item:not(:first-child) {
|
||||
border-top: 1px solid #${base01};
|
||||
}
|
||||
|
||||
.launcher .open {
|
||||
box-shadow: inset 0 -2px #${base04};
|
||||
}
|
||||
|
||||
.launcher .focused {
|
||||
box-shadow: inset 0 -2px #${base0D};
|
||||
background: #${base01};
|
||||
}
|
||||
|
||||
.popup-launcher {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.popup-launcher .popup-item:not(:first-child) {
|
||||
border-top: 1px solid #${base01};
|
||||
}
|
||||
|
||||
#startMenu {
|
||||
padding-left: 1em;
|
||||
padding-right: 0.5em;
|
||||
}
|
||||
'';
|
||||
|
||||
xdg.configFile.${mullvadScript} = {
|
||||
executable = true;
|
||||
text = /* fish */ ''
|
||||
#!/usr/bin/env fish
|
||||
|
||||
sleep 2
|
||||
|
||||
function get_mullvad_status
|
||||
if test -z "$inside"
|
||||
set inside true
|
||||
test -n "$initialized" && sleep 0.2
|
||||
|
||||
set MULLVAD (mullvad status | head -1)
|
||||
|
||||
set LOCATION (echo "$MULLVAD" | choose 4.. | sed \
|
||||
-e 's/Ashburn.*/アッシュバーン/g' \
|
||||
-e 's/Atlanta.*/アトランタ/g' \
|
||||
-e 's/Boston.*/ボストン/g' \
|
||||
-e 's/Charlotte.*/シャーロット/g' \
|
||||
-e 's/Chicago.*/シカゴ/g' \
|
||||
-e 's/Cleveland.*/クリーブランド/g' \
|
||||
-e 's/Dallas.*/ダラス/g' \
|
||||
-e 's/Detroit.*/デトロイト/g' \
|
||||
-e 's/Denver.*/デンバー/g' \
|
||||
-e 's/Honolulu.*/ホノルル/g' \
|
||||
-e 's/Houston.*/ヒューストン/g' \
|
||||
-e 's/Jackson.*/ジャクソン/g' \
|
||||
-e 's/Los Angeles.*/ロサンゼルス/g' \
|
||||
-e 's/Louisville.*/ルイビル/g' \
|
||||
-e 's/McAllen.*/マッカレン/g' \
|
||||
-e 's/Miami.*/マイアミ/g' \
|
||||
-e 's/Milwaukee.*/ミルウォーキー/g' \
|
||||
-e 's/Minneapolis.*/ミネアポリス/g' \
|
||||
-e 's/New York.*/ニューヨーク/g' \
|
||||
-e 's/Oklahoma.*/オクラホマシティ/g' \
|
||||
-e 's/Philadelphia.*/フィラデルフィア/g' \
|
||||
-e 's/Phoenix.*/フィニックス/g' \
|
||||
-e 's/Piscataway.*/ピスカタウェイ/g' \
|
||||
-e 's/Portland.*/ポートランド/g' \
|
||||
-e 's/Raleigh.*/ローリー/g' \
|
||||
-e 's/Richmond.*/リッチモンド/g' \
|
||||
-e 's/Salt Lake.*/ソルトレイクシティ/g' \
|
||||
-e 's/San Francisco.*/サンフランシスコ/g' \
|
||||
-e 's/San Jose.*/サンノゼ/g' \
|
||||
-e 's/Seattle.*/シアトル/g' \
|
||||
-e 's/Secaucus.*/セコーカス/g' \
|
||||
-e 's/Sioux Falls.*/スーフォールズ/g' \
|
||||
-e 's/St. Louis.*/セントルイス/g' \
|
||||
-e 's/Stamford.*/スタンフォード/g' \
|
||||
-e 's/Washington.*/ワシントン/g'
|
||||
)
|
||||
|
||||
echo "$LOCATION"
|
||||
|
||||
set -e inside
|
||||
end
|
||||
end
|
||||
|
||||
get_mullvad_status
|
||||
set initialized true
|
||||
|
||||
${inotify-tools}/bin/inotifywait -q -e close_write,moved_to,create -m /etc/mullvad-vpn |
|
||||
while read directory events filename
|
||||
get_mullvad_status
|
||||
end
|
||||
#startMenu {
|
||||
padding-left: 1em;
|
||||
padding-right: 0.5em;
|
||||
}
|
||||
'';
|
||||
};
|
||||
|
||||
xdg.configFile.${volumeScript} = {
|
||||
executable = true;
|
||||
text = /* fish */ ''
|
||||
#!/usr/bin/env fish
|
||||
${mullvadScript} = {
|
||||
executable = true;
|
||||
text = /* fish */ ''
|
||||
#!/usr/bin/env fish
|
||||
|
||||
sleep 2
|
||||
|
||||
function get_mullvad_status
|
||||
if test -z "$inside"
|
||||
set inside true
|
||||
test -n "$initialized" && sleep 0.2
|
||||
|
||||
set MULLVAD (mullvad status | head -1)
|
||||
|
||||
set LOCATION (echo "$MULLVAD" | choose 4.. | sed \
|
||||
-e 's/Ashburn.*/アッシュバーン/g' \
|
||||
-e 's/Atlanta.*/アトランタ/g' \
|
||||
-e 's/Boston.*/ボストン/g' \
|
||||
-e 's/Charlotte.*/シャーロット/g' \
|
||||
-e 's/Chicago.*/シカゴ/g' \
|
||||
-e 's/Cleveland.*/クリーブランド/g' \
|
||||
-e 's/Dallas.*/ダラス/g' \
|
||||
-e 's/Detroit.*/デトロイト/g' \
|
||||
-e 's/Denver.*/デンバー/g' \
|
||||
-e 's/Honolulu.*/ホノルル/g' \
|
||||
-e 's/Houston.*/ヒューストン/g' \
|
||||
-e 's/Jackson.*/ジャクソン/g' \
|
||||
-e 's/Los Angeles.*/ロサンゼルス/g' \
|
||||
-e 's/Louisville.*/ルイビル/g' \
|
||||
-e 's/McAllen.*/マッカレン/g' \
|
||||
-e 's/Miami.*/マイアミ/g' \
|
||||
-e 's/Milwaukee.*/ミルウォーキー/g' \
|
||||
-e 's/Minneapolis.*/ミネアポリス/g' \
|
||||
-e 's/New York.*/ニューヨーク/g' \
|
||||
-e 's/Oklahoma.*/オクラホマシティ/g' \
|
||||
-e 's/Philadelphia.*/フィラデルフィア/g' \
|
||||
-e 's/Phoenix.*/フィニックス/g' \
|
||||
-e 's/Piscataway.*/ピスカタウェイ/g' \
|
||||
-e 's/Portland.*/ポートランド/g' \
|
||||
-e 's/Raleigh.*/ローリー/g' \
|
||||
-e 's/Richmond.*/リッチモンド/g' \
|
||||
-e 's/Salt Lake.*/ソルトレイクシティ/g' \
|
||||
-e 's/San Francisco.*/サンフランシスコ/g' \
|
||||
-e 's/San Jose.*/サンノゼ/g' \
|
||||
-e 's/Seattle.*/シアトル/g' \
|
||||
-e 's/Secaucus.*/セコーカス/g' \
|
||||
-e 's/Sioux Falls.*/スーフォールズ/g' \
|
||||
-e 's/St. Louis.*/セントルイス/g' \
|
||||
-e 's/Stamford.*/スタンフォード/g' \
|
||||
-e 's/Washington.*/ワシントン/g'
|
||||
)
|
||||
|
||||
echo "$LOCATION"
|
||||
|
||||
set -e inside
|
||||
end
|
||||
end
|
||||
|
||||
get_mullvad_status
|
||||
set initialized true
|
||||
|
||||
${inotify-tools}/bin/inotifywait -q -e close_write,moved_to,create -m /etc/mullvad-vpn |
|
||||
while read directory events filename
|
||||
get_mullvad_status
|
||||
end
|
||||
'';
|
||||
};
|
||||
|
||||
${volumeScript} = {
|
||||
executable = true;
|
||||
text = /* fish */ ''
|
||||
#!/usr/bin/env fish
|
||||
|
||||
function get_volume
|
||||
set VOLUME (wpctl get-volume @DEFAULT_AUDIO_SINK@ | choose 1)
|
||||
echo "音量：$(math "$VOLUME * 100")%"
|
||||
end
|
||||
|
||||
~/.config/${volumeGet}
|
||||
|
||||
pactl subscribe | grep --line-buffered -e "シンク" | xargs -L 1 ~/.config/${volumeGet}
|
||||
'';
|
||||
};
|
||||
|
||||
${volumeGet} = {
|
||||
executable = true;
|
||||
text = /* fish */ ''
|
||||
#!/usr/bin/env fish
|
||||
|
||||
function get_volume
|
||||
set VOLUME (wpctl get-volume @DEFAULT_AUDIO_SINK@ | choose 1)
|
||||
echo "音量：$(math "$VOLUME * 100")%"
|
||||
end
|
||||
|
||||
~/.config/${volumeGet}
|
||||
|
||||
pactl subscribe | grep --line-buffered -e "シンク" | xargs -L 1 ~/.config/${volumeGet}
|
||||
'';
|
||||
};
|
||||
|
||||
xdg.configFile.${volumeGet} = {
|
||||
executable = true;
|
||||
text = /* fish */ ''
|
||||
#!/usr/bin/env fish
|
||||
|
||||
set VOLUME (wpctl get-volume @DEFAULT_AUDIO_SINK@ | choose 1)
|
||||
echo "音量：$(math "$VOLUME * 100")%"
|
||||
'';
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,10 +5,15 @@
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot = {
|
||||
initrd = {
|
||||
availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ];
|
||||
kernelModules = [ ];
|
||||
};
|
||||
|
||||
kernelModules = [ "kvm-amd" ];
|
||||
extraModulePackages = [ ];
|
||||
};
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
|
||||
@ -171,18 +171,19 @@ in
|
||||
fonts = {
|
||||
enableDefaultPackages = false;
|
||||
|
||||
packages = with pkgs; [
|
||||
noto-fonts
|
||||
packages = [
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts-cjk-serif
|
||||
noto-fonts-emoji
|
||||
maple-mono
|
||||
aleo-fonts
|
||||
] ++ (with pkgs; [
|
||||
noto-fonts
|
||||
noto-fonts-cjk-serif
|
||||
font-awesome
|
||||
(nerdfonts.override { fonts = [ "Noto" ]; })
|
||||
kanji-stroke-order-font
|
||||
liberation_ttf
|
||||
aleo-fonts
|
||||
];
|
||||
]);
|
||||
|
||||
fontconfig = {
|
||||
defaultFonts = {
|
||||
|
||||
@ -6,11 +6,12 @@ let
|
||||
inherit (builtins) attrValues;
|
||||
in
|
||||
{
|
||||
config = {
|
||||
users.defaultUserShell = fish;
|
||||
environment.shells = [ fish ];
|
||||
users.defaultUserShell = fish;
|
||||
|
||||
environment.sessionVariables = {
|
||||
environment = {
|
||||
shells = [ fish ];
|
||||
|
||||
sessionVariables = {
|
||||
GIT_DISCOVERY_ACROSS_FILESYSTEM = "1";
|
||||
FZF_DEFAULT_OPTS = "--height 40% --reverse --border --color=16";
|
||||
NODE_OPTIONS = "--max-old-space-size=16384";
|
||||
@ -18,7 +19,7 @@ in
|
||||
GATSBY_TELEMETRY_DISABLED = "1";
|
||||
};
|
||||
|
||||
environment.systemPackages = mkMerge [
|
||||
systemPackages = mkMerge [
|
||||
(attrValues {
|
||||
inherit (pkgs)
|
||||
wget
|
||||
@ -119,15 +120,15 @@ in
|
||||
;
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
programs = {
|
||||
fish.enable = true;
|
||||
neovim.enable = true;
|
||||
programs = {
|
||||
fish.enable = true;
|
||||
neovim.enable = true;
|
||||
|
||||
direnv = {
|
||||
enable = true;
|
||||
silent = true;
|
||||
};
|
||||
direnv = {
|
||||
enable = true;
|
||||
silent = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user