Compare commits
No commits in common. "1cc59012413c46345dc2ee287bae550d331ede91" and "d998fd13f96152ab8ee07ac20ecd0cb7fc8d9ea8" have entirely different histories.
1cc5901241
...
d998fd13f9
|
|
@ -1,7 +1,4 @@
|
|||
result
|
||||
results
|
||||
result-*
|
||||
results-*
|
||||
/configuration.nix
|
||||
/hardware-configuration.nix
|
||||
.direnv
|
||||
|
|
|
|||
|
|
@ -7,12 +7,5 @@ exclude = ["*"]
|
|||
include = [ ".sops.yaml" ]
|
||||
|
||||
[both]
|
||||
exclude = [
|
||||
".remote.toml",
|
||||
"result",
|
||||
"results",
|
||||
"result-*",
|
||||
"results-*",
|
||||
".direnv",
|
||||
]
|
||||
exclude = [ ".remote.toml", "result", ".direnv"]
|
||||
include = []
|
||||
|
|
|
|||
1
base.nix
1
base.nix
|
|
@ -72,7 +72,6 @@
|
|||
nix.settings.experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
"pipe-operator"
|
||||
];
|
||||
#nix.settings.allowed-users = [ "@builders" ]; # TODO: this
|
||||
nix.settings.allowed-users = [ "root" "pbsds" "@wheel" ]; # default is [ "*" ]
|
||||
|
|
|
|||
72
flake.lock
72
flake.lock
|
|
@ -70,11 +70,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730016908,
|
||||
"narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
|
||||
"lastModified": 1728726232,
|
||||
"narHash": "sha256-8ZWr1HpciQsrFjvPMvZl0W+b0dilZOqXPoKa2Ux36bc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "e83414058edd339148dc142a8437edb9450574c8",
|
||||
"rev": "d57112db877f07387ce7104b5ac346ede556d2d7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -91,11 +91,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729999765,
|
||||
"narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=",
|
||||
"lastModified": 1728263287,
|
||||
"narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=",
|
||||
"owner": "Mic92",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f",
|
||||
"rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -106,11 +106,11 @@
|
|||
},
|
||||
"nixlib": {
|
||||
"locked": {
|
||||
"lastModified": 1729386149,
|
||||
"narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=",
|
||||
"lastModified": 1728176478,
|
||||
"narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "cce4521b6df014e79a7b7afc58c703ed683c916e",
|
||||
"rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -127,11 +127,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729472750,
|
||||
"narHash": "sha256-s93LPHi5BN7I2xSGNAFWiYb8WRsPvT1LE9ZjZBrpFlg=",
|
||||
"lastModified": 1728522165,
|
||||
"narHash": "sha256-UQpsJ0Ev6JBGsCYRlS2oOVvb+eWcDD0xTV3RVlqbeVU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixos-generators",
|
||||
"rev": "7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565",
|
||||
"rev": "40c8d30c490414910fc63626ad1b67af7db40cd3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -142,11 +142,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1729742320,
|
||||
"narHash": "sha256-u3Of8xRkN//me8PU+RucKA59/6RNy4B2jcGAF36P4jI=",
|
||||
"lastModified": 1728729581,
|
||||
"narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "e8a2f6d5513fe7b7d15701b2d05404ffdc3b6dda",
|
||||
"rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -158,11 +158,11 @@
|
|||
"nixos-nspawn": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1729611397,
|
||||
"narHash": "sha256-TkKTLWcYBvqQxrdOcriCVDgt/iLXoomzqg1+KsuF2OE=",
|
||||
"lastModified": 1705399691,
|
||||
"narHash": "sha256-NEasvnjAi1pqkFtVbKiHL+HjkgMa72yqdZQQskxb3lg=",
|
||||
"owner": "tfc",
|
||||
"repo": "nspawn-nixos",
|
||||
"rev": "27fb0061fecff6664de2ee26d24d98f04956f90f",
|
||||
"rev": "7fe5a42c6f9116402a68abc81410a59d18fd48c2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -318,11 +318,11 @@
|
|||
},
|
||||
"nixpkgs-2405": {
|
||||
"locked": {
|
||||
"lastModified": 1729973466,
|
||||
"narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
|
||||
"lastModified": 1728627514,
|
||||
"narHash": "sha256-r+SF9AnHrTg+bk6YszoKfV9lgyw+yaFUQe0dOjI0Z2o=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
|
||||
"rev": "c505ebf777526041d792a49d5f6dd4095ea391a7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -334,11 +334,11 @@
|
|||
},
|
||||
"nixpkgs-edge": {
|
||||
"locked": {
|
||||
"lastModified": 1729880355,
|
||||
"narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
|
||||
"lastModified": 1728492678,
|
||||
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
|
||||
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -402,11 +402,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729999681,
|
||||
"narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=",
|
||||
"lastModified": 1728345710,
|
||||
"narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56",
|
||||
"rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -425,11 +425,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729999681,
|
||||
"narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=",
|
||||
"lastModified": 1728345710,
|
||||
"narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56",
|
||||
"rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -448,11 +448,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729999681,
|
||||
"narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=",
|
||||
"lastModified": 1728345710,
|
||||
"narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56",
|
||||
"rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -471,11 +471,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729999681,
|
||||
"narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=",
|
||||
"lastModified": 1728345710,
|
||||
"narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56",
|
||||
"rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -258,7 +258,7 @@
|
|||
cuda-prime = ls [ ./hardware/gpu/cuda.nix hw.common-gpu-nvidia ];
|
||||
rocm = ls [ ./hardware/gpu/rocm.nix hw.common-gpu-amd ];
|
||||
nspawn = ls [ "${nixos-nspawn}/nspawn-image.nix" { boot.isContainer = true; } ];
|
||||
hidpi = ls [ hw.common-hidpi ./profiles/hidpi.nix ];
|
||||
hidpi = hw.common-hidpi;
|
||||
p1005 = ./hardware/printer/hp-laserjet-p1005.nix;
|
||||
au = ./profiles/auto-upgrade.nix;
|
||||
ts = ./profiles/tailscale.nix;
|
||||
|
|
@ -273,7 +273,8 @@
|
|||
};
|
||||
in builtins.mapAttrs (hostname: curried: curried hostname) {
|
||||
#hostname "domain" "system" inputs "state" [ modules ... ]
|
||||
asgaut = mk "pbsds.net" "riscv64-linux" inputs-2405 "24.05" [ hw.starfive-visionfive-2 ];
|
||||
/* asgaut = mk "pbsds.net" "riscv64-linux" inputs-2405 "24.05" [ hw.starfive-visionfive-2 ]; */
|
||||
asgaut = mk "pbsds.net" "riscv64-linux" inputs-2405 "24.05" [ "${nixos-hardware}/starfive/visionfive/v2/default.nix" ];
|
||||
noximilien = mk "pbsds.net" "x86_64-linux" inputs-2405 "23.11" [ au tse intel ];
|
||||
brumlebasse = mk "pbsds.net" "x86_64-linux" inputs-2405 "24.05" [ au amd nspawn ];
|
||||
nord = mk "pbsds.net" "x86_64-linux" inputs-2405 "24.05" [ au ts intel-novga hw.common-gpu-intel-sandy-bridge rocm hidpi ];
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ buildMachine.speedFactor = 4 # ???
|
|||
buildMachine.supportedFeatures = ["kvm", "big-parallel", "nixos-test"]
|
||||
ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILeOB/57N1fQPVorIUlkkJZaQduBo+4+km2Qbj4ebd/k"
|
||||
ssh.proxyJump = "hildring.pvv.ntnu.no"
|
||||
# wakeonlan e4:54:e8:51:8c:e9
|
||||
# mac e4:54:e8:51:8c:e9
|
||||
|
||||
["eple.pbsds.net"] # r9 290x
|
||||
aliases = [ "eple.tail9aac63.ts.net" ]
|
||||
|
|
@ -59,7 +59,7 @@ buildMachine.speedFactor = 3 # i7-5820K
|
|||
buildMachine.supportedFeatures = ["kvm", "big-parallel", "nixos-test"]
|
||||
ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH03MEINNnjBvtmvN2QsCDCLkvF9ow5FQJp9uiyQ1Iwi"
|
||||
ssh.proxyJump = "hildring.pvv.ntnu.no"
|
||||
# wakeonlan 4c:cc:6a:05:51:01
|
||||
# mac 4c:cc:6a:05:51:01
|
||||
|
||||
["garp.pbsds.net"] # gtx 1080
|
||||
buildMachine.systems = ["x86_64-linux", "i686-linux", "riscv64-linux"]
|
||||
|
|
@ -68,7 +68,7 @@ buildMachine.speedFactor = 4 # i7-6700
|
|||
buildMachine.supportedFeatures = ["kvm", "big-parallel", "nixos-test", "cuda"]
|
||||
ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOkcZ3cUAKk8uUvZPsX7PDBInkb3Eps3Xh+xVrhPY+sx"
|
||||
ssh.proxyJump = "hildring.pvv.ntnu.no"
|
||||
# wakeonlan 4c:cc:6a:61:d0:20
|
||||
# mac 4c:cc:6a:61:d0:20
|
||||
|
||||
["noximilien.pbsds.net"]
|
||||
aliases = [ "noximilien.tail9aac63.ts.net" ]
|
||||
|
|
@ -76,7 +76,7 @@ aliases = [ "noximilien.tail9aac63.ts.net" ]
|
|||
buildMachine.speedFactor = 1 # i7-3770S
|
||||
ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ3QhTGS03Sqm6OeCEz5AIGqJnBttKaBqMgNXp3Md7t4"
|
||||
ssh.userPublicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC7fYndgIXJM+tLSfkbprWc8ClOI58wlaZCg6I+wMYINeOwxLU24BmIyQAhNeqhHYBdXiyIAl5KN3+YajN1nx6zq2XPXLut31Xtf+0yMdRMX4rXgqOnsBeG4eTfNsPx+v7VNANth8dIADpk59Y9ioWB6JI6NF0wfkqrCSTpt2q9gpTA35MBe41hlaxqxYGq+PlfZyJbN4TJCORZROkjw1P6K+EoYUHTHmduMZSAnpzx5bTHL2r1VK1jLRL4q2O1LP9G7eVYUsZKxKznJqtAeoOGBL4OX2JeIXT51/pXTW0NNyVPELD6aUUZjK8aVK2JDXupXegYO8cHqwLaz7rZj3G8evGamSlGvAYR4Gwvvp4Du8ZRZVM3Gt1allhPMTLnm/gy9Lta35D8SHH0IUKWD3buo5HZliZgSMAvoSrT03vpuGILLoWEkTjpPT0qKIlBd/qlACBzKC9Wwmda5WWgMsfe0zP4zNLVdves5nkMrbY91TYSFM0FuDCaRsK5Mrhx7i0= root@noximilien"
|
||||
# wakeonlan 18:03:73:1f:f5:5f
|
||||
# mac 18:03:73:1f:f5:5f
|
||||
|
||||
["sopp.pbsds.net"] # gtx 1080
|
||||
aliases = [ "sopp.tail9aac63.ts.net" ]
|
||||
|
|
@ -86,8 +86,8 @@ buildMachine.supportedFeatures = ["kvm", "nixos-test", "cuda"]
|
|||
ssh.listenPort = 26
|
||||
ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDYB9H1pHB1vTBiGhO/GCQjn70BtVdQuJyXx38zN2CDj"
|
||||
ssh.userPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL6eTQkxO/1XflHpGf3478+Z7HFYYaf1d4M6mvSK2nAU root@sopp"
|
||||
# wakeonlan 44:8a:5b:9c:2b:ae
|
||||
# wakeonlan 12:d2:be:e0:c5:f5 wireless
|
||||
# mac 44:8a:5b:9c:2b:ae
|
||||
# mac 12:d2:be:e0:c5:f5 wireless
|
||||
|
||||
["nord.pbsds.net"] # rx 580
|
||||
aliases = [ "nord.tail9aac63.ts.net" ]
|
||||
|
|
@ -97,24 +97,24 @@ buildMachine.supportedFeatures = ["kvm", "nixos-test"]
|
|||
ssh.listenPort = 24
|
||||
ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIBSdIUtUfAxnVbPDmDDFdP2S3Wd3+CC8IfZAANJ76oh"
|
||||
ssh.userPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINnS1TmV9q7n+s7+RouuB6vQllnhqNCE1RqPmTMJ2/29 root@nord"
|
||||
# wakeonlan 54:04:a6:be:1b:62
|
||||
# mac 54:04:a6:be:1b:62
|
||||
|
||||
["rocm.pbsds.net"] # gtx 3070 laptop edition
|
||||
# buildMachine.maxJobs = 1 # 16 threads 32GB
|
||||
buildMachine.speedFactor = 5 # i7-11800H
|
||||
ssh.listenUser = "pbsds"
|
||||
ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGDuWdqEQ5mmVjuKi6f/Q2PFxuqB3URpgTHid06Vw7we"
|
||||
# wakeonlan 08:8f:c3:2b:da:8d
|
||||
# wakeonlan c4:41:1e:67:ed:54 dock
|
||||
# wakeonlan f4:7b:09:89:bd:1d wireless
|
||||
# mac 08:8f:c3:2b:da:8d
|
||||
# mac c4:41:1e:67:ed:54 dock
|
||||
# mac f4:7b:09:89:bd:1d wireless
|
||||
|
||||
["knut.pbsds.net"] # Intel(R) Celeron(R) CPU G3950
|
||||
# wakeonlan 1c:1b:0d:9a:34:71
|
||||
# mac 1c:1b:0d:9a:34:71
|
||||
|
||||
["bjarte.pbsds.net"]
|
||||
aliases = [ "bjarte.tail9aac63.ts.net" ]
|
||||
ssh.userPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF4v1+FbiEa6Mohpf3/Una5ahKeKSG9yZ9iU5TC7ddL5 root@bjarte"
|
||||
# wakeonlan f8:75:a4:58:f1:35
|
||||
# mac f8:75:a4:58:f1:35
|
||||
|
||||
["brumlebasse.pbsds.net"]
|
||||
# buildMachine.maxJobs = 1 # 2 threads 2GB
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
#boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
#hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.latest;
|
||||
#hardware.nvidia.modesetting.enable = false; # makes atom behave, but mpv refuses to start
|
||||
/**/
|
||||
|
||||
# PRIME: (lspci)
|
||||
#hardware.nvidia.prime.intelBusId = "PCI:0:02:0";
|
||||
|
|
@ -38,14 +39,25 @@
|
|||
|
||||
../../../profiles/shell.nix
|
||||
|
||||
#../../../profiles/desktop
|
||||
#../../../profiles/desktop/gnome # configures gdm
|
||||
##../../../profiles/desktop/sound/alsa.nix
|
||||
##../../../profiles/desktop/sound/pulseaudio.nix
|
||||
#../../../profiles/desktop/sound/pipewire.nix
|
||||
|
||||
../../../profiles/domeneshop-dyndns.nix
|
||||
../../../profiles/known-hosts.nix
|
||||
];
|
||||
services.domeneshop-updater.targets = [ config.networking.fqdn ];
|
||||
|
||||
#networking.firewall.allowedTCPPorts = [ 57621 ]; # spotify local discovery
|
||||
|
||||
# Networking
|
||||
networking.networkmanager.enable = true;
|
||||
|
||||
# TODO: remove? Move?
|
||||
programs.dconf.enable = true;
|
||||
|
||||
# Enable touchpad support (enabled default in most desktopManager).
|
||||
# services.xserver.libinput.enable = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
{
|
||||
environment.variables = {
|
||||
# better fonts:
|
||||
# https://web.archive.org/web/20230921201835/https://old.reddit.com/r/linux_gaming/comments/16lwgnj/is_it_possible_to_improve_font_rendering_on_linux/
|
||||
# via
|
||||
# https://github.com/samemrecebi
|
||||
FREETYPE_PROPERTIES = "cff:no-stem-darkening=0 autofitter:no-stem-darkening=0";
|
||||
};
|
||||
}
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
#nheko
|
||||
#fluffychat
|
||||
|
||||
(pkgs.onlyoffice-desktopeditors or pkgs.libreoffice)
|
||||
libreoffice
|
||||
|
||||
emote
|
||||
normcap # doesn't work on wayland
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ with lib.hm.gvariant;
|
|||
|
||||
"org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom13" = {
|
||||
binding = "<Shift><Control>Print";
|
||||
command = "systemd-run --user normcap";
|
||||
command = "normcap";
|
||||
name = "normcap OCR";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
# TODO: mod-music
|
||||
# TODO: vgmstream
|
||||
# TODO: 3d
|
||||
# TODO: onlyoffice
|
||||
|
||||
let
|
||||
mime-map = {
|
||||
|
|
|
|||
|
|
@ -11,6 +11,5 @@
|
|||
#.config/zed/keymap.json
|
||||
#.config/zed/settings.json
|
||||
#.config/zed/themes
|
||||
# https://github.com/adorabilis/melange-zed
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,26 +3,7 @@
|
|||
home.packages = with pkgs; [
|
||||
#git
|
||||
gh
|
||||
#hub
|
||||
(pkgs.symlinkJoin {
|
||||
inherit (pkgs.hub) name meta;
|
||||
paths = [ pkgs.hub ];
|
||||
postBuild = ''
|
||||
rm $out/bin/hub
|
||||
cat <<"EOF" >$out/bin/hub
|
||||
#!${pkgs.runtimeShell}
|
||||
|
||||
# https://hub.github.com/hub.1.html#github-oauth-authentication
|
||||
if [[ ! -d ~/.config/hub ]]; then
|
||||
export GITHUB_TOKEN=$(${pkgs.gh}/bin/gh auth token 2>/dev/null)
|
||||
fi
|
||||
|
||||
exec -a "$0" ${pkgs.hub}/bin/hub "$@"
|
||||
EOF
|
||||
chmod +x $out/bin/hub
|
||||
'';
|
||||
})
|
||||
|
||||
hub
|
||||
tea
|
||||
colordiff
|
||||
];
|
||||
|
|
@ -87,7 +68,6 @@
|
|||
gbrm = "git fetch origin; git branch --merged | cut -c3- | grep -vE '^(main|master)$' | gum choose --no-limit --header 'Which branches to delete:' | xargs git branch -D";
|
||||
#gb = "git blame";
|
||||
#gpo = "git push origin";
|
||||
#gpf = "git push --force-with-lease --force-if-includes";
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,4 @@
|
|||
{ pkgs, lib, config, ... }:
|
||||
|
||||
let
|
||||
|
||||
_tmp_func_name = "_tmp_func_Oaw5aifeeniezeiquonaipheNahthae9caik4Rai"; # pwgen ftw
|
||||
mkArgsAlias = alias: ''${_tmp_func_name}() { ${alias}; unset -f ${_tmp_func_name}; }; ${_tmp_func_name}'';
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
# TODO: "bind -s 'set completion-ignore-case on'"
|
||||
programs.bash.enable = true;
|
||||
|
|
@ -152,29 +144,16 @@ in
|
|||
#home.shellAliases.mv = "mv -i";
|
||||
#home.shellAliases.cp = "cp -i";
|
||||
|
||||
home.shellAliases.inom = mkArgsAlias ''nom "$@" --system i686-linux -j0'';
|
||||
home.shellAliases.inix = mkArgsAlias ''nix "$@" --system i686-linux -j0'';
|
||||
home.shellAliases.rnom = mkArgsAlias ''nom "$@" --system riscv64-linux -j0'';
|
||||
home.shellAliases.rnix = mkArgsAlias ''nix "$@" --system riscv64-linux -j0'';
|
||||
home.shellAliases.fnom = mkArgsAlias ''nom "$@" --system x86_64-freebsd -j0'';
|
||||
home.shellAliases.fnix = mkArgsAlias ''nix "$@" --system x86_64-freebsd -j0'';
|
||||
home.shellAliases.anom = mkArgsAlias ''nom "$@" --system aarch64-linux -j0'';
|
||||
home.shellAliases.anix = mkArgsAlias ''nix "$@" --system aarch64-linux -j0'';
|
||||
home.shellAliases.dnom = mkArgsAlias ''nom "$@" --system x86_64-darwin -j0'';
|
||||
home.shellAliases.dnix = mkArgsAlias ''nix "$@" --system x86_64-darwin -j0'';
|
||||
home.shellAliases.danom = mkArgsAlias ''nom "$@" --system aarch64-darwin -j0'';
|
||||
home.shellAliases.danix = mkArgsAlias ''nix "$@" --system aarch64-darwin -j0'';
|
||||
|
||||
home.shellAliases.inom-build = "nom-build --system i686-linux -j0";
|
||||
home.shellAliases.inix-build = "nix-build --system i686-linux -j0";
|
||||
home.shellAliases.rnom-build = "nom-build --system riscv64-linux -j0";
|
||||
home.shellAliases.rnix-build = "nix-build --system riscv64-linux -j0";
|
||||
home.shellAliases.fnom-build = "nom-build --system x86_64-freebsd -j0";
|
||||
home.shellAliases.fnix-build = "nix-build --system x86_64-freebsd -j0";
|
||||
home.shellAliases.anom-build = "nom-build --system aarch64-linux -j0";
|
||||
home.shellAliases.anix-build = "nix-build --system aarch64-linux -j0";
|
||||
home.shellAliases.dnom-build = "nom-build --system x86_64-darwin -j0";
|
||||
home.shellAliases.dnix-build = "nix-build --system x86_64-darwin -j0";
|
||||
home.shellAliases.inom-build = "nom-build --system i686-linux -j0";
|
||||
home.shellAliases.inix-build = "nix-build --system i686-linux -j0";
|
||||
home.shellAliases.rnom-build = "nom-build --system riscv64-linux -j0";
|
||||
home.shellAliases.rnix-build = "nix-build --system riscv64-linux -j0";
|
||||
home.shellAliases.fnom-build = "nom-build --system x86_64-freebsd -j0";
|
||||
home.shellAliases.fnix-build = "nix-build --system x86_64-freebsd -j0";
|
||||
home.shellAliases.anom-build = "nom-build --system aarch64-linux -j0";
|
||||
home.shellAliases.anix-build = "nix-build --system aarch64-linux -j0";
|
||||
home.shellAliases.dnom-build = "nom-build --system x86_64-darwin -j0";
|
||||
home.shellAliases.dnix-build = "nix-build --system x86_64-darwin -j0";
|
||||
home.shellAliases.danom-build = "nom-build --system aarch64-darwin -j0";
|
||||
home.shellAliases.danix-build = "nix-build --system aarch64-darwin -j0";
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue