mirror of
https://github.com/szymon-jozef/amazing-dotfiles.git
synced 2026-09-07 12:10:45 +02:00
Compare commits
2 Commits
f66308c6f3
...
bf46aa2889
| Author | SHA1 | Date | |
|---|---|---|---|
| bf46aa2889 | |||
| e740081f81 |
24
flake.lock
generated
24
flake.lock
generated
@@ -7,11 +7,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1777398395,
|
||||
"narHash": "sha256-SXlXUP3hdOLeACtGbx1Q5ShhJs3WgP2SPhCnv9Ew+Hw=",
|
||||
"lastModified": 1777574785,
|
||||
"narHash": "sha256-wgM3MbJ0eVaJFdigFno+DGNGoQRW5XNu7VQ+KCYNNlw=",
|
||||
"owner": "catppuccin",
|
||||
"repo": "nix",
|
||||
"rev": "ea21443e55c1acca99a69076539e71eaffb87db5",
|
||||
"rev": "b2d0b8ccbe1f3af05252716d5069364fb88e0386",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -66,11 +66,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1777434174,
|
||||
"narHash": "sha256-KwTyQ5g2qDhWIs/O6vH8HeF8n4JCzZIT/VYE7nYnukQ=",
|
||||
"lastModified": 1777518431,
|
||||
"narHash": "sha256-SwgiG2T5pbyo33Vz7/vUCAhEMgwCK8Pa2nDSx5a6/WE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "d3b4e4b1bd59aedd3d4eb0a8df7162edb6da4607",
|
||||
"rev": "2e54a938cdd4c8e414b2518edc3d82308027c670",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -136,11 +136,11 @@
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1777077449,
|
||||
"narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=",
|
||||
"lastModified": 1777428379,
|
||||
"narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160",
|
||||
"rev": "755f5aa91337890c432639c60b6064bb7fe67769",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -331,11 +331,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1777356688,
|
||||
"narHash": "sha256-fOhJpz7QAkBWAAih72CmnIfIN0pHfuZjhZQ/hBLNWxo=",
|
||||
"lastModified": 1777564084,
|
||||
"narHash": "sha256-O9VRkxg+2j+sh+c73wi4VeIBECoqW2PlnCR9Qe1nQKA=",
|
||||
"owner": "0xc000022070",
|
||||
"repo": "zen-browser-flake",
|
||||
"rev": "b3c972b3d8537a9cf7a0db96b164c9c3e580884a",
|
||||
"rev": "d93443c0f6fdb3b179bed68856f322dba4842612",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -107,99 +107,99 @@
|
||||
|
||||
};
|
||||
|
||||
# update = {
|
||||
# body =
|
||||
# if userConfig.isNixOS then
|
||||
# # fish
|
||||
# ''
|
||||
# echo "=== System packages update ==="
|
||||
# pushd /etc/nixos
|
||||
update = {
|
||||
body =
|
||||
if userConfig.isNixOS then
|
||||
# fish
|
||||
''
|
||||
echo "=== System packages update ==="
|
||||
pushd /etc/nixos
|
||||
|
||||
# if git pull
|
||||
# git add -A
|
||||
# git commit --allow-empty -m "chore: state before system update"
|
||||
#
|
||||
# nix flake update
|
||||
#
|
||||
# if test $status -eq 0
|
||||
# git add ./flake.lock
|
||||
# git commit --allow-empty -m "chore: update system flake.lock"
|
||||
# reload_system
|
||||
# git push
|
||||
# else
|
||||
# echo "Error while updating system flake!"
|
||||
# end
|
||||
# else
|
||||
# echo "Error: 'git pull' failed in /etc/nixos. Skipping system update."
|
||||
# end
|
||||
if git pull
|
||||
git add -A
|
||||
git commit --allow-empty -m "chore: state before system update"
|
||||
|
||||
nix flake update
|
||||
|
||||
if test $status -eq 0
|
||||
git add ./flake.lock
|
||||
git commit --allow-empty -m "chore: update system flake.lock"
|
||||
reload_system
|
||||
git push
|
||||
else
|
||||
echo "Error while updating system flake!"
|
||||
end
|
||||
else
|
||||
echo "Error: 'git pull' failed in /etc/nixos. Skipping system update."
|
||||
end
|
||||
|
||||
# popd
|
||||
popd
|
||||
|
||||
# echo "=== User packages update ==="
|
||||
# pushd $HOME/.config/home-manager
|
||||
echo "=== User packages update ==="
|
||||
pushd $HOME/.config/home-manager
|
||||
|
||||
# if git pull
|
||||
# git add -A
|
||||
# git commit --allow-empty -m "chore: state before home-manager update"
|
||||
#
|
||||
# nix flake update
|
||||
#
|
||||
# if test $status -eq 0
|
||||
# git add ./flake.lock
|
||||
# git commit --allow-empty -m "chore: update home flake.lock"
|
||||
# git push
|
||||
# reload_dotfiles
|
||||
# else
|
||||
# echo "Error while updating home flake!"
|
||||
# end
|
||||
# else
|
||||
# echo "Error: 'git pull' failed in home-manager. Skipping user update."
|
||||
# end
|
||||
if git pull
|
||||
git add -A
|
||||
git commit --allow-empty -m "chore: state before home-manager update"
|
||||
|
||||
nix flake update
|
||||
|
||||
if test $status -eq 0
|
||||
git add ./flake.lock
|
||||
git commit --allow-empty -m "chore: update home flake.lock"
|
||||
git push
|
||||
reload_dotfiles
|
||||
else
|
||||
echo "Error while updating home flake!"
|
||||
end
|
||||
else
|
||||
echo "Error: 'git pull' failed in home-manager. Skipping user update."
|
||||
end
|
||||
|
||||
# popd
|
||||
popd
|
||||
|
||||
# if type -q flatpak
|
||||
# echo "=== Flatpak update ==="
|
||||
# flatpak update --noninteractive
|
||||
#
|
||||
# echo "=== Flatpak remove unused ==="
|
||||
# flatpak uninstall --unused --noninteractive
|
||||
# end
|
||||
# ''
|
||||
# else
|
||||
# # fish
|
||||
# ''
|
||||
# echo "===System update==="
|
||||
if type -q flatpak
|
||||
echo "=== Flatpak update ==="
|
||||
flatpak update --noninteractive
|
||||
|
||||
echo "=== Flatpak remove unused ==="
|
||||
flatpak uninstall --unused --noninteractive
|
||||
end
|
||||
''
|
||||
else
|
||||
# fish
|
||||
''
|
||||
echo "===System update==="
|
||||
|
||||
# if not type -q yay
|
||||
# echo "Yay not found… Please consider installing it!"
|
||||
# else
|
||||
# yay
|
||||
# end
|
||||
if not type -q yay
|
||||
echo "Yay not found… Please consider installing it!"
|
||||
else
|
||||
yay
|
||||
end
|
||||
|
||||
# if type -q pacman
|
||||
# echo "===Remove orphans==="
|
||||
# set orphans (pacman -Qtdq)
|
||||
# if test (count $orphans) -gt 0
|
||||
# sudo pacman -Rns $orphans
|
||||
# end
|
||||
# end
|
||||
if type -q pacman
|
||||
echo "===Remove orphans==="
|
||||
set orphans (pacman -Qtdq)
|
||||
if test (count $orphans) -gt 0
|
||||
sudo pacman -Rns $orphans
|
||||
end
|
||||
end
|
||||
|
||||
# if type -q flatpak
|
||||
# echo "===Flatpak update==="
|
||||
# flatpak update --noninteractive
|
||||
# echo "===Flatpak remove unused==="
|
||||
# flatpak uninstall --unused
|
||||
# end
|
||||
if type -q flatpak
|
||||
echo "===Flatpak update==="
|
||||
flatpak update --noninteractive
|
||||
echo "===Flatpak remove unused==="
|
||||
flatpak uninstall --unused
|
||||
end
|
||||
|
||||
# if type -q nix-channel
|
||||
# echo "===Nix update==="
|
||||
# nix-channel --update
|
||||
# echo "===Nix garbage collection==="
|
||||
# home-manager expire-generations "-7 days"
|
||||
# end
|
||||
# '';
|
||||
# };
|
||||
if type -q nix-channel
|
||||
echo "===Nix update==="
|
||||
nix-channel --update
|
||||
echo "===Nix garbage collection==="
|
||||
home-manager expire-generations "-7 days"
|
||||
end
|
||||
'';
|
||||
};
|
||||
|
||||
blog_build_and_push = {
|
||||
body =
|
||||
@@ -224,7 +224,7 @@
|
||||
ls = "eza --long --icons --group-directories-first --git";
|
||||
lst = "eza --long --icons --color --git --tree";
|
||||
rm = "trash";
|
||||
update = "topgrade";
|
||||
# update = "topgrade";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user