Compare commits
No commits in common. "cc54218e6c553b690654837dc9fe5145c14e91b4" and "446f158cd14ed9a8369059a0d79678c8f8472105" have entirely different histories.
cc54218e6c
...
446f158cd1
2 changed files with 66 additions and 59 deletions
24
flake.lock
24
flake.lock
|
@ -7,11 +7,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1711133180,
|
"lastModified": 1709988192,
|
||||||
"narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=",
|
"narHash": "sha256-qxwIkl85P0I1/EyTT+NJwzbXdOv86vgZxcv4UKicjK8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb",
|
"rev": "b0b0c3d94345050a7f86d1ebc6c56eea4389d030",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -27,11 +27,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710717205,
|
"lastModified": 1709771483,
|
||||||
"narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=",
|
"narHash": "sha256-Hjzu9nCknHLQvhdaRFfCEprH0o15KcaNu1QDr3J88DI=",
|
||||||
"owner": "LnL7",
|
"owner": "LnL7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3",
|
"rev": "550340062c16d7ef8c2cc20a3d2b97bcd3c6b6f6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -42,11 +42,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1711001935,
|
"lastModified": 1709703039,
|
||||||
"narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=",
|
"narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "20f77aa09916374aa3141cbc605c955626762c9a",
|
"rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -58,11 +58,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1711204334,
|
"lastModified": 1710006296,
|
||||||
"narHash": "sha256-Wzdv/we5OmxDHx9qxwO9b6XKRm6IS4jwoVbV65g8LxI=",
|
"narHash": "sha256-HuOpxTp/VX9FKjm0tn+omw1z8SsJapFtxuKTDdysJdE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nur",
|
"repo": "nur",
|
||||||
"rev": "676b81c589e5389344eb5c8f5e3fcf321e1dd87d",
|
"rev": "414e2ef360397c9e024d09dda6de78455d2e00b2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
97
home.nix
97
home.nix
|
@ -8,9 +8,9 @@
|
||||||
|
|
||||||
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
|
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
|
||||||
"discord"
|
"discord"
|
||||||
|
"idea-ultimate"
|
||||||
"slack"
|
"slack"
|
||||||
"vscode"
|
"vscode"
|
||||||
"vscode-extension-MS-python-vscode-pylance"
|
|
||||||
"zoom"
|
"zoom"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -25,22 +25,30 @@
|
||||||
any-nix-shell
|
any-nix-shell
|
||||||
aspell
|
aspell
|
||||||
#bloop
|
#bloop
|
||||||
|
cabal-install
|
||||||
|
cabal2nix
|
||||||
cachix
|
cachix
|
||||||
|
cargo
|
||||||
cmake
|
cmake
|
||||||
coursier
|
coursier
|
||||||
curlFull
|
#curlFull
|
||||||
delta
|
delta
|
||||||
deno
|
|
||||||
discord
|
discord
|
||||||
fd
|
fd
|
||||||
ffmpeg
|
ffmpeg
|
||||||
|
#fishPlugins.bass
|
||||||
fishPlugins.foreign-env
|
fishPlugins.foreign-env
|
||||||
fishPlugins.bobthefish
|
fishPlugins.bobthefish
|
||||||
font-awesome
|
font-awesome
|
||||||
gitAndTools.diff-so-fancy
|
gitAndTools.diff-so-fancy
|
||||||
|
ghc
|
||||||
|
ghcid
|
||||||
gnupg
|
gnupg
|
||||||
go
|
go
|
||||||
graphviz
|
graphviz
|
||||||
|
jetbrains.idea-ultimate
|
||||||
|
haskell-language-server
|
||||||
|
hugo
|
||||||
luajit
|
luajit
|
||||||
luajitPackages.luarocks
|
luajitPackages.luarocks
|
||||||
luajitPackages.luasocket
|
luajitPackages.luasocket
|
||||||
|
@ -65,7 +73,7 @@
|
||||||
nodePackages.yaml-language-server
|
nodePackages.yaml-language-server
|
||||||
ollama
|
ollama
|
||||||
openssl
|
openssl
|
||||||
# oterm
|
oterm
|
||||||
pandoc
|
pandoc
|
||||||
patchelf
|
patchelf
|
||||||
pngpaste
|
pngpaste
|
||||||
|
@ -76,7 +84,8 @@
|
||||||
readline
|
readline
|
||||||
ripgrep
|
ripgrep
|
||||||
ripgrep-all
|
ripgrep-all
|
||||||
rustup
|
rnix-lsp
|
||||||
|
rustc
|
||||||
sbt
|
sbt
|
||||||
scala-cli
|
scala-cli
|
||||||
shellcheck
|
shellcheck
|
||||||
|
@ -84,6 +93,7 @@
|
||||||
slides
|
slides
|
||||||
sqlite
|
sqlite
|
||||||
stylua
|
stylua
|
||||||
|
stack
|
||||||
tealdeer
|
tealdeer
|
||||||
tectonic
|
tectonic
|
||||||
texlab
|
texlab
|
||||||
|
@ -127,7 +137,7 @@
|
||||||
|
|
||||||
programs.eza = {
|
programs.eza = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableFishIntegration = true;
|
enableAliases = true;
|
||||||
git = true;
|
git = true;
|
||||||
icons = true;
|
icons = true;
|
||||||
extraOptions = [
|
extraOptions = [
|
||||||
|
@ -234,12 +244,10 @@
|
||||||
pkgs.vscode-extensions.skyapps.fish-vscode
|
pkgs.vscode-extensions.skyapps.fish-vscode
|
||||||
pkgs.vscode-extensions.baccata.scaladex-search
|
pkgs.vscode-extensions.baccata.scaladex-search
|
||||||
pkgs.vscode-extensions.davidanson.vscode-markdownlint
|
pkgs.vscode-extensions.davidanson.vscode-markdownlint
|
||||||
pkgs.vscode-extensions.ms-python.vscode-pylance
|
pkgs.vscode-extensions.ms-python.python
|
||||||
# pkgs.vscode-extensions.ms-python.python
|
|
||||||
pkgs.vscode-extensions.mechatroner.rainbow-csv
|
pkgs.vscode-extensions.mechatroner.rainbow-csv
|
||||||
pkgs.vscode-extensions.mkhl.direnv
|
pkgs.vscode-extensions.mkhl.direnv
|
||||||
pkgs.vscode-extensions.asvetliakov.vscode-neovim
|
pkgs.vscode-extensions.asvetliakov.vscode-neovim
|
||||||
pkgs.vscode-extensions.rust-lang.rust-analyzer
|
|
||||||
];
|
];
|
||||||
userSettings = {
|
userSettings = {
|
||||||
editor.fontFamily = "SF Mono";
|
editor.fontFamily = "SF Mono";
|
||||||
|
@ -309,49 +317,48 @@
|
||||||
'';
|
'';
|
||||||
|
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
addsshmac = "ssh-add ~/.ssh/id_ed25519 --apple-use-keychain --apple-load-keychain";
|
addsshmac="ssh-add ~/.ssh/id_ed25519 --apple-use-keychain --apple-load-keychain";
|
||||||
cat = "bat";
|
cat="bat";
|
||||||
du = "ncdu --color dark -rr -x";
|
du="ncdu --color dark -rr -x";
|
||||||
fzfp = "fzf --preview 'bat --style=numbers --color=always --line-range :500 {}'";
|
fzfp="fzf --preview 'bat --style=numbers --color=always --line-range :500 {}'";
|
||||||
ping = "prettyping";
|
ping="prettyping";
|
||||||
".." = "cd ..";
|
".." = "cd ..";
|
||||||
pj = "python -m json.tool";
|
pj="python -m json.tool";
|
||||||
l = "ll";
|
l="ll";
|
||||||
g = "git";
|
g="git";
|
||||||
gl = "git log";
|
gl="git log";
|
||||||
gc = "git commit -m";
|
gc="git commit -m";
|
||||||
gca = "git commit -am";
|
gca="git commit -am";
|
||||||
gws = "git status";
|
gws="git status";
|
||||||
gu = "gitui";
|
gu="gitui";
|
||||||
ghauth = "gh auth login --with-token < ~/.ghauth";
|
ghauth="gh auth login --with-token < ~/.ghauth";
|
||||||
gitpurgemain = ''git branch --merged | grep -v "\*" | grep -v "main" | xargs -n 1 git branch -d'';
|
gitpurgemain=''git branch --merged | grep -v "\*" | grep -v "main" | xargs -n 1 git branch -d'';
|
||||||
gitpurgemaster = ''git branch --merged | grep -v "\*" | grep -v "master" | xargs -n 1 git branch -d'';
|
gitpurgemaster=''git branch --merged | grep -v "\*" | grep -v "master" | xargs -n 1 git branch -d'';
|
||||||
giscala = "gitignore scala,vim,java,sbt > .gitignore";
|
giscala="gitignore scala,vim,java,sbt > .gitignore";
|
||||||
gforksync = "git fetch upstream && git merge upstream/master && git push origin master";
|
gforksync="git fetch upstream && git merge upstream/master && git push origin master";
|
||||||
grep = "grep --color=auto";
|
grep="grep --color=auto";
|
||||||
lg = "lazygit";
|
lg="lazygit";
|
||||||
new-sbt = "sbt new scala/scala-seed.g8";
|
new-sbt="sbt new scala/scala-seed.g8";
|
||||||
nixc = "cd ~/.config/nixpkgs";
|
nixc="cd ~/.config/nixpkgs";
|
||||||
nixre = "nix build && sudo ./result/activate";
|
nixre="nix build && sudo ./result/activate";
|
||||||
nixinfo = "nix-shell -p nix-info --run \"nix-info -m\"";
|
nixinfo="nix-shell -p nix-info --run \"nix-info -m\"";
|
||||||
nixgc = "nix-collect-garbage -d";
|
nixgc="nix-collect-garbage -d";
|
||||||
nixq = "nix-env -qa";
|
nixq="nix-env -qa";
|
||||||
nixstorerepair = "nix-store --repair --verify --check-contents";
|
nixupgrade="nix upgrade-nix";
|
||||||
nixupgrade = "nix upgrade-nix";
|
rmxcodederived="rm -fr ~/Library/Developer/Xcode/DerivedData";
|
||||||
rmxcodederived = "rm -fr ~/Library/Developer/Xcode/DerivedData";
|
v="nvim";
|
||||||
v = "nvim";
|
wezk="wezterm show-keys --lua";
|
||||||
wezk = "wezterm show-keys --lua";
|
sshfre1="ssh salar@fre1.softinio.net";
|
||||||
sshfre1 = "ssh salar@fre1.softinio.net";
|
sshfre2="ssh -p 2022 salar@fre2.softinio.net";
|
||||||
sshfre2 = "ssh -p 2022 salar@fre2.softinio.net";
|
sshhcloud1="ssh salar@hcloud1.softinio.net";
|
||||||
sshhcloud1 = "ssh salar@hcloud1.softinio.net";
|
sshhcloud1r="ssh root@hcloud1.softinio.net";
|
||||||
sshhcloud1r = "ssh root@hcloud1.softinio.net";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Neovim Configuration
|
# Neovim Configuration
|
||||||
xdg.configFile."nvim".source = builtins.fetchGit {
|
xdg.configFile."nvim".source = builtins.fetchGit {
|
||||||
url = "https://code.softinio.com/softinio/nvim-config";
|
url = "https://code.softinio.com/softinio/nvim-config";
|
||||||
rev = "20abfd7ad7a56d7a73d83f6443bb7fe9a72f6b1a";
|
rev = "6f0048ce70cc3c6f0f7a7ad44fe0aafde5006bad";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue