Goodbye & thank you Serokell, Hello Tweag!
This commit is contained in:
parent
a9fa65bf05
commit
29624647f0
GPG Key ID:
E081FF12ADCB4AD5
54
flake.lock
generated
54
flake.lock
generated
@ -211,22 +211,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"haskell-nix": {
|
||||
"locked": {
|
||||
"lastModified": 1587989559,
|
||||
"narHash": "sha256-5GwV9ueo7jX0/sbU9+YLUzkqY9cSDwQp3VCimYRuSlY=",
|
||||
"owner": "serokell",
|
||||
"repo": "haskell.nix",
|
||||
"rev": "a562ef6eec71672e3f414f76cc7c751466e1d099",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "serokell",
|
||||
"ref": "flake",
|
||||
"repo": "haskell.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"himalaya": {
|
||||
"inputs": {
|
||||
"crate2nix": "crate2nix",
|
||||
@ -481,21 +465,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_10": {
|
||||
"locked": {
|
||||
"lastModified": 1587390417,
|
||||
"narHash": "sha256-dLQebnBviLNiN2Ei3Iqyxm73EFwz77YcvitvMYwRNA8=",
|
||||
"owner": "serokell",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "6951747f4f4e9e27580150eb91587af94e41640d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "serokell",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1627857416,
|
||||
@ -644,8 +613,7 @@
|
||||
"rycee": "rycee",
|
||||
"simple-nixos-mailserver": "simple-nixos-mailserver",
|
||||
"simple-osd-daemons": "simple-osd-daemons",
|
||||
"sonoff-lan": "sonoff-lan",
|
||||
"yt-utilities": "yt-utilities"
|
||||
"sonoff-lan": "sonoff-lan"
|
||||
}
|
||||
},
|
||||
"rust-overlay": {
|
||||
@ -763,26 +731,6 @@
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"yt-utilities": {
|
||||
"inputs": {
|
||||
"haskell-nix": "haskell-nix",
|
||||
"nixpkgs": "nixpkgs_10"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1588006875,
|
||||
"narHash": "sha256-u9CWK+nvCdkB5IlOLu/5BT9gzhZuh+SRcazRZV+vLuM=",
|
||||
"ref": "flake",
|
||||
"rev": "4485a1d87b027870bb1278cf827f5dc33d8367e9",
|
||||
"revCount": 288,
|
||||
"type": "git",
|
||||
"url": "ssh://git@github.com/serokell/yt-utilities"
|
||||
},
|
||||
"original": {
|
||||
"ref": "flake",
|
||||
"type": "git",
|
||||
"url": "ssh://git@github.com/serokell/yt-utilities"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
||||
@ -37,11 +37,6 @@
|
||||
url = "github:colemickens/nixpkgs-wayland";
|
||||
flake = false;
|
||||
};
|
||||
yt-utilities = {
|
||||
type = "git";
|
||||
url = "ssh://git@github.com/serokell/yt-utilities";
|
||||
ref = "flake";
|
||||
};
|
||||
nixos-fhs-compat.url = "github:balsoft/nixos-fhs-compat";
|
||||
simple-osd-daemons.url = "github:balsoft/simple-osd-daemons";
|
||||
emacs-overlay.url = "github:nix-community/emacs-overlay";
|
||||
|
||||
@ -35,21 +35,4 @@
|
||||
|
||||
derivative.directories = [ "/home/balsoft/.local/share/wineprefixes/default" ];
|
||||
};
|
||||
|
||||
services.ezwg = {
|
||||
enable = true;
|
||||
proxy = true;
|
||||
lanSize = 32;
|
||||
serverIP = "95.217.152.163";
|
||||
serverPort = 35944;
|
||||
serverKey = "sgLUARawWJejANs2CwuCptwJO55c4jkmnP0L14FNCyw=";
|
||||
privateKeyFile = config.secrets.wireguard-wg0.decrypted;
|
||||
vlanIP = "172.20.0.52";
|
||||
};
|
||||
|
||||
# restart when the service fails to resolve DNS
|
||||
systemd.services.wireguard-serokell.serviceConfig = {
|
||||
Restart = "on-failure";
|
||||
RestartSec = "30s";
|
||||
};
|
||||
}
|
||||
|
||||
@ -58,9 +58,6 @@ let
|
||||
lib.escapeShellArg config.secretsConfig.repo
|
||||
} "${password-store}"
|
||||
fi
|
||||
ln -sf ${
|
||||
pkgs.writeShellScript "push" "${pkgs.git}/bin/git push origin master"
|
||||
} "${password-store}/.git/hooks/post-commit"
|
||||
cat ${password-store}/email/balsoft@balsoft.ru.gpg | ${pkgs.gnupg}/bin/gpg --decrypt > /dev/null
|
||||
sudo systemctl restart ${allServices}
|
||||
'';
|
||||
|
||||
@ -13,10 +13,10 @@ let
|
||||
--
|
||||
Александр Бантьев /Alexander Bantyev/ aka balsoft
|
||||
|
||||
Nix DevOPS/SRE at serokell.io
|
||||
Nix DevOPS/SRE at tweag.io
|
||||
|
||||
<balsoft@balsoft.ru>
|
||||
<alexander.bantyev@serokell.io>
|
||||
<alexander.bantyev@tweag.io>
|
||||
|
||||
matrix://@balsoft:balsoft.ru
|
||||
(https://matrix.to/#/@balsoft:balsoft.ru)
|
||||
|
||||
@ -17,7 +17,6 @@
|
||||
editor = "";
|
||||
aliases = {
|
||||
pv = "pr view --comments";
|
||||
pcr = "pr create -r serokell/operations";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
{ pkgs, config, lib, inputs, ... }: {
|
||||
home-manager.users.balsoft = {
|
||||
home.packages = [ inputs.yt-utilities.defaultPackage.x86_64-linux ];
|
||||
home.activation.yt-config = "$DRY_RUN_CMD ln -sf $VERBOSE_ARG ${config.secrets-envsubst.yt} $HOME/.yt.yaml";
|
||||
};
|
||||
secrets-envsubst.yt = {
|
||||
secrets = [ "user" "token" ];
|
||||
owner = "balsoft:users";
|
||||
template = builtins.toJSON {
|
||||
yt-token = "$token";
|
||||
user = "$user";
|
||||
from = {
|
||||
org = "/home/balsoft/Documents/serokell.org";
|
||||
full-file = true;
|
||||
};
|
||||
since = "1997-11-19";
|
||||
severity = "Info";
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -122,8 +122,6 @@ in {
|
||||
|
||||
simple-osd = inputs.simple-osd-daemons.packages.${system};
|
||||
|
||||
yt-utilities = inputs.yt-utilities.defaultPackage.${system};
|
||||
|
||||
nerdfonts = nur.balsoft.pkgs.roboto-mono-nerd;
|
||||
|
||||
# inkscape = super.inkscape.overrideAttrs (oa: {
|
||||
|
||||
@ -20,3 +20,15 @@ AcceptSslErrors=false
|
||||
# PhotosEnabled=true
|
||||
# FilesEnabled=true
|
||||
# PrintersEnabled=true
|
||||
|
||||
[Account account_1635512206_0]
|
||||
Provider=google
|
||||
Identity=alexander.bantyev@tweag.io
|
||||
PresentationIdentity=alexander.bantyev@tweag.io
|
||||
MailEnabled=true
|
||||
CalendarEnabled=true
|
||||
ContactsEnabled=true
|
||||
DocumentsEnabled=true
|
||||
PhotosEnabled=true
|
||||
FilesEnabled=true
|
||||
PrintersEnabled=true
|
||||
|
||||
@ -55,7 +55,7 @@ in {
|
||||
markup=pango
|
||||
'' + pkgs.my-lib.genIniOrdered ([ (scr "email") ]
|
||||
++ [ (scrint "weather" 600) (scr "emacs") (scr "nixos") ]
|
||||
++ [ (scrint "youtrack-wage" 3600) (scrint "music" 3) (scrint "sound" 1) ]
|
||||
++ [ (scrint "music" 3) (scrint "sound" 1) ]
|
||||
++ [
|
||||
(scrint "cpu" 5)
|
||||
(scrint "freq" 10)
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
{ bash, yt-utilities, libqalculate, config, lib, ... }:
|
||||
let ec = config.home-manager.users.balsoft.programs.emacs.finalPackage;
|
||||
in
|
||||
''
|
||||
#!${bash}/bin/bash
|
||||
set -euo pipefail
|
||||
export PATH="$PATH:${yt-utilities}/bin:${ec}/bin:${libqalculate}/bin"
|
||||
WAGE=$(cat ${config.secrets.wage.decrypted})
|
||||
HOURS_MONTH=$(yt org local --since $(date +'%Y-%m-01') | tail -1)
|
||||
MONEY_MONTH=$(qalc -t "($HOURS_MONTH) * $WAGE")
|
||||
'' + (if config.deviceSpecific.bigScreen then ''
|
||||
HOURS_DAY=$(yt org local --since $(date +'%Y-%m-%d') | tail -1)
|
||||
HOURS_YEAR=$(yt org local --since $(date +'%Y-01-01') | tail -1)
|
||||
MONEY_DAY=$(qalc -t "($HOURS_DAY) * $WAGE")
|
||||
MONEY_YEAR=$(qalc -t "($HOURS_YEAR) * $WAGE")
|
||||
TASK=$(emacsclient --eval "org-mode-line-string" 2>/dev/null || echo -n none)
|
||||
if ! [[ "$TASK" == "none" ]]; then
|
||||
HOURS_TASK=$(echo "$TASK" | head -1 | cut -d\" -f 2 | cut -d\[ -f2 | cut -d\] -f1)h
|
||||
MONEY_TASK=$(qalc -t -e "$HOURS_TASK * $WAGE" )
|
||||
echo "$MONEY_TASK/$MONEY_DAY($HOURS_DAY)/$MONEY_MONTH($HOURS_MONTH)/$MONEY_YEAR"
|
||||
else
|
||||
echo "$MONEY_DAY($HOURS_DAY)/$MONEY_MONTH($HOURS_MONTH)/$MONEY_YEAR"
|
||||
fi
|
||||
'' else ''
|
||||
echo "$MONEY_MONTH($HOURS_MONTH)"
|
||||
'')
|
||||
@ -96,7 +96,7 @@ in {
|
||||
};
|
||||
startup = (map (command: { inherit command; }) config.startupApplications) ++ [
|
||||
{ command = toString (pkgs.writeShellScript "slack" ''
|
||||
firefox https://serokell.slack.com &
|
||||
firefox https://tweag.slack.com &
|
||||
sleep 10
|
||||
swaymsg '[title=Slack.*] move to workspace '
|
||||
swaymsg '[title=Slack.*] fullscreen disable'
|
||||
|
||||
@ -23,7 +23,6 @@
|
||||
himalaya
|
||||
nheko
|
||||
packages
|
||||
yt-utilities
|
||||
|
||||
cursor
|
||||
direnv
|
||||
|
||||
Loading…
Reference in New Issue
Block a user