kat/nixfiles
1
0
Fork 0
mirror of https://github.com/kittywitch/nixfiles.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity

Cleanups

Browse source
This commit is contained in:
Kat Inskip 2023-07-17 15:07:23 -07:00
parent c27b6d21af
commit 413ee5e6bc
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
16 changed files with 55 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

2
darwin/common/nix.nix
View file

@ -3,6 +3,8 @@ _: {
nix = { nix = {
extraOptions = '' extraOptions = ''
extra-platforms = x86_64-darwin aarch64-darwin extra-platforms = x86_64-darwin aarch64-darwin
builders-use-substitutes = true
build-fallback = true
''; '';
}; };
} }

2
darwin/common/system.nix
View file

@ -40,4 +40,6 @@ _: {
]; ];
}; };
}; };
users.users.kat.home = "/Users/kat";
users.users.root.home = "/var/root";
} }

61
flake.lock generated
View file

@ -3,11 +3,11 @@
"arcexprs": { "arcexprs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1686151686, "lastModified": 1689536930,
"narHash": "sha256-/YY+9A2Wgq9+IJHHsXQ5k6V1xVyKhvO50yWmbdp4f1E=", "narHash": "sha256-KcdLerVhBYP7hpUTrP3kj3a0RkFdw85XjoW7krcVtD0=",
"owner": "arcnmx", "owner": "arcnmx",
"repo": "nixexprs", "repo": "nixexprs",
"rev": "4899d9c123fc2c6570ce755344e08bf007a35ce8", "rev": "670f6ade5d1486e17f28f5298faf763b87a5ef6f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -24,11 +24,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1686307493, "lastModified": 1689516967,
"narHash": "sha256-R4VEFnDn7nRmNxAu1LwNbjns5DPM8IBsvnrWmZ8ymPs=", "narHash": "sha256-sFAa33wkQHanmij/uhfGduIDK8z4dJAita/rK6u9pvE=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "7c16d31383a90e0e72ace0c35d2d66a18f90fb4f", "rev": "61662a63bfe1726588c1da6b412df86d8ca94d63",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -60,6 +60,7 @@
}, },
"original": { "original": {
"owner": "serokell", "owner": "serokell",
"ref": "master",
"repo": "deploy-rs", "repo": "deploy-rs",
"type": "github" "type": "github"
} }
@ -102,11 +103,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1686922395, "lastModified": 1689495092,
"narHash": "sha256-ysevinohPxdKp0RXyhDRsz1/vh1eXazg4AWp0n5X/U4=", "narHash": "sha256-yZu2j5FpLZEPhJQQutMCPTxa1VMigLPabLYvLTq6ASM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "9ba7b3990eb1f4782ea3f5fe7ac4f3c88dd7a32c", "rev": "2f84579a70b8c74e5ebb37299a0c3ba279f09382",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -149,11 +150,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1686740472, "lastModified": 1689479461,
"narHash": "sha256-b668DY2qGdBCUwIkk6Z32bcpCsUISQJrEEvhtn1gGgY=", "narHash": "sha256-Ak+PTYdmfOQEmcOsOEnrwqdP0HP20PLraRwpjSAzSeE=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "e11c61073b777e025993c5ef63ddbf776a9cca15", "rev": "22fa44b7f14684d184733fb26a628f3878ff7aaf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -164,11 +165,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1686838567, "lastModified": 1689320556,
"narHash": "sha256-aqKCUD126dRlVSKV6vWuDCitfjFrZlkwNuvj5LtjRRU=", "narHash": "sha256-vODUkZLWFVCvo1KPK3dC2CbXjxa9antEn5ozwlcTr48=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "429f232fe1dc398c5afea19a51aad6931ee0fb89", "rev": "d4ea64f2063820120c05f6ba93ee02e6d4671d6b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -179,11 +180,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1686776226, "lastModified": 1689444953,
"narHash": "sha256-o6WbKvENj98QJz9Mco6T6SZGrjPewMDAFyKg0Lp8avU=", "narHash": "sha256-0o56bfb2LC38wrinPdCGLDScd77LVcr7CrH1zK7qvDg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0d2cf7fe5fa05d5271a15a8933414ee0a1570648", "rev": "8acef304efe70152463a6399f73e636bcc363813",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -195,11 +196,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1686885751, "lastModified": 1689473667,
"narHash": "sha256-KcbYp2KuKbXgNaYVziwKUc6AKRhgJ1G8Qq5gjAbQ3uw=", "narHash": "sha256-41ePf1ylHMTogSPAiufqvBbBos+gtB6zjQlYFSEKFMM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "aa4b53f79d961a7cbba0b24f791401a34c18011a", "rev": "13231eccfa1da771afa5c0807fdd73e05a1ec4e6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -278,11 +279,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1686902322, "lastModified": 1689534977,
"narHash": "sha256-Vogj2MsipA+Uzr0M3d8300JeKQDHhPy6NEuTQXVdWu0=", "narHash": "sha256-EB4hasmjKgetTR0My2bS5AwELZFIQ4zANLqHKi7aVXg=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "1e2bae54870a06aa9364f8d33a5b9a0869d792fc", "rev": "bd695cc4d0a5e1bead703cc1bec5fa3094820a81",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -373,11 +374,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1685518550, "lastModified": 1689068808,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -399,11 +400,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1686480427, "lastModified": 1689163449,
"narHash": "sha256-cs2cg+x21jM3e7gOX9zYRh/19i8DFInBDLtUWMEAdvA=", "narHash": "sha256-C/cm0fRoNGx00lDOieW5439jpBH9VRWRJcAOXUFy+zs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "c192f97d59acb878fd1f2f6f362c8632d1e8426e", "rev": "20a1f182aed3d2bbc72f62f5814fc3dd34a1cf0c",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -16,7 +16,7 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
# deployments # deployments
deploy-rs = { deploy-rs = {
url = "github:serokell/deploy-rs"; url = "github:serokell/deploy-rs/master";
inputs = { inputs = {
flake-compat.follows = "flake-compat"; flake-compat.follows = "flake-compat";
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs";

2
kat/base16.nix
View file

@ -14,6 +14,6 @@ in {
light.ansi.palette.background.alpha = "d000"; light.ansi.palette.background.alpha = "d000";
} }
]; ];
defaultSchemeName = "dark"; defaultSchemeName = "light";
}; };
} }

2
kat/shell/zsh.nix
View file

@ -23,7 +23,7 @@ in {
programs.zsh = { programs.zsh = {
enable = true; enable = true;
enableSyntaxHighlighting = true; syntaxHighlighting.enable = true;
enableAutosuggestions = true; enableAutosuggestions = true;
initExtra = let initExtra = let
zshOpts = [ zshOpts = [

2
kat/sway/mako.nix
View file

@ -19,7 +19,7 @@ in {
}; };
}; };
programs.mako = { services.mako = {
enable = true; enable = true;
font = "Iosevka 10"; font = "Iosevka 10";
defaultTimeout = 3000; defaultTimeout = 3000;

5
kat/user/data.nix
View file

@ -1,7 +1,10 @@
_: rec { _: rec {
description = "Kat Inskip"; description = "Kat Inskip";
email = "kat@inskip.me"; email = "kat@inskip.me";
keys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDPsu3vNsvBb/G+wALpstD/DnoRZ3fipAs00jtl8rzDuv96RlS7AJr4aNvG6Pt2D9SYn2wVLaiw+76mz2gOycH9/N+VCvL4/0MN9uqj+7XIcxNRo0gHVOblmi2bOXcmGKh3eRwHj1xyDwRxo9WIuBEP2bPpDPz75OXRtEdlTgvky7siSguQxJu03cb0p9hNAYhUoohNXyWW2CjDCLUQVE1+QRVUzsKq3KkPy0cHYgmZC1gRSMQyKpMt72L5tayLz3Tp/zrshucc+QO5IJeZdqMxsNAcvALsysT1J5EqxZoYH9VpWLRhSgVD6Nvn853pycJAlXQxgOCpSD3/v/JbgUe5NE+ci0o7NMy5IiHUv2gQMRIEhwBHlRGwokUPL9upx0lsjaEiPya5xQqqDKRom87xytM778ANS5CuMdQMWg9qVbpHZUHMjA0QmNkjPgq71pUDXHk5L4mZuS8wVjyjnvlw68yIJuHEc8P7QiLcjvRHFS2L9Ck8NRmPDTQXlQi9kk6LmMyu6fdevR/kZL21b+xO1e2DMyxBbNDTot8luppiiL8adgUDMwptpIne7JCWB1o9NFCbXUVgwuCCYBif6pOGSc6bGo1JTAKMflRlcy6Mi3t5H0mR2lj/sCSTWwTlP5FM4aPIq08NvW6PeuK1bFJY9fIgTwVsUnbAKOhmsMt62w== pgp-${email}"]; keys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDPsu3vNsvBb/G+wALpstD/DnoRZ3fipAs00jtl8rzDuv96RlS7AJr4aNvG6Pt2D9SYn2wVLaiw+76mz2gOycH9/N+VCvL4/0MN9uqj+7XIcxNRo0gHVOblmi2bOXcmGKh3eRwHj1xyDwRxo9WIuBEP2bPpDPz75OXRtEdlTgvky7siSguQxJu03cb0p9hNAYhUoohNXyWW2CjDCLUQVE1+QRVUzsKq3KkPy0cHYgmZC1gRSMQyKpMt72L5tayLz3Tp/zrshucc+QO5IJeZdqMxsNAcvALsysT1J5EqxZoYH9VpWLRhSgVD6Nvn853pycJAlXQxgOCpSD3/v/JbgUe5NE+ci0o7NMy5IiHUv2gQMRIEhwBHlRGwokUPL9upx0lsjaEiPya5xQqqDKRom87xytM778ANS5CuMdQMWg9qVbpHZUHMjA0QmNkjPgq71pUDXHk5L4mZuS8wVjyjnvlw68yIJuHEc8P7QiLcjvRHFS2L9Ck8NRmPDTQXlQi9kk6LmMyu6fdevR/kZL21b+xO1e2DMyxBbNDTot8luppiiL8adgUDMwptpIne7JCWB1o9NFCbXUVgwuCCYBif6pOGSc6bGo1JTAKMflRlcy6Mi3t5H0mR2lj/sCSTWwTlP5FM4aPIq08NvW6PeuK1bFJY9fIgTwVsUnbAKOhmsMt62w== pgp-${email}"
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCp+yOUFckh5ZQpXDDq0eKD8K2DVzwPyzoVSkpRTPy0JTeEQCviVvsEPASgJG1HbLYNcf2CDY8cD5efRPafPw2kQSDKPBUOqCo3/HlMRoCFt2CazcTe3AfqCDyebjs3fUAVsi/qMiO7L4N1kjz+hQJdq6xTQpXCpe4TPasi23Om8kmepdagJubtKVeuUISkkye8s/iCIsEGQV4c3YifmAq9FhpalXJ0Su7O9NY3EtUYhs9wNtHGKn9so1NyCmQBtaYQQaYqZUr5+XrfYl7UcNrXXsbattIcQyzfehvbP5tBeBoIjt1ug3+8CBS3bYxWzxk3RnYFwPgaMHPXg2okaL4L3PMWgjkEt809qeDTRfhi+2uI0N9sFcjpXHV61Wz94xSc+zwnJi9nabXgwtY0TjU2eF9eAcxTous3PT/+trp1E81O+IXh2PxAw9hgJqfd6eC0B6/JDYw7I2K2HVZC+9amQdySDa/pPyoMSVHgw5imdXkJ1+jHKbV6iXgEbFvbMD0= kat@sumireko"
];
keyid = "9CC644B569CDA59BC874C4C9E8DDE3ED1C90F3A0"; keyid = "9CC644B569CDA59BC874C4C9E8DDE3ED1C90F3A0";
keygrip = "59921D2F4E6DF7EEC3CB2934BD3D53666007B1AB"; keygrip = "59921D2F4E6DF7EEC3CB2934BD3D53666007B1AB";
userName = description; userName = description;

2
kat/vscode.nix
View file

@ -15,7 +15,7 @@
]; ];
userSettings = { userSettings = {
"nix.enableLanguageServer" = true; "nix.enableLanguageServer" = true;
"workbench.colorTheme" = "Catppuccin Frappé"; "workbench.colorTheme" = "Light Modern";
"editor.suggest.preview" = true; "editor.suggest.preview" = true;
"[nix]" = { "[nix]" = {
"editor.defaultFormatter" = "kamadorueda.alejandra"; "editor.defaultFormatter" = "kamadorueda.alejandra";

2
kat/wezterm.nix
View file

@ -5,7 +5,7 @@ _: {
local wezterm = require 'wezterm'; local wezterm = require 'wezterm';
return { return {
font = wezterm.font "Iosevka", font = wezterm.font "Iosevka",
font_size = 9.0, font_size = 11.0,
check_for_updates = false, check_for_updates = false,
show_update_window = false, show_update_window = false,
enable_tab_bar = true enable_tab_bar = true

1
nixos/roles/sway/sway.nix
View file

@ -1,6 +1,7 @@
{ {
config, config,
pkgs, pkgs,
tree,
std, std,
lib, lib,
... ...

8
systems/default.nix
View file

@ -140,18 +140,14 @@
}; };
hostname = "${name}.inskip.me"; hostname = "${name}.inskip.me";
sshOpts = ["-p" "${builtins.toString (builtins.head inputs.self.nixosConfigurations.${name}.config.services.openssh.ports)}"]; sshOpts = ["-p" "${builtins.toString (builtins.head inputs.self.nixosConfigurations.${name}.config.services.openssh.ports)}"];
sshUser = "deploy"; sshUser = "root";
user = "root"; user = "root";
autoRollback = true; autoRollback = true;
magicRollback = true; magicRollback = true;
}; };
}) })
(set.optional (host.folder == "nixos" && host.arch != "x86_64") {
${name} = {
remoteBuild = true;
};
})
]; ];
"${host.folder}Configurations".${name} = host.builder { "${host.folder}Configurations".${name} = host.builder {
inherit (host) system modules specialArgs; inherit (host) system modules specialArgs;
}; };

1
systems/koishi.nix
View file

@ -73,7 +73,6 @@ _: let
chainloader /EFI/Microsoft/Boot/bootmgfw.efi chainloader /EFI/Microsoft/Boot/bootmgfw.efi
} }
''; '';
version = 2;
}; };
}; };
}; };

2
systems/renko.nix
View file

@ -15,7 +15,7 @@ _: let
initrd.availableKernelModules = ["virtio_pci" "xhci_pci" "usb_storage" "usbhid"]; initrd.availableKernelModules = ["virtio_pci" "xhci_pci" "usb_storage" "usbhid"];
}; };
virtualization.rosetta.enable = true; virtualisation.rosetta.enable = true;
fileSystems = { fileSystems = {
"/" = { "/" = {

18
systems/sumireko.nix
View file

@ -15,12 +15,17 @@ _: let
extraConfig = '' extraConfig = ''
Host renko Host renko
HostName 192.168.64.5 HostName 192.168.64.5
Port 62954
User root User root
IdentityFile /Users/kat/.ssh/id_rsa
''; '';
}; };
nix.buildMachines = [ nix.buildMachines = [
{
hostName = "renko";
system = "aarch64-linux";
supportedFeatures = ["nixos-test" "benchmark" "big-parallel" "kvm"];
}
{ {
hostName = "renko"; hostName = "renko";
system = "x86_64-linux"; system = "x86_64-linux";
@ -50,20 +55,9 @@ _: let
home-manager.users.kat = { home-manager.users.kat = {
programs.zsh = { programs.zsh = {
sessionVariables = {
PYENV_ROOT = "$HOME/.pyenv";
PATH = "$PYENV_ROOT/bin:$PATH";
PIPENV_PYTHON = "$PYENV_ROOT/shims/python";
};
initExtra = '' initExtra = ''
plugin=(pyenv)
eval $(pyenv init -)
eval $(pyenv virtualenv-init -)
source <(kubectl completion zsh) source <(kubectl completion zsh)
''; '';
shellAliases = {
artemiscli = "~/.artemis/.venv/bin/artemiscli";
};
}; };
}; };

1
systems/yukari.nix
View file

@ -22,7 +22,6 @@ _: let
loader.grub = { loader.grub = {
enable = true; enable = true;
device = "/dev/sda"; device = "/dev/sda";
version = 2;
}; };
initrd = { initrd = {
availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"]; availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];