Compare commits
No commits in common. "d1ee40c92bde4edde1d4c72be99d099233938318" and "a504430d1525326a8a3a0d5053f6f858eded26ad" have entirely different histories.
d1ee40c92b
...
a504430d15
20 changed files with 46 additions and 2437 deletions
|
|
@ -8,6 +8,8 @@
|
|||
environment.systemPackages = with pkgs; [
|
||||
vim
|
||||
agenix.packages.aarch64-darwin.default
|
||||
iterm2
|
||||
tailscale
|
||||
(pkgs.writeShellScriptBin "portalpatch" ''
|
||||
#!/usr/bin/env bash
|
||||
# Automatically patch the game Portal for use on Apple Silicon using the
|
||||
|
|
@ -93,14 +95,11 @@
|
|||
];
|
||||
brews = [
|
||||
"borgbackup/tap/borgbackup-fuse"
|
||||
"buildkit"
|
||||
{
|
||||
name = "colima";
|
||||
restart_service = true;
|
||||
}
|
||||
"docker"
|
||||
"docker-buildx"
|
||||
"docker-credential-helper"
|
||||
"firefoxpwa"
|
||||
"r"
|
||||
|
||||
|
|
@ -117,14 +116,12 @@
|
|||
"alt-tab"
|
||||
"anki"
|
||||
"anythingllm"
|
||||
"background-music"
|
||||
"element"
|
||||
"eloston-chromium"
|
||||
"firefox"
|
||||
"freetube"
|
||||
"inkscape"
|
||||
"iterm2"
|
||||
"logi-options+"
|
||||
"kdeconnect@nightly"
|
||||
"logseq"
|
||||
"macfuse"
|
||||
"musescore"
|
||||
|
|
@ -149,6 +146,7 @@
|
|||
];
|
||||
masApps = {
|
||||
"Bitwarden" = 1352778147;
|
||||
"Hidden Bar" = 1452453066;
|
||||
"Tailscale" = 1475387142;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
[Appearance]
|
||||
ColorScheme=Breeze
|
||||
Font=MesloLGS NF,10,-1,5,50,0,0,0,0,0
|
||||
TabColor=255,255,255
|
||||
|
||||
[Cursor Options]
|
||||
CursorShape=1
|
||||
|
||||
[General]
|
||||
Name=My Default
|
||||
Parent=FALLBACK/
|
||||
RemoteTabTitleFormat=[SSH] %H
|
||||
|
||||
[Interaction Options]
|
||||
CopyTextAsHTML=false
|
||||
MouseWheelZoomEnabled=false
|
||||
UnderlineFilesEnabled=true
|
||||
|
||||
[Terminal Features]
|
||||
BlinkingCursorEnabled=true
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
[Desktop Entry]
|
||||
Actions=OpenWithKate
|
||||
Icon=kate
|
||||
ServiceTypes=KonqPopupMenu/Plugin
|
||||
MimeType=application/octet-stream;
|
||||
Type=Service
|
||||
X-KDE-Priority=TopLevel
|
||||
|
||||
[Desktop Action OpenWithKate]
|
||||
Exec=kate %u
|
||||
Icon=kate
|
||||
Name=Edit with Kate
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
[Desktop Entry]
|
||||
DefaultProfile=My Default.profile
|
||||
|
||||
[MainWindow]
|
||||
StatusBar=Disabled
|
||||
ToolBarsMovable=Disabled
|
||||
|
||||
[UiSettings]
|
||||
ColorScheme=Default
|
||||
1833
dotfiles/p10k.zsh
1833
dotfiles/p10k.zsh
File diff suppressed because it is too large
Load diff
|
|
@ -1,12 +0,0 @@
|
|||
[Desktop Entry]
|
||||
Actions=PPTConvert
|
||||
Icon=libreoffice-impress
|
||||
Type=Service
|
||||
X-KDE-Priority=TopLevel
|
||||
MimeType=application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.addin.macroEnabled.12;application/vnd.ms-powerpoint.presentation.macroEnabled.12;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;application/vnd.oasis.opendocument.presentation;
|
||||
ServiceTypes=KonqPopupMenu/Plugin
|
||||
|
||||
[Desktop Action PPTConvert]
|
||||
Exec=soffice --headless --convert-to pdf:impress_pdf_Export %f
|
||||
Icon=libreoffice-impress
|
||||
Name=Convert to PDF
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
try
|
||||
using OhMyREPL
|
||||
enable_autocomplete_brackets(false)
|
||||
catch e
|
||||
@warn "Error initalizing OhMyREPL" exception=(e, catch_backtrace())
|
||||
end
|
||||
try
|
||||
using Revise
|
||||
catch e
|
||||
@warn "Error initalizing Revise" exception=(e, catch_backtrace())
|
||||
end
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
[Desktop Entry]
|
||||
Actions=VLCPlayFolder
|
||||
Icon=vlc
|
||||
ServiceTypes=KonqPopupMenu/Plugin,inode/directory,inode/directory-locked
|
||||
Type=Service
|
||||
X-KDE-Priority=TopLevel
|
||||
|
||||
[Desktop Entry]
|
||||
Actions=AppendVLCPlaylist
|
||||
Icon=vlc
|
||||
MimeType=application/ogg;application/x-ogg;audio/ogg;audio/vorbis;audio/x-vorbis;audio/x-vorbis+ogg;video/ogg;video/x-ogm;video/x-ogm+ogg;video/x-theora+ogg;video/x-theora;audio/x-speex;audio/opus;application/x-flac;audio/flac;audio/x-flac;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;audio/x-ms-wma;video/x-ms-asf;video/x-ms-asf-plugin;video/x-ms-asx;video/x-ms-wm;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvx;video/x-msvideo;audio/x-pn-windows-acm;video/divx;video/msvideo;video/vnd.divx;video/avi;video/x-avi;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/vnd.rn-realaudio;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-real-audio;audio/x-realaudio;video/vnd.rn-realvideo;audio/mpeg;audio/mpg;audio/mp1;audio/mp2;audio/mp3;audio/x-mp1;audio/x-mp2;audio/x-mp3;audio/x-mpeg;audio/x-mpg;video/mp2t;video/mpeg;video/mpeg-system;video/x-mpeg;video/x-mpeg2;video/x-mpeg-system;application/mpeg4-iod;application/mpeg4-muxcodetable;application/x-extension-m4a;application/x-extension-mp4;audio/aac;audio/m4a;audio/mp4;audio/x-m4a;audio/x-aac;video/mp4;video/mp4v-es;video/x-m4v;application/x-quicktime-media-link;application/x-quicktimeplayer;video/quicktime;application/x-matroska;audio/x-matroska;video/x-matroska;video/webm;audio/webm;audio/3gpp;audio/3gpp2;audio/AMR;audio/AMR-WB;video/3gp;video/3gpp;video/3gpp2;x-scheme-handler/mms;x-scheme-handler/mmsh;x-scheme-handler/rtsp;x-scheme-handler/rtp;x-scheme-handler/rtmp;x-scheme-handler/icy;x-scheme-handler/icyx;application/x-cd-image;x-content/video-vcd;x-content/video-svcd;x-content/video-dvd;x-content/audio-cdda;x-content/audio-player;application/ram;application/xspf+xml;audio/mpegurl;audio/x-mpegurl;audio/scpls;audio/x-scpls;text/google-video-pointer;text/x-google-video-pointer;video/vnd.mpegurl;application/vnd.apple.mpegurl;application/vnd.ms-asf;application/vnd.ms-wpl;application/sdp;audio/dv;video/dv;audio/x-aiff;audio/x-pn-aiff;video/x-anim;video/x-nsv;video/fli;video/flv;video/x-flc;video/x-fli;video/x-flv;audio/wav;audio/x-pn-au;audio/x-pn-wav;audio/x-wav;audio/x-adpcm;audio/ac3;audio/eac3;audio/vnd.dts;audio/vnd.dts.hd;audio/vnd.dolby.heaac.1;audio/vnd.dolby.heaac.2;audio/vnd.dolby.mlp;audio/basic;audio/midi;audio/x-ape;audio/x-gsm;audio/x-musepack;audio/x-tta;audio/x-wavpack;audio/x-shorten;application/x-shockwave-flash;application/x-flash-video;misc/ultravox;image/vnd.rn-realpix;audio/x-it;audio/x-mod;audio/x-s3m;audio/x-xm;application/mxf;
|
||||
Type=Service
|
||||
ServiceTypes=KonqPopupMenu/Plugin
|
||||
|
||||
[Desktop Action VLCPlayFolder]
|
||||
Exec=vlc %f
|
||||
Icon=vlc
|
||||
Name=Play Folder with VLC
|
||||
|
||||
[Desktop Action AppendVLCPlaylist]
|
||||
Exec=vlc --one-instance --playlist-enqueue %U
|
||||
Icon=vlc
|
||||
Name=Append to VLC Playlist
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
[Desktop Entry]
|
||||
Actions=WordConvert
|
||||
Icon=libreoffice-writer
|
||||
Type=Service
|
||||
X-KDE-Priority=TopLevel
|
||||
MimeType=application/msword;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.document.macroEnabled.12;application/vnd.ms-word.template.macroEnabled.12;application/vnd.oasis.opendocument.text;
|
||||
ServiceTypes=KonqPopupMenu/Plugin
|
||||
|
||||
[Desktop Action WordConvert]
|
||||
Exec=soffice --headless --convert-to pdf:writer_pdf_Export %f
|
||||
Icon=libreoffice-writer
|
||||
Name=Convert to PDF
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
[Desktop Entry]
|
||||
DefaultProfile=My Default.profile
|
||||
|
||||
[Dialogs]
|
||||
FirstRun=false
|
||||
|
||||
[Shortcuts]
|
||||
next-session=Shift+Right; Ctrl+Shift+Tab
|
||||
previous-terminal=none
|
||||
|
||||
[Window]
|
||||
DynamicTabTitles=true
|
||||
Height=60
|
||||
Screen=1
|
||||
ShowSystrayIcon=false
|
||||
Width=60
|
||||
30
flake.lock
generated
30
flake.lock
generated
|
|
@ -10,11 +10,11 @@
|
|||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1736955230,
|
||||
"narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=",
|
||||
"lastModified": 1723293904,
|
||||
"narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
|
||||
"owner": "ryantm",
|
||||
"repo": "agenix",
|
||||
"rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c",
|
||||
"rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -73,11 +73,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739757849,
|
||||
"narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
|
||||
"lastModified": 1734366194,
|
||||
"narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
|
||||
"rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -94,11 +94,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741126078,
|
||||
"narHash": "sha256-ng0a4cIq3c9E3iGKomlwqKzVYs2RLOzQho2U1Mc2sqU=",
|
||||
"lastModified": 1736820923,
|
||||
"narHash": "sha256-SDuKLOWAh8VJRXlNWQn9QE99bjeEUAAbYXqrKGbsiyk=",
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "c172f50b55b087f8e7801631de977461603bb976",
|
||||
"rev": "944c2b181792ae7ae6b20c0df3f44879c11706c9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -110,11 +110,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1741838297,
|
||||
"narHash": "sha256-0etyrY6jOzFwVILODzMc43MTtUanxzFSaqe3kVLvew4=",
|
||||
"lastModified": 1736949135,
|
||||
"narHash": "sha256-HGSacCG66FNt/oQjxXsp+2og657hZFjBDAhUGzPoyn4=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "80b53fdb4f883238807ced86db41be809d60f3b5",
|
||||
"rev": "5a141918f8b3ea128746881b6c099a6df569a51e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -126,11 +126,11 @@
|
|||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1741865919,
|
||||
"narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=",
|
||||
"lastModified": 1734126203,
|
||||
"narHash": "sha256-0XovF7BYP50rTD2v4r55tR5MuBLet7q4xIz6Rgh3BBU=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a",
|
||||
"rev": "71a6392e367b08525ee710a93af2e80083b5b3e2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
71
flake.nix
71
flake.nix
|
|
@ -19,65 +19,36 @@
|
|||
};
|
||||
};
|
||||
|
||||
outputs = { self, nix-darwin, nixpkgs, nixpkgs-unstable, home-manager, agenix
|
||||
, ... }: {
|
||||
homeConfigurations = {
|
||||
"millironx@corianne" = home-manager.lib.homeManagerConfiguration {
|
||||
pkgs = import nixpkgs {
|
||||
system = "aarch64-darwin";
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
outputs =
|
||||
{ self, nix-darwin, nixpkgs, nixpkgs-unstable, home-manager, agenix, ... }:
|
||||
let
|
||||
system = "aarch64-darwin";
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
pkgs-unstable = import nixpkgs-unstable {
|
||||
inherit system;
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
in {
|
||||
homeConfigurations."millironx" =
|
||||
home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
|
||||
# Specify your home configuration modules here, for example,
|
||||
# the path to your home.nix.
|
||||
modules = [
|
||||
./homes/common.nix
|
||||
./homes/darwin.nix
|
||||
./homes/desktop.nix
|
||||
./homes/corianne.nix
|
||||
agenix.homeManagerModules.default
|
||||
];
|
||||
modules = [ ./home.nix agenix.homeManagerModules.default ];
|
||||
|
||||
# Optionally use extraSpecialArgs
|
||||
# to pass through arguments to home.nix
|
||||
extraSpecialArgs = {
|
||||
pkgs-unstable = import nixpkgs-unstable {
|
||||
system = "aarch64-darwin";
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
};
|
||||
extraSpecialArgs = { inherit pkgs-unstable; };
|
||||
};
|
||||
|
||||
"millironx@anderson" = let
|
||||
system = "x86_64-linux";
|
||||
config = { allowUnfree = true; };
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
inherit config;
|
||||
};
|
||||
pkg-unstable = import nixpkgs-unstable {
|
||||
inherit system;
|
||||
inherit config;
|
||||
};
|
||||
in home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
modules = [
|
||||
./homes/common.nix
|
||||
./homes/linux.nix
|
||||
./homes/anderson.nix
|
||||
agenix.homeManagerModules.default
|
||||
];
|
||||
extraSpecialArgs = { inherit pkg-unstable; };
|
||||
};
|
||||
};
|
||||
|
||||
darwinConfigurations."corianne" = nix-darwin.lib.darwinSystem {
|
||||
system = "aarch64-darwin";
|
||||
darwinConfigurations."corianne" = nix-darwin.lib.darwinSystem rec {
|
||||
inherit system;
|
||||
specialArgs = {
|
||||
pkgs-unstable = import nixpkgs-unstable {
|
||||
system = "aarch64-darwin";
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
pkgs-unstable = import nixpkgs-unstable { inherit system; };
|
||||
agenix = agenix;
|
||||
};
|
||||
modules = [ ./configuration.nix agenix.darwinModules.default ];
|
||||
|
|
|
|||
48
home.nix
48
home.nix
|
|
@ -35,7 +35,6 @@
|
|||
gnused
|
||||
htop
|
||||
jq
|
||||
kdePackages.qtdeclarative
|
||||
lsd
|
||||
lynx
|
||||
most
|
||||
|
|
@ -50,7 +49,8 @@
|
|||
shellcheck
|
||||
sketchybar-app-font
|
||||
sqlitebrowser
|
||||
woodpecker-cli
|
||||
texlive.combined.scheme-full
|
||||
pkgs-unstable.woodpecker-cli
|
||||
yt-dlp
|
||||
zulu17
|
||||
|
||||
|
|
@ -61,7 +61,6 @@
|
|||
(pkgs.nerdfonts.override {
|
||||
fonts = [ "FiraCode" "Hack" "Meslo" "NerdFontsSymbolsOnly" ];
|
||||
})
|
||||
(texlive.combine { inherit (texlive) scheme-basic latex-bin latexmk; })
|
||||
|
||||
# # You can also create simple shell scripts directly inside your
|
||||
# # configuration. For example, this adds a command 'my-hello' to your
|
||||
|
|
@ -69,6 +68,10 @@
|
|||
# (pkgs.writeShellScriptBin "my-hello" ''
|
||||
# echo "Hello, ${config.home.username}!"
|
||||
# '')
|
||||
(pkgs.writeShellScriptBin "nd" ''
|
||||
mkdir "$1"
|
||||
cd "$1"
|
||||
'')
|
||||
(pkgs.writeShellScriptBin "uq" ''
|
||||
xattr -rdv com.apple.quarantine "/Applications/$1.app"
|
||||
'')
|
||||
|
|
@ -162,9 +165,6 @@
|
|||
fi
|
||||
# <<< conda initialize <<<
|
||||
export PS1="[\[\e[32m\]\u\[\e[m\]@\[\e[33m\]\h\[\e[m\] \[\e[34m\]\W\[\e[m\]] \\$ "
|
||||
function nd() {
|
||||
mkdir -p "$1" && cd "$1"
|
||||
}
|
||||
'';
|
||||
profileExtra = ''
|
||||
if [ "$(arch)" = "i386" ]; then
|
||||
|
|
@ -197,38 +197,6 @@
|
|||
credential = { helper = "store"; };
|
||||
color = { ui = "auto"; };
|
||||
init = { defaultBranch = "master"; };
|
||||
column = { ui = "auto"; };
|
||||
branch = { sort = "-committerdate"; };
|
||||
tag = { sort = "version:refname"; };
|
||||
diff = {
|
||||
algorithm = "histogram";
|
||||
colorMoved = "plain";
|
||||
mnemonicPrefix = true;
|
||||
renames = true;
|
||||
};
|
||||
push = {
|
||||
default = "simple";
|
||||
autoSetupRemote = true;
|
||||
followTages = true;
|
||||
};
|
||||
fetch = {
|
||||
prune = true;
|
||||
pruneTags = true;
|
||||
all = true;
|
||||
};
|
||||
help = { autocorrect = "prompt"; };
|
||||
commit = { verbose = true; };
|
||||
rerere = {
|
||||
enabled = true;
|
||||
autoupdate = true;
|
||||
};
|
||||
rebase = {
|
||||
autoSquash = true;
|
||||
autoStash = true;
|
||||
updateRefs = true;
|
||||
};
|
||||
merge = { conflictstyle = "zdiff3"; };
|
||||
pull = { rebase = true; };
|
||||
};
|
||||
};
|
||||
programs.gpg.enable = true;
|
||||
|
|
@ -297,10 +265,6 @@
|
|||
# <<< conda initialize <<<
|
||||
#gpgconf --launch gpg-agent
|
||||
source "$HOME/.cargo/env"
|
||||
|
||||
function nd() {
|
||||
mkdir -p "$1" && cd "$1"
|
||||
}
|
||||
'';
|
||||
profileExtra = ''
|
||||
if [ "$(arch)" = "i386" ]; then
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
{ config, lib, pkgs, pkgs-unstable, ... }: {
|
||||
home = {
|
||||
username = "millironx";
|
||||
homeDirectory = "/home/millironx";
|
||||
};
|
||||
programs = { };
|
||||
services = { };
|
||||
}
|
||||
211
homes/common.nix
211
homes/common.nix
|
|
@ -1,211 +0,0 @@
|
|||
{ config, lib, pkgs, pkgs-unstable, ... }:
|
||||
let
|
||||
packages = import ./../pkgs.nix {
|
||||
inherit pkgs;
|
||||
inherit pkgs-unstable;
|
||||
};
|
||||
in {
|
||||
home = {
|
||||
stateVersion = "23.11";
|
||||
file = {
|
||||
".p10k.zsh".source = ./../dotfiles/p10k.zsh;
|
||||
"./local/share/julia/config/startup.jl".source = ./../dotfiles/startup.jl;
|
||||
};
|
||||
packages = packages.common;
|
||||
sessionVariables = {
|
||||
PAGER = "most";
|
||||
NXF_HOME = "\${XDG_DATA_HOME:-$HOME/.local/share}/nextflow";
|
||||
NXF_CACHE = "\${XDW_CACHE_HOME:-$HOME/.cache}/nextflow";
|
||||
NXF_CONDA_CACHEDIR = "$NXF_CACHE/conda";
|
||||
NXF_SINGULARITY_CACHEDIR = "$NXF_CACHE/singularity";
|
||||
JULIA_DEPOT_PATH = "\${XDG_DATA_HOME:-$HOME/.local/share}/julia:";
|
||||
JULIA_PKG_USE_CLI_GIT = "true";
|
||||
GPG_TTY = "$(tty)";
|
||||
SSH_AUTH_SOCK = "$(gpgconf --list-dirs agent-ssh-socket)";
|
||||
};
|
||||
shellAliases = {
|
||||
cat = "bat";
|
||||
please = "sudo $(fc -ln -1)";
|
||||
grim = "git rebase -i --autosquash $(git_main_branch)";
|
||||
grid = "git rebase -i --autosquash $(git_develop_branch)";
|
||||
gpub =
|
||||
"git push --set-upstream origin $(git rev-parse --abbrev-ref HEAD)";
|
||||
};
|
||||
sessionPath = [ "$HOME/.local/bin" ];
|
||||
};
|
||||
programs = {
|
||||
home-manager = { enable = true; };
|
||||
bash = {
|
||||
enable = true;
|
||||
initExtra = ''
|
||||
# >>> conda initialize >>>
|
||||
# !! Contents within this block are managed by 'conda init' !!
|
||||
__conda_setup="$($HOME/miniconda3/bin/conda shell.bash 'hook' 2> /dev/null)"
|
||||
if [ $? -eq 0 ]; then
|
||||
eval "$__conda_setup"
|
||||
else
|
||||
if [ -f "$HOME/miniconda3/etc/profile.d/conda.sh" ]; then
|
||||
. "$HOME/miniconda3/etc/profile.d/conda.sh"
|
||||
else
|
||||
export PATH="$HOME/miniconda3/bin:$PATH"
|
||||
fi
|
||||
fi
|
||||
unset __conda_setup
|
||||
|
||||
if [ -f "$HOME/miniconda3/etc/profile.d/mamba.sh" ]; then
|
||||
. "$HOME/miniconda3/etc/profile.d/mamba.sh"
|
||||
fi
|
||||
# <<< conda initialize <<<
|
||||
export PS1="[\[\e[32m\]\u\[\e[m\]@\[\e[33m\]\h\[\e[m\] \[\e[34m\]\W\[\e[m\]] \\$ "
|
||||
function nd() {
|
||||
mkdir -p "$1" && cd "$1"
|
||||
}
|
||||
'';
|
||||
profileExtra = ''
|
||||
if [ "$(arch)" = "i386" ]; then
|
||||
eval "$(/usr/local/bin/brew shellenv bash)"
|
||||
else
|
||||
eval "$(/opt/homebrew/bin/brew shellenv bash)"
|
||||
fi
|
||||
#gpgconf --launch gpg-agent
|
||||
'';
|
||||
};
|
||||
bat = {
|
||||
enable = true;
|
||||
config = { pager = "less -SRF"; };
|
||||
};
|
||||
direnv = {
|
||||
enable = true;
|
||||
enableBashIntegration = true;
|
||||
enableZshIntegration = true;
|
||||
};
|
||||
gh = { enable = true; };
|
||||
git = {
|
||||
enable = true;
|
||||
userName = "Thomas A. Christensen II";
|
||||
userEmail = "25492070+MillironX@users.noreply.github.com";
|
||||
extraConfig = {
|
||||
core = { editor = "nvim"; };
|
||||
credential = { helper = "store"; };
|
||||
color = { ui = "auto"; };
|
||||
init = { defaultBranch = "master"; };
|
||||
column = { ui = "auto"; };
|
||||
branch = { sort = "-committerdate"; };
|
||||
tag = { sort = "version:refname"; };
|
||||
diff = {
|
||||
algorithm = "histogram";
|
||||
colorMoved = "plain";
|
||||
mnemonicPrefix = true;
|
||||
renames = true;
|
||||
};
|
||||
push = {
|
||||
default = "simple";
|
||||
autoSetupRemote = true;
|
||||
followTages = true;
|
||||
};
|
||||
fetch = {
|
||||
prune = true;
|
||||
pruneTags = true;
|
||||
all = true;
|
||||
};
|
||||
help = { autocorrect = "prompt"; };
|
||||
commit = { verbose = true; };
|
||||
rerere = {
|
||||
enabled = true;
|
||||
autoupdate = true;
|
||||
};
|
||||
rebase = {
|
||||
autoSquash = true;
|
||||
autoStash = true;
|
||||
updateRefs = true;
|
||||
};
|
||||
merge = { conflictstyle = "zdiff3"; };
|
||||
pull = { rebase = true; };
|
||||
};
|
||||
};
|
||||
gpg = { enable = true; };
|
||||
lsd = {
|
||||
enable = true;
|
||||
enableAliases = true;
|
||||
};
|
||||
neovim = {
|
||||
enable = true;
|
||||
package = pkgs.neovim-unwrapped;
|
||||
defaultEditor = true;
|
||||
coc.enable = true;
|
||||
plugins = with pkgs.vimPlugins; [
|
||||
mason-nvim
|
||||
mason-lspconfig-nvim
|
||||
nvim-lspconfig
|
||||
nvim-dap
|
||||
nvim-dap-ui
|
||||
null-ls-nvim
|
||||
nvim-lint
|
||||
formatter-nvim
|
||||
lspsaga-nvim
|
||||
vim-slime
|
||||
];
|
||||
extraLuaConfig = ''
|
||||
require("mason").setup()
|
||||
'';
|
||||
};
|
||||
pandoc = { enable = true; };
|
||||
yt-dlp = { enable = true; };
|
||||
zsh = {
|
||||
enable = true;
|
||||
autosuggestion.enable = true;
|
||||
enableCompletion = true;
|
||||
completionInit =
|
||||
"autoload -U compinit && compinit; autoload -U bashcompinit && bashcompinit";
|
||||
antidote = {
|
||||
enable = true;
|
||||
plugins = [
|
||||
"ohmyzsh/ohmyzsh path:lib"
|
||||
"ohmyzsh/ohmyzsh path:plugins/git"
|
||||
"ohmyzsh/ohmyzsh path:plugins/extract"
|
||||
"zsh-users/zsh-syntax-highlighting"
|
||||
"zsh-users/zsh-autosuggestions"
|
||||
"zsh-users/zsh-completions"
|
||||
"romkatv/powerlevel10k"
|
||||
];
|
||||
};
|
||||
initExtraFirst = ''
|
||||
if [[ -r "''${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh" ]]; then
|
||||
source "''${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh"
|
||||
fi
|
||||
'';
|
||||
initExtra = ''
|
||||
source ~/.p10k.zsh
|
||||
# >>> conda initialize >>>
|
||||
# !! Contents within this block are managed by 'conda init' !!
|
||||
__conda_setup="$($HOME/miniconda3/bin/conda shell.zsh 'hook' 2> /dev/null)"
|
||||
if [ $? -eq 0 ]; then
|
||||
eval "$__conda_setup"
|
||||
else
|
||||
if [ -f "$HOME/miniconda3/etc/profile.d/conda.sh" ]; then
|
||||
. "$HOME/miniconda3/etc/profile.d/conda.sh"
|
||||
else
|
||||
export PATH="$HOME/miniconda3/bin:$PATH"
|
||||
fi
|
||||
fi
|
||||
unset __conda_setup
|
||||
|
||||
if [ -f "$HOME/miniconda3/etc/profile.d/mamba.sh" ]; then
|
||||
. "$HOME/miniconda3/etc/profile.d/mamba.sh"
|
||||
fi
|
||||
# <<< conda initialize <<<
|
||||
|
||||
function nd() {
|
||||
mkdir -p "$1" && cd "$1"
|
||||
}
|
||||
'';
|
||||
profileExtra = ''
|
||||
if [ "$(arch)" = "i386" ]; then
|
||||
eval "$(/usr/local/bin/brew shellenv zsh)"
|
||||
else
|
||||
eval "$(/opt/homebrew/bin/brew shellenv zsh)"
|
||||
fi
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
{ config, lib, pkgs, pkgs-unstable, ... }: {
|
||||
home = {
|
||||
username = "millironx";
|
||||
homeDirectory = "/Users/millironx";
|
||||
};
|
||||
programs = {
|
||||
git = {
|
||||
signing = {
|
||||
key = "0x19A2EF3A3C0C18A9!";
|
||||
signByDefault = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
services = {
|
||||
gpg-agent = { sshKeys = [ "CC3F27D613DCC2248B56A881FDDACEF6EA090E37" ]; };
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
{ config, lib, pkgs, pkgs-unstable, ... }:
|
||||
let
|
||||
packages = import ./../pkgs.nix {
|
||||
inherit pkgs;
|
||||
inherit pkgs-unstable;
|
||||
};
|
||||
in {
|
||||
home = {
|
||||
packages = packages.darwin;
|
||||
sessionVariables = { JULIA_NUM_THREADS = "$(sysctl -n hw.logicalcpu)"; };
|
||||
shellAliases = { nproc = "sysctl -n hw.logicalcpu"; };
|
||||
};
|
||||
programs = {
|
||||
bash = {
|
||||
profileExtra = ''
|
||||
if [ "$(arch)" = "i386" ]; then
|
||||
eval "$(/usr/local/bin/brew shellenv bash)"
|
||||
else
|
||||
eval "$(/opt/homebrew/bin/brew shellenv bash)"
|
||||
fi
|
||||
'';
|
||||
};
|
||||
zsh = {
|
||||
profileExtra = ''
|
||||
if [ "$(arch)" = "i386" ]; then
|
||||
eval "$(/usr/local/bin/brew shellenv zsh)"
|
||||
else
|
||||
eval "$(/opt/homebrew/bin/brew shellenv zsh)"
|
||||
fi
|
||||
'';
|
||||
};
|
||||
};
|
||||
services = { gpg-agent = { pinentryPackage = pkgs.pinentry_mac; }; };
|
||||
}
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
{ config, lib, pkgs, pkgs-unstable, ... }:
|
||||
let
|
||||
packages = import ./../pkgs.nix {
|
||||
inherit pkgs;
|
||||
inherit pkgs-unstable;
|
||||
};
|
||||
in {
|
||||
home = {
|
||||
packages = packages.desktop;
|
||||
shellAliases = { code = "codium"; };
|
||||
};
|
||||
services = {
|
||||
gpg-agent = {
|
||||
enable = true;
|
||||
enableBashIntegration = true;
|
||||
enableSshSupport = true;
|
||||
enableZshIntegration = true;
|
||||
defaultCacheTtl = 60;
|
||||
maxCacheTtl = 120;
|
||||
verbose = true;
|
||||
};
|
||||
syncthing = { enable = true; };
|
||||
};
|
||||
}
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
{ config, lib, pkgs, pkgs-unstable, ... }:
|
||||
let
|
||||
packages = import ./../pkgs.nix {
|
||||
inherit pkgs;
|
||||
inherit pkgs-unstable;
|
||||
};
|
||||
in {
|
||||
fonts = { fontconfig = { enable = true; }; };
|
||||
home = {
|
||||
file = {
|
||||
"${config.xdg.configHome}/konsolerc".source = ./../dotfiles/konsolerc;
|
||||
"${config.xdg.configHome}/yakuakerc".source = ./../dotfiles/yakuakerc;
|
||||
"${config.xdg.dataHome}/konsole/My Default.profile".source =
|
||||
./../dotfiles/MyDefault.profile;
|
||||
"${config.xdg.dataHome}/kio/servicemenus/kate.desktop".source =
|
||||
./../dotfiles/kate.desktop;
|
||||
"${config.xdg.dataHome}/kio/servicemenus/vlc.desktop".source =
|
||||
./../dotfiles/vlc.desktop;
|
||||
"${config.xdg.dataHome}/kio/servicemenus/word-to-pdf.desktop".source =
|
||||
./../dotfiles/word-to-pdf.desktop;
|
||||
"${config.xdg.dataHome}/kio/servicemenus/powerpoint-to-pdf.desktop".source =
|
||||
./../dotfiles/powerpoint-to-pdf.desktop;
|
||||
};
|
||||
packages = packages.linux;
|
||||
shellAliases = {
|
||||
nrun = ''
|
||||
__NV_PRIME_RENDER_OFFLOAD=1 __GLX_VENDOR_LIBRARY_NAME=nvidia __VK_LAYER_NV_optimus="NVIDIA_only"'';
|
||||
};
|
||||
};
|
||||
targets = { genericLinux = { enable = true; }; };
|
||||
}
|
||||
50
pkgs.nix
50
pkgs.nix
|
|
@ -1,50 +0,0 @@
|
|||
{ pkgs, pkgs-unstable, ... }: {
|
||||
common = with pkgs; [
|
||||
act
|
||||
cowsay
|
||||
earthly
|
||||
ffmpeg
|
||||
figlet
|
||||
fortune
|
||||
gitflow
|
||||
git-absorb
|
||||
gnugrep
|
||||
gnused
|
||||
htop
|
||||
jq
|
||||
julia-bin
|
||||
lynx
|
||||
most
|
||||
nil
|
||||
nixd
|
||||
nixfmt-classic
|
||||
pipx
|
||||
python3
|
||||
quarto
|
||||
shellcheck
|
||||
zulu17
|
||||
(texlive.combine { inherit (texlive) scheme-basic latex-bin latexmk; })
|
||||
];
|
||||
|
||||
darwin = with pkgs; [
|
||||
asitop
|
||||
pinentry_mac
|
||||
(pkgs.writeShellScriptBin "uq" ''
|
||||
xattr -rdv com.apple.quarantine "/Applications/$1.app"
|
||||
'')
|
||||
(pkgs.writeShellScriptBin "get-current-wifi" ''
|
||||
ipconfig getsummary $(networksetup -listallhardwareports | awk '/Hardware Port: Wi-Fi/{getline; print $2}') | awk -F ' SSID : ' '/ SSID : / {print $2}'
|
||||
'')
|
||||
];
|
||||
|
||||
desktop = with pkgs; [
|
||||
kdePackages.qtdeclarative
|
||||
sqlitebrowser
|
||||
woodpecker-cli
|
||||
(pkgs.nerdfonts.override {
|
||||
fonts = [ "FiraCode" "Hack" "Meslo" "NerdFontsSymbolsOnly" ];
|
||||
})
|
||||
];
|
||||
|
||||
linux = with pkgs; [ ];
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue