Compare commits
7 commits
e0d5404db5
...
ad591635e0
Author | SHA1 | Date | |
---|---|---|---|
ad591635e0 | |||
aaedddb6c2 | |||
f4cfd21eb8 | |||
93052beaff | |||
8cab1912c8 | |||
b0c26aa430 | |||
bea69cd69b |
8 changed files with 86 additions and 61 deletions
6
flake.lock
generated
6
flake.lock
generated
|
@ -226,13 +226,13 @@
|
||||||
"mac-brcm-fw": {
|
"mac-brcm-fw": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1,
|
"lastModified": 1706552810,
|
||||||
"narHash": "sha256-+kW8ogc6DykjMVlrr+3vWKs9ZUdJ9EW72LbY7k/Qvh4=",
|
"narHash": "sha256-+kW8ogc6DykjMVlrr+3vWKs9ZUdJ9EW72LbY7k/Qvh4=",
|
||||||
"path": "./mac-brcm-fw",
|
"path": "/home/jade/nix-configs/mac-brcm-fw",
|
||||||
"type": "path"
|
"type": "path"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"path": "./mac-brcm-fw",
|
"path": "/home/jade/nix-configs/mac-brcm-fw",
|
||||||
"type": "path"
|
"type": "path"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
};
|
};
|
||||||
nixos-hardware.url = "github:networkException/nixos-hardware/apple-t2-init";
|
nixos-hardware.url = "github:networkException/nixos-hardware/apple-t2-init";
|
||||||
mac-brcm-fw = {
|
mac-brcm-fw = {
|
||||||
url = "path:./mac-brcm-fw";
|
url = "path:/home/jade/nix-configs/mac-brcm-fw";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
#mms.url = "github:mkaito/nixos-modded-minecraft-servers";
|
#mms.url = "github:mkaito/nixos-modded-minecraft-servers";
|
||||||
|
|
|
@ -44,7 +44,7 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) =
|
||||||
((modm, xK_s), spawn "flameshot gui -c -p $HOME/Pictures/screenshots"),
|
((modm, xK_s), spawn "flameshot gui -c -p $HOME/Pictures/screenshots"),
|
||||||
((modm, xK_a), spawn "flameshot screen -c -p $HOME/Pictures/screenshots"),
|
((modm, xK_a), spawn "flameshot screen -c -p $HOME/Pictures/screenshots"),
|
||||||
((modm, xK_t), spawn "ocr-screenshot.sh"),
|
((modm, xK_t), spawn "ocr-screenshot.sh"),
|
||||||
((modm .|. shiftMask, xK_t), spawn "DEVICE=\"MELF0410:00 1FD2:7007\"; if [ $(xinput list-props \"$DEVICE\" | awk '/^\\tDevice Enabled \\([0-9]+\\):\\t[01]/ {print $NF}') = \"1\" ]; then xinput disable \"$DEVICE\"; else xinput enable \"$DEVICE\"; fi"),
|
((modm .|. shiftMask, xK_t), spawn "DEVICE=\"bcm5974\"; if [ $(xinput list-props \"$DEVICE\" | awk '/^\\tDevice Enabled \\([0-9]+\\):\\t[01]/ {print $NF}') = \"1\" ]; then xinput disable \"$DEVICE\"; else xinput enable \"$DEVICE\"; fi"),
|
||||||
-- Push window back into tiling
|
-- Push window back into tiling
|
||||||
((modm .|. shiftMask, xK_space), withFocused $ windows . W.sink),
|
((modm .|. shiftMask, xK_space), withFocused $ windows . W.sink),
|
||||||
-- Resize viewed windows to the correct size
|
-- Resize viewed windows to the correct size
|
||||||
|
|
|
@ -49,11 +49,11 @@
|
||||||
cloud.enable = true;
|
cloud.enable = true;
|
||||||
social.enable = true;
|
social.enable = true;
|
||||||
mail.enable = true;
|
mail.enable = true;
|
||||||
|
gaming.enable = true;
|
||||||
|
evremap.enable = true;
|
||||||
};
|
};
|
||||||
helix.enable = true;
|
|
||||||
zellij.enable = true;
|
|
||||||
terminal.enable = true;
|
terminal.enable = true;
|
||||||
zsh.enable = true;
|
git.signingKey = "08F0 E7C9 6941 84C2 D514 7F31 5621 290C A02C 7BD8";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems = {
|
fileSystems = {
|
||||||
|
@ -101,7 +101,6 @@
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
android-tools
|
android-tools
|
||||||
evremap
|
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.pathsToLink = [
|
environment.pathsToLink = [
|
||||||
|
|
3
justfile
3
justfile
|
@ -8,3 +8,6 @@ build:
|
||||||
|
|
||||||
update:
|
update:
|
||||||
nix flake update --commit-lock-file
|
nix flake update --commit-lock-file
|
||||||
|
|
||||||
|
build-mac:
|
||||||
|
sudo nixos-rebuild switch --flake . --impure --override-input mac-brcm-fw path:/home/jade/mac-brcm-fw --fast
|
||||||
|
|
|
@ -186,6 +186,19 @@
|
||||||
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
|
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
|
||||||
definedAliases = ["nxwk"];
|
definedAliases = ["nxwk"];
|
||||||
};
|
};
|
||||||
|
"Noogle" = {
|
||||||
|
urls = [
|
||||||
|
{
|
||||||
|
template = "https://noogle.dev/q?term={searchTerms}";
|
||||||
|
params = [
|
||||||
|
{
|
||||||
|
name = "q";
|
||||||
|
value = "{searchTerms}";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
"lib.rs" = {
|
"lib.rs" = {
|
||||||
urls = [
|
urls = [
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,4 +1,12 @@
|
||||||
{...}: {
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
cfg = config.jade.git;
|
||||||
|
in {
|
||||||
|
options.jade.git.signingKey = lib.mkOption {type = lib.types.str;};
|
||||||
|
config = {
|
||||||
home-manager.users.jade = {pkgs, ...}: {
|
home-manager.users.jade = {pkgs, ...}: {
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -13,7 +21,7 @@
|
||||||
s = "status";
|
s = "status";
|
||||||
};
|
};
|
||||||
signing = {
|
signing = {
|
||||||
key = "74F2 FE5F 55E9 0F54 7F98 3B84 8854 79FF F880 17D2";
|
key = cfg.signingKey;
|
||||||
signByDefault = true;
|
signByDefault = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -54,4 +62,5 @@
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -817,3 +817,4 @@ alias gca = git commit --all;
|
||||||
alias gp = git push;
|
alias gp = git push;
|
||||||
alias gl = git pull;
|
alias gl = git pull;
|
||||||
alias gs = git status;
|
alias gs = git status;
|
||||||
|
alias clip = xclip -selection c;
|
||||||
|
|
Loading…
Add table
Reference in a new issue