softinio/nix-config
softinio/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request 'updates and cleanup' (#5) from updates-20240323 into main

Browse source 
Reviewed-on: #5
This commit is contained in:
Salar Rahmanian 2024-03-23 10:16:03 -07:00
commit cc54218e6c
2 changed files with 59 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
flake.lock
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709988192, "lastModified": 1711133180,
"narHash": "sha256-qxwIkl85P0I1/EyTT+NJwzbXdOv86vgZxcv4UKicjK8=", "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b0b0c3d94345050a7f86d1ebc6c56eea4389d030", "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -27,11 +27,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709771483, "lastModified": 1710717205,
"narHash": "sha256-Hjzu9nCknHLQvhdaRFfCEprH0o15KcaNu1QDr3J88DI=", "narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "550340062c16d7ef8c2cc20a3d2b97bcd3c6b6f6", "rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -42,11 +42,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1709703039, "lastModified": 1711001935,
"narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", "narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", "rev": "20f77aa09916374aa3141cbc605c955626762c9a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -58,11 +58,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1710006296, "lastModified": 1711204334,
"narHash": "sha256-HuOpxTp/VX9FKjm0tn+omw1z8SsJapFtxuKTDdysJdE=", "narHash": "sha256-Wzdv/we5OmxDHx9qxwO9b6XKRm6IS4jwoVbV65g8LxI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "414e2ef360397c9e024d09dda6de78455d2e00b2", "rev": "676b81c589e5389344eb5c8f5e3fcf321e1dd87d",
"type": "github" "type": "github"
}, },
"original": { "original": {

101
home.nix
View file

@ -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,30 +25,22 @@
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
@ -73,7 +65,7 @@
nodePackages.yaml-language-server nodePackages.yaml-language-server
ollama ollama
openssl openssl
oterm # oterm
pandoc pandoc
patchelf patchelf
pngpaste pngpaste
@ -84,8 +76,7 @@
readline readline
ripgrep ripgrep
ripgrep-all ripgrep-all
rnix-lsp rustup
rustc
sbt sbt
scala-cli scala-cli
shellcheck shellcheck
@ -93,7 +84,6 @@
slides slides
sqlite sqlite
stylua stylua
stack
tealdeer tealdeer
tectonic tectonic
texlab texlab
@ -110,7 +100,7 @@
}; };
programs.bat = { programs.bat = {
enable = true; enable = true;
}; };
programs.btop = { programs.btop = {
@ -137,7 +127,7 @@
programs.eza = { programs.eza = {
enable = true; enable = true;
enableAliases = true; enableFishIntegration = true;
git = true; git = true;
icons = true; icons = true;
extraOptions = [ extraOptions = [
@ -244,10 +234,12 @@
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.python pkgs.vscode-extensions.ms-python.vscode-pylance
# 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";
@ -307,7 +299,7 @@
set -xg LUA_PATH "/nix/store/95wpywsjf5iiw77f6n9rw347lk1sly15-luarocks-3.2.1/share/lua/5.1/?.lua;/nix/store/95wpywsjf5iiw77f6n9rw347lk1sly15-luarocks-3.2.1/share/lua/5.1/?/init.lua;/Users/salar/.luarocks/share/lua/5.1/?.lua;/Users/salar/.luarocks/share/lua/5.1/?/init.lua" set -xg LUA_PATH "/nix/store/95wpywsjf5iiw77f6n9rw347lk1sly15-luarocks-3.2.1/share/lua/5.1/?.lua;/nix/store/95wpywsjf5iiw77f6n9rw347lk1sly15-luarocks-3.2.1/share/lua/5.1/?/init.lua;/Users/salar/.luarocks/share/lua/5.1/?.lua;/Users/salar/.luarocks/share/lua/5.1/?/init.lua"
set -xg LUA_CPATH "?.so;/nix/store/95wpywsjf5iiw77f6n9rw347lk1sly15-luarocks-3.2.1/share/lua/5.1/?/init.lua;/Users/salar/.luarocks/lib/lua/5.1/?.so;/nix/store/95wpywsjf5iiw77f6n9rw347lk1sly15-luarocks-3.2.1/lib/lua/5.1/?.so" set -xg LUA_CPATH "?.so;/nix/store/95wpywsjf5iiw77f6n9rw347lk1sly15-luarocks-3.2.1/share/lua/5.1/?/init.lua;/Users/salar/.luarocks/lib/lua/5.1/?.so;/nix/store/95wpywsjf5iiw77f6n9rw347lk1sly15-luarocks-3.2.1/lib/lua/5.1/?.so"
''; '';
interactiveShellInit = '' interactiveShellInit = ''
set -xg PATH $HOME/bin $HOME/.cargo/bin $PATH set -xg PATH $HOME/bin $HOME/.cargo/bin $PATH
@ -317,48 +309,49 @@
''; '';
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";
nixupgrade="nix upgrade-nix"; nixstorerepair = "nix-store --repair --verify --check-contents";
rmxcodederived="rm -fr ~/Library/Developer/Xcode/DerivedData"; nixupgrade = "nix upgrade-nix";
v="nvim"; rmxcodederived = "rm -fr ~/Library/Developer/Xcode/DerivedData";
wezk="wezterm show-keys --lua"; v = "nvim";
sshfre1="ssh salar@fre1.softinio.net"; wezk = "wezterm show-keys --lua";
sshfre2="ssh -p 2022 salar@fre2.softinio.net"; sshfre1 = "ssh salar@fre1.softinio.net";
sshhcloud1="ssh salar@hcloud1.softinio.net"; sshfre2 = "ssh -p 2022 salar@fre2.softinio.net";
sshhcloud1r="ssh root@hcloud1.softinio.net"; sshhcloud1 = "ssh salar@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 = "6f0048ce70cc3c6f0f7a7ad44fe0aafde5006bad"; rev = "20abfd7ad7a56d7a73d83f6443bb7fe9a72f6b1a";
}; };
} }