diff --git a/flake.lock b/flake.lock index 7d90a81..9fa5c70 100644 --- a/flake.lock +++ b/flake.lock @@ -7,26 +7,27 @@ ] }, "locked": { - "lastModified": 1706435589, - "narHash": "sha256-yhEYJxMv5BkfmUuNe4QELKo+V5eq1pwhtVs6kEziHfE=", + "lastModified": 1712386041, + "narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "4d54c29bce71f8c261513e0662cc573d30f3e33e", + "rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-23.11", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1706098335, - "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", + "lastModified": 1713145326, + "narHash": "sha256-m7+IWM6mkWOg22EC5kRUFCycXsXLSU7hWmHdmBfmC3s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", + "rev": "53a2c32bc66f5ae41a28d7a9a49d321172af621e", "type": "github" }, "original": { @@ -38,11 +39,11 @@ }, "nur": { "locked": { - "lastModified": 1706446335, - "narHash": "sha256-7p89OzFSIIb793wbfDABxINOH7HAGWF6wfhB77pOAGU=", + "lastModified": 1713299127, + "narHash": "sha256-s2PjEBtFptzZHkFkNP9yDNP6j9gR4feuUJk9MmSNnvQ=", "owner": "nix-community", "repo": "nur", - "rev": "0a68de7bb6a21eb68d6c58d715532825645e396b", + "rev": "7a55c815d8ed61651e416b56e7f9cfc9a539c272", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8f19386..3044ca3 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; - home-manager.url = "github:nix-community/home-manager"; + home-manager.url = "github:nix-community/home-manager/release-23.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nur.url = "github:nix-community/nur"; }; diff --git a/home/alias.nix b/home/alias.nix index f2169d5..4b1a6ba 100644 --- a/home/alias.nix +++ b/home/alias.nix @@ -9,7 +9,7 @@ ktiubox = "rsync -vaL --delete ~/box/ root@ktiu.net:/var/www/html/box/"; ymd = "date +'%Y-%m-%d'"; pulluni = "ssh tstraube@login.server.uni-frankfurt.de \"cd uni-tstraube && git pull\""; - pullstat = "ssh tstraube@login.server.uni-frankfurt.de \"cd statistik && git pull\""; + pullstat = "ssh tstraube@login.server.uni-frankfurt.de \"cd stat24 && git pull\""; pullds = "ssh tstraube@login.server.uni-frankfurt.de \"cd ds23 && git pull\""; pullmla = "ssh tstraube@login.server.uni-frankfurt.de \"cd malta23 && git pull\""; pulldkg = "ssh till@geocom.uni-frankfurt.de \"cd /var/www/dkg_lp && git pull\""; @@ -20,7 +20,7 @@ showbox = "chromium-browser -app=https://user.uni-frankfurt.de/~tstraube/box"; showc = "chromium-browser -app=https://user.uni-frankfurt.de/~tstraube/c/"; castget = "castget -prvC ~/.config/castget/castget.conf"; - castsync = "mv -v ~/.local/share/podcasts/* /run/media/till/CLIP\\ JAM/Podcasts/"; + castsync = "rsync -va --remove-source-files ~/.local/share/podcasts/ /run/media/till/CLIP\\ JAM/Podcasts/"; cb = "cd $(sed 's|^file://||' /home/till/.config/gtk-3.0/bookmarks | fzf --height 10% --reverse)"; univpn = "secret-tool lookup server uni-frankfurt.de account tstraube | sudo openconnect --config=/home/till/.config/openconnect/config --passwd-on-stdin"; v = "nvim"; diff --git a/home/default.nix b/home/default.nix index 5fc8c63..f2926c2 100644 --- a/home/default.nix +++ b/home/default.nix @@ -18,6 +18,7 @@ libreoffice poppler_utils zotero + pdftk # graphics drawing @@ -52,4 +53,3 @@ programs.obs-studio.enable = true; } - diff --git a/home/r.nix b/home/r.nix index 9365030..9b15dad 100644 --- a/home/r.nix +++ b/home/r.nix @@ -30,7 +30,7 @@ src = builtins.fetchGit { url = "ssh://git@ktiu.net/home/git/goethR/"; ref = "main"; - rev = "6940f37ec2a6d3b915f4c87635dcdaae07d7b4d8"; + rev = "a3a0363d1fbdf6be19e3597d9484615cd2c47cc0"; }; propagatedBuildInputs = []; nativeBuildInputs = [];