Compare commits
No commits in common. "ad591635e0103eee9c2437e136050ea7c520f394" and "e0d5404db5f4dba70b04bc0fac4bf75ac824fc55" have entirely different histories.
ad591635e0
...
e0d5404db5
8 changed files with 61 additions and 86 deletions
6
flake.lock
generated
6
flake.lock
generated
|
@ -226,13 +226,13 @@
|
|||
"mac-brcm-fw": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1706552810,
|
||||
"lastModified": 1,
|
||||
"narHash": "sha256-+kW8ogc6DykjMVlrr+3vWKs9ZUdJ9EW72LbY7k/Qvh4=",
|
||||
"path": "/home/jade/nix-configs/mac-brcm-fw",
|
||||
"path": "./mac-brcm-fw",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
"path": "/home/jade/nix-configs/mac-brcm-fw",
|
||||
"path": "./mac-brcm-fw",
|
||||
"type": "path"
|
||||
}
|
||||
},
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
};
|
||||
nixos-hardware.url = "github:networkException/nixos-hardware/apple-t2-init";
|
||||
mac-brcm-fw = {
|
||||
url = "path:/home/jade/nix-configs/mac-brcm-fw";
|
||||
url = "path:./mac-brcm-fw";
|
||||
flake = false;
|
||||
};
|
||||
#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_a), spawn "flameshot screen -c -p $HOME/Pictures/screenshots"),
|
||||
((modm, xK_t), spawn "ocr-screenshot.sh"),
|
||||
((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"),
|
||||
((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"),
|
||||
-- Push window back into tiling
|
||||
((modm .|. shiftMask, xK_space), withFocused $ windows . W.sink),
|
||||
-- Resize viewed windows to the correct size
|
||||
|
|
|
@ -49,11 +49,11 @@
|
|||
cloud.enable = true;
|
||||
social.enable = true;
|
||||
mail.enable = true;
|
||||
gaming.enable = true;
|
||||
evremap.enable = true;
|
||||
};
|
||||
helix.enable = true;
|
||||
zellij.enable = true;
|
||||
terminal.enable = true;
|
||||
git.signingKey = "08F0 E7C9 6941 84C2 D514 7F31 5621 290C A02C 7BD8";
|
||||
zsh.enable = true;
|
||||
};
|
||||
|
||||
fileSystems = {
|
||||
|
@ -101,6 +101,7 @@
|
|||
|
||||
environment.systemPackages = with pkgs; [
|
||||
android-tools
|
||||
evremap
|
||||
];
|
||||
|
||||
environment.pathsToLink = [
|
||||
|
|
3
justfile
3
justfile
|
@ -8,6 +8,3 @@ build:
|
|||
|
||||
update:
|
||||
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,19 +186,6 @@
|
|||
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
|
||||
definedAliases = ["nxwk"];
|
||||
};
|
||||
"Noogle" = {
|
||||
urls = [
|
||||
{
|
||||
template = "https://noogle.dev/q?term={searchTerms}";
|
||||
params = [
|
||||
{
|
||||
name = "q";
|
||||
value = "{searchTerms}";
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
"lib.rs" = {
|
||||
urls = [
|
||||
{
|
||||
|
|
|
@ -1,12 +1,4 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
cfg = config.jade.git;
|
||||
in {
|
||||
options.jade.git.signingKey = lib.mkOption {type = lib.types.str;};
|
||||
config = {
|
||||
{...}: {
|
||||
home-manager.users.jade = {pkgs, ...}: {
|
||||
programs.git = {
|
||||
enable = true;
|
||||
|
@ -21,7 +13,7 @@ in {
|
|||
s = "status";
|
||||
};
|
||||
signing = {
|
||||
key = cfg.signingKey;
|
||||
key = "74F2 FE5F 55E9 0F54 7F98 3B84 8854 79FF F880 17D2";
|
||||
signByDefault = true;
|
||||
};
|
||||
};
|
||||
|
@ -62,5 +54,4 @@ in {
|
|||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -817,4 +817,3 @@ alias gca = git commit --all;
|
|||
alias gp = git push;
|
||||
alias gl = git pull;
|
||||
alias gs = git status;
|
||||
alias clip = xclip -selection c;
|
||||
|
|
Loading…
Add table
Reference in a new issue