Tweaks n such
parent
debb0dfea7
commit
f8639cc8dc
|
@ -0,0 +1,9 @@
|
||||||
|
{
|
||||||
|
"nix.serverSettings": {
|
||||||
|
"nil": {
|
||||||
|
"options": {
|
||||||
|
"enable": true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -50,12 +50,12 @@ in {
|
||||||
# limitiations, e.g., Transmit, install the Homebrew Cask.
|
# limitiations, e.g., Transmit, install the Homebrew Cask.
|
||||||
homebrew.caskArgs.no_quarantine = true;
|
homebrew.caskArgs.no_quarantine = true;
|
||||||
homebrew.casks = [
|
homebrew.casks = [
|
||||||
"aerial"
|
|
||||||
"alfred"
|
"alfred"
|
||||||
"anytype"
|
"anytype"
|
||||||
"arc"
|
"arc"
|
||||||
"bartender"
|
# "bartender"
|
||||||
# "discord"
|
# "discord"
|
||||||
|
"dozer"
|
||||||
"firefox"
|
"firefox"
|
||||||
"hazeover"
|
"hazeover"
|
||||||
"jitsi-meet"
|
"jitsi-meet"
|
||||||
|
@ -67,9 +67,9 @@ in {
|
||||||
"lulu"
|
"lulu"
|
||||||
"macsvg"
|
"macsvg"
|
||||||
"messenger"
|
"messenger"
|
||||||
"miniforge"
|
|
||||||
"nova"
|
"nova"
|
||||||
# "obsidian"
|
# "obsidian"
|
||||||
|
"orion"
|
||||||
"protonvpn"
|
"protonvpn"
|
||||||
"qflipper"
|
"qflipper"
|
||||||
"rectangle"
|
"rectangle"
|
||||||
|
|
60
flake.lock
60
flake.lock
|
@ -53,11 +53,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1691640097,
|
"lastModified": 1696043447,
|
||||||
"narHash": "sha256-6vPsJYjtt2hs4mkiR46yt8c/Spdm/UiUKoSCIlc7iJw=",
|
"narHash": "sha256-VbJ1dY5pVH2fX1bS+cT2+4+BYEk4lMHRP0+udu9G6tk=",
|
||||||
"owner": "lnl7",
|
"owner": "lnl7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "426d38710b656b0a31f8eaae6e0002206a3b96d7",
|
"rev": "792c2e01347cb1b2e7ec84a1ef73453ca86537d8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -70,11 +70,11 @@
|
||||||
"fisher-src": {
|
"fisher-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1688576744,
|
"lastModified": 1692640630,
|
||||||
"narHash": "sha256-Xub7mTVQbFxrL1v99OGDvXUhSA0vtRzKTjwVvRKxzUo=",
|
"narHash": "sha256-e8gIaVbuUzTwKtuMPNXBT5STeddYqQegduWBtURLT3M=",
|
||||||
"owner": "jorgebucaran",
|
"owner": "jorgebucaran",
|
||||||
"repo": "fisher",
|
"repo": "fisher",
|
||||||
"rev": "59228d6215cb4c36aff77008751736f540dc42d8",
|
"rev": "2efd33ccd0777ece3f58895a093f32932bd377b6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -120,11 +120,11 @@
|
||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1689068808,
|
"lastModified": 1694529238,
|
||||||
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
|
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
|
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -182,11 +182,11 @@
|
||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1691765042,
|
"lastModified": 1696255829,
|
||||||
"narHash": "sha256-EeMn5KYej0NmCf3ghOjq2s8axjaKfqurak5FzScGTO0=",
|
"narHash": "sha256-5XId/8r09qEAyBI8lFq0qpVsEvtdDl6gHkBHmhp/sMA=",
|
||||||
"owner": "helix-editor",
|
"owner": "helix-editor",
|
||||||
"repo": "helix",
|
"repo": "helix",
|
||||||
"rev": "ee3171cc54052bc8d3569cc04bd9f6a57b43afca",
|
"rev": "7fbfec766c2ce2570ca4160744723813dbdc3019",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -202,11 +202,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1691672736,
|
"lastModified": 1696145345,
|
||||||
"narHash": "sha256-HNPA/dKHerA0p4OsToEcW/DtTSXBcK5gFRsy/yPgV/Y=",
|
"narHash": "sha256-3dM7I/d4751SLPJah0to1WBlWiyzIiuCEUwJqwBdmr4=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "6e1eff9aac0e8d84bda7f2d60ba6108eea9b7e79",
|
"rev": "6f9b5b83ad1f470b3d11b8a9fe1d5ef68c7d0e30",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -265,11 +265,11 @@
|
||||||
"kitty-themes": {
|
"kitty-themes": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1691425157,
|
"lastModified": 1694832264,
|
||||||
"narHash": "sha256-dky3zXfbEE5nmNzpC0JEGC8Gv6FuITOiQYolTev6xfo=",
|
"narHash": "sha256-dhzYTHaaTrbE5k+xEC01Y9jGb+ZmEyvWMb4a2WWKGCw=",
|
||||||
"owner": "kovidgoyal",
|
"owner": "kovidgoyal",
|
||||||
"repo": "kitty-themes",
|
"repo": "kitty-themes",
|
||||||
"rev": "b6598362df9ee042ab700f96db9d51ccb16cc7ce",
|
"rev": "c9c12d20f83b9536febb21e4b53e176c0ccccb51",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -280,11 +280,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1691709280,
|
"lastModified": 1696234590,
|
||||||
"narHash": "sha256-zmfH2OlZEXwv572d0g8f6M5Ac6RiO8TxymOpY3uuqrM=",
|
"narHash": "sha256-mgOzQYTvaTT4bFopVOadlndy2RPwLy60rDjIWOGujwo=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "cf73a86c35a84de0e2f3ba494327cf6fb51c0dfd",
|
"rev": "f902cb49892d300ff15cb237e48aa1cad79d68c3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -296,11 +296,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-master": {
|
"nixpkgs-master": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1691852799,
|
"lastModified": 1696285335,
|
||||||
"narHash": "sha256-emaxnX7+/73asqNiPkZg1KV5vkpCqMNmLMO1L1RrrYk=",
|
"narHash": "sha256-dsu/cEULkVLa4u5BEw/ScCsWqN8zTUUk2o02YOb+Y+c=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "aefe566f73164776003ef5ef78003b5f9ccd7c4f",
|
"rev": "2e8f277e5252b44d8b6f5c3e16335d8d543b50bf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -341,11 +341,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1691747570,
|
"lastModified": 1696158581,
|
||||||
"narHash": "sha256-J3fnIwJtHVQ0tK2JMBv4oAmII+1mCdXdpeCxtIsrL2A=",
|
"narHash": "sha256-h0vY4E7Lx95lpYQbG2w4QH4yG5wCYOvPJzK93wVQbT0=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "pre-commit-hooks.nix",
|
"repo": "pre-commit-hooks.nix",
|
||||||
"rev": "c5ac3aa3324bd8aebe8622a3fc92eeb3975d317a",
|
"rev": "033453f85064ccac434dfd957f95d8457901ecd6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -401,11 +401,11 @@
|
||||||
"starship-src": {
|
"starship-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1691816563,
|
"lastModified": 1696143619,
|
||||||
"narHash": "sha256-aK5uY25R7d45o+rmeaErjjWK2WIX+edQGUqdY5RiIDU=",
|
"narHash": "sha256-3YcmrAdrCXU3NZ82swMVL4uhRzM17e9IbLrFeke+6ak=",
|
||||||
"owner": "starship",
|
"owner": "starship",
|
||||||
"repo": "starship",
|
"repo": "starship",
|
||||||
"rev": "d63ef1febbf0009cdfc5527d02d2d3ec0ec4162b",
|
"rev": "7e82cb494c540c7a88cf126ec80aeb0f7ce611bc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -109,16 +109,11 @@
|
||||||
"steam"
|
"steam"
|
||||||
];
|
];
|
||||||
home-manager.sharedModules = [{
|
home-manager.sharedModules = [{
|
||||||
# programs.fish.shellAliases = {
|
|
||||||
# code = "${pkgs.vscodium}/bin/codium";
|
|
||||||
# };
|
|
||||||
programs.ssh.matchBlocks.remarkable = {
|
programs.ssh.matchBlocks.remarkable = {
|
||||||
hostname = "10.11.99.1";
|
hostname = "10.11.99.1";
|
||||||
user = "root";
|
user = "root";
|
||||||
port = 22;
|
port = 22;
|
||||||
};
|
};
|
||||||
# programs.vscode.package = pkgs.vscodium;
|
|
||||||
programs.vscode.enable = true;
|
|
||||||
}];
|
}];
|
||||||
}];
|
}];
|
||||||
};
|
};
|
||||||
|
@ -136,6 +131,7 @@
|
||||||
home-manager.sharedModules = [{
|
home-manager.sharedModules = [{
|
||||||
# TODO: how to remove this entirely?
|
# TODO: how to remove this entirely?
|
||||||
home.file.".tarsnaprc" = lib.mkForce { text = ""; };
|
home.file.".tarsnaprc" = lib.mkForce { text = ""; };
|
||||||
|
launchd.agents.tarsnap.enable = lib.mkForce false;
|
||||||
home.packages = [ pkgs.yubiswitch ];
|
home.packages = [ pkgs.yubiswitch ];
|
||||||
programs.ssh.matchBlocks.devbox = {
|
programs.ssh.matchBlocks.devbox = {
|
||||||
hostname = "csdev6";
|
hostname = "csdev6";
|
||||||
|
@ -145,7 +141,6 @@
|
||||||
programs.fish.functions.devbox.body = ''
|
programs.fish.functions.devbox.body = ''
|
||||||
ssh -t devbox "agenttmux attach; or agenttmux new -s yelp"
|
ssh -t devbox "agenttmux attach; or agenttmux new -s yelp"
|
||||||
'';
|
'';
|
||||||
launchd.agents.tarsnap.enable = lib.mkForce false;
|
|
||||||
}];
|
}];
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
|
@ -169,7 +169,7 @@
|
||||||
cat = "${pkgs.bat}/bin/bat --style=plain --paging=never";
|
cat = "${pkgs.bat}/bin/bat --style=plain --paging=never";
|
||||||
du = "${pkgs.du-dust}/bin/dust";
|
du = "${pkgs.du-dust}/bin/dust";
|
||||||
g = "${pkgs.gitAndTools.git}/bin/git";
|
g = "${pkgs.gitAndTools.git}/bin/git";
|
||||||
ls = "${pkgs.exa}/bin/exa";
|
ls = "${pkgs.eza}/bin/eza";
|
||||||
ll = "ls -l --time-style long-iso --icons";
|
ll = "ls -l --time-style long-iso --icons";
|
||||||
la = "ll -a";
|
la = "ll -a";
|
||||||
http = "${pkgs.xh}/bin/xh";
|
http = "${pkgs.xh}/bin/xh";
|
||||||
|
@ -180,8 +180,6 @@
|
||||||
colortest = "${pkgs.terminal-colors}/bin/terminal-colors -o";
|
colortest = "${pkgs.terminal-colors}/bin/terminal-colors -o";
|
||||||
} // lib.optionalAttrs pkgs.stdenv.isDarwin {
|
} // lib.optionalAttrs pkgs.stdenv.isDarwin {
|
||||||
sb = "set-background-to-macOS";
|
sb = "set-background-to-macOS";
|
||||||
conda-init =
|
|
||||||
"eval /opt/homebrew/bin/conda 'shell.fish' 'hook' $argv | source";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Configuration that should be above `loginShellInit` and `interactiveShellInit`.
|
# Configuration that should be above `loginShellInit` and `interactiveShellInit`.
|
||||||
|
|
|
@ -23,10 +23,10 @@
|
||||||
AddKeysToAgent = "yes";
|
AddKeysToAgent = "yes";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
# vscode = {
|
vscode = {
|
||||||
# enable = true;
|
enable = true;
|
||||||
# extensions = [ pijul-vscode ];
|
# extensions = [ pijul-vscode ];
|
||||||
# };
|
};
|
||||||
zoxide = { enable = true; };
|
zoxide = { enable = true; };
|
||||||
};
|
};
|
||||||
# }}}
|
# }}}
|
||||||
|
@ -48,8 +48,8 @@
|
||||||
bottom
|
bottom
|
||||||
# fancy version of `du`
|
# fancy version of `du`
|
||||||
du-dust
|
du-dust
|
||||||
# fancy version of `ls`
|
# fancy version of `ls`, fork of now-unmaintained `exa`
|
||||||
exa
|
eza
|
||||||
# fancy version of `find`
|
# fancy version of `find`
|
||||||
fd
|
fd
|
||||||
# wrapper for `ssh` that better at not dropping connections
|
# wrapper for `ssh` that better at not dropping connections
|
||||||
|
|
|
@ -13,7 +13,7 @@ _: prev:
|
||||||
prev.callPackage (./. + "/${name}.nix")
|
prev.callPackage (./. + "/${name}.nix")
|
||||||
({ "${name}-src" = inputs."${name}-src"; } // extras)) {
|
({ "${name}-src" = inputs."${name}-src"; } // extras)) {
|
||||||
cinny = { };
|
cinny = { };
|
||||||
dark-mode-notify = { sdkVersion = "14.*"; };
|
dark-mode-notify = { sdkVersion = "*.*"; };
|
||||||
ia-writer-family = { };
|
ia-writer-family = { };
|
||||||
yubiswitch = { };
|
yubiswitch = { };
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
disabled = ["repeated_keys"]
|
Loading…
Reference in New Issue