Compare commits

..

No commits in common. "a988dd11831303d8921c9f8a04c577af88ef453b" and "1a85ad210fb689309c3126d9cb107c980802f273" have entirely different histories.

5 changed files with 4 additions and 41 deletions

View file

@ -1,5 +1,4 @@
zipline: ENC[AES256_GCM,data:YQMdw1cJy9wFnJsX6fPWBXK0rPEnuJJwJysVh0vggcnySFjl5Dmolaqxhw==,iv:RKB+rNz76ZxqzmyATLcpHmaap1f6aWWm7smBTieMZ8M=,tag:GN967VhwqZwMA6uzshKBmQ==,type:str] zipline: ENC[AES256_GCM,data:YQMdw1cJy9wFnJsX6fPWBXK0rPEnuJJwJysVh0vggcnySFjl5Dmolaqxhw==,iv:RKB+rNz76ZxqzmyATLcpHmaap1f6aWWm7smBTieMZ8M=,tag:GN967VhwqZwMA6uzshKBmQ==,type:str]
coastalcommits: ENC[AES256_GCM,data:VVpY/T93GUf7eeGrfCtpeujrY27CTBbpquGlZo6m9a20Tiy32hwiAw==,iv:R2rQUF4MbA/n6z9Vd9LpTPM2y8dFL726IXErprpQqOc=,tag:N5duDIWbHHVVAWidzF3dpw==,type:str]
users: users:
cswimr: cswimr:
password: ENC[AES256_GCM,data:KPB3C8z1vBB6M6hcuLQyIzoID23v/syTui3eFfrVKwzDwL4X7BdYbnYfuJSXedce+KHmvZv+AE6w3PTD9c7CPpLUlUQmteAY6w==,iv:a393VckzNy+vRqb9vDr9QRBQe27bHOUJR3JwrHAP5g4=,tag:UDl+3dWV+GrJ7Wva3y9VsQ==,type:str] password: ENC[AES256_GCM,data:KPB3C8z1vBB6M6hcuLQyIzoID23v/syTui3eFfrVKwzDwL4X7BdYbnYfuJSXedce+KHmvZv+AE6w3PTD9c7CPpLUlUQmteAY6w==,iv:a393VckzNy+vRqb9vDr9QRBQe27bHOUJR3JwrHAP5g4=,tag:UDl+3dWV+GrJ7Wva3y9VsQ==,type:str]
@ -27,8 +26,8 @@ sops:
b1JvNi9YODZPN1FObWpOVHN3aU85NFEK1dN5pV8g3nG3D2l482z1JCRzmJ/9m495 b1JvNi9YODZPN1FObWpOVHN3aU85NFEK1dN5pV8g3nG3D2l482z1JCRzmJ/9m495
YEobjXbEqQDhvA47ueWojoMjvQ3CgrPyiL6v+DLj7VfI5cyuo+89IQ== YEobjXbEqQDhvA47ueWojoMjvQ3CgrPyiL6v+DLj7VfI5cyuo+89IQ==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2024-12-19T15:25:22Z" lastmodified: "2024-12-03T02:52:14Z"
mac: ENC[AES256_GCM,data:xt7E7eM16GzJCUgExZiHz6wkjF7Hne+uiDmefryqCIpwVHwGUafx56VGlmEvLSSMSpTgdf9LLfHZ2rHnaVkdSe+ujxVaDsO67zreh23kUYyRg4T/YfHKI3J9qthd8RffFQwgwpD6uzV4Vju+tnXzNcl0mH2h1S8Lrkl/4SRRDMU=,iv:FNgrrtDZkK+dD8fTnUkx6doTqosgdVdGrOYIMafs7Iw=,tag:cNHa4WC3HaHsLmc12d65AQ==,type:str] mac: ENC[AES256_GCM,data:ai0BsmImgvbL7KI+ioxUEq0XhiMAziIoDYenLCXjaEEtX9gcvdlmzhuI7k8/MGJjtdAzKxnPWHwQeG1B59ub4Vv+jTOts5ERizbIxscSMhTYogW1CUWzfkunf2y2gViwcCogt2Qzf+v/lN0vQFlkPqJAK6Sd0R/b+vjIyOXMxO0=,iv:vRssoy2PJ8CXehsNoj/QoNesG2sMHNXgBlYtmlfaDzU=,tag:xQ/IsI0Bdzyqydw1blDfCA==,type:str]
pgp: [] pgp: []
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.9.2 version: 3.9.1

View file

@ -64,7 +64,7 @@ def _upd(args: list):
if "--purge-vscode-extensions" in args: if "--purge-vscode-extensions" in args:
args.remove("--purge-vscode-extensions") args.remove("--purge-vscode-extensions")
print(f"{c.BLUE}Killing {c.YELLOW}Visual Studio Code{c.BLUE} processes{c.END}") print(f"{c.BLUE}Killing {c.YELLOW}Visual Studio Code{c.BLUE} processes{c.END}")
run(["killall", "code"], exit_on_error=False) run(["killall", "code"])
print(f"{c.BLUE}Purging {c.YELLOW}Visual Studio Code{c.BLUE} extensions{c.END}") print(f"{c.BLUE}Purging {c.YELLOW}Visual Studio Code{c.BLUE} extensions{c.END}")
run(["rm", "-rf", ".vscode/extensions"], cwd="/home/cswimr") run(["rm", "-rf", ".vscode/extensions"], cwd="/home/cswimr")
print(f"{c.BLUE}Rebuilding {c.YELLOW}NixOS{c.BLUE} configuration{c.END}") print(f"{c.BLUE}Rebuilding {c.YELLOW}NixOS{c.BLUE} configuration{c.END}")

View file

@ -21,7 +21,6 @@ let
libnotify libnotify
hoppscotch hoppscotch
]; ];
customfonts = pkgs.callPackage ../packages/customfonts.nix { inherit pkgs; };
in in
{ {
environment.systemPackages = lib.lists.unique (kdePackages ++ packages); environment.systemPackages = lib.lists.unique (kdePackages ++ packages);
@ -45,7 +44,6 @@ in
programs.partition-manager.enable = true; programs.partition-manager.enable = true;
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
customfonts
corefonts corefonts
nerd-fonts.fira-code nerd-fonts.fira-code
]; ];

View file

@ -4,10 +4,6 @@
defaultSopsFile = ../.sops-secrets.yaml; defaultSopsFile = ../.sops-secrets.yaml;
age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
secrets = { secrets = {
"coastalcommits" = {
owner = user;
path = "/home/${user}/.secrets/coastalcommits";
};
"zipline" = { "zipline" = {
owner = user; owner = user;
path = "/home/${user}/.secrets/zipline"; path = "/home/${user}/.secrets/zipline";

View file

@ -1,30 +0,0 @@
{ pkgs, ... }:
pkgs.stdenv.mkDerivation {
pname = "customfonts";
version = "1.0";
src = pkgs.fetchurl {
url = "https://www.coastalcommits.com/cswimr/fonts/archive/master.tar.gz";
sha256 = "sha256-XBRNu1DxjhfloJkQrFy4Wz4IUD6abhKcZKkX/snyxs4";
};
unpackPhase = ''
runHook preUnpack
${pkgs.gnutar}/bin/tar xf $src
runHook postUnpack
'';
installPhase = ''
runHook preInstall
install -Dm644 fonts/ttf/ComicCode/*.ttf -t $out/share/fonts/truetype
install -Dm644 fonts/otf/ComicCode/*.otf -t $out/share/fonts/opentype
install -Dm644 fonts/ttf/ComicCodeNerdFont/*.ttf -t $out/share/fonts/truetype
install -Dm644 fonts/otf/ComicCodeNerdFont/*.otf -t $out/share/fonts/opentype
runHook postInstall
'';
}