diff options
| -rw-r--r-- | nixhome/.config/nixpkgs/home.nix | 21 | ||||
| -rw-r--r-- | nixhome/.config/nixpkgs/overlays/pythonEnv.nix | 3 | ||||
| -rwxr-xr-x | nixhome/Scripts/nix_garbage | 6 | ||||
| -rwxr-xr-x | scripts/Scripts/setwall | 3 | ||||
| -rw-r--r-- | termite/.config/termite/config | 1 |
5 files changed, 17 insertions, 17 deletions
diff --git a/nixhome/.config/nixpkgs/home.nix b/nixhome/.config/nixpkgs/home.nix index 9142298..cf3af3c 100644 --- a/nixhome/.config/nixpkgs/home.nix +++ b/nixhome/.config/nixpkgs/home.nix @@ -17,26 +17,25 @@ in { # Developing gcc go clang-tools - gdb php unstable.ghc stack racket chez rustc cargo rls kak-lsp - editorconfig-core-c chez + gdb php unstable.ghc rustc cargo rls kak-lsp + editorconfig-core-c # Gui applications - pkgs.firefox pavucontrol evince leafpad inkscape gimp meld pinentry - termite wireshark spotify vlc mpv xorg.xev vimHugeX + pkgs.firefox pavucontrol evince leafpad inkscape gimp + meld pinentry + termite wireshark spotify + vlc mpv xorg.xev vimHugeX (mumble.override { pulseSupport = true; }) - qutebrowser mate.caja audacity xournal ipcalc playerctl sxiv + mate.caja + audacity + ipcalc playerctl sxiv xarchive pandoc okular - # Other stuff - texlive.combined.scheme-full - youtube-dl aspell aspellDicts.da aspellDicts.en aspellDicts.nl ffmpegthumbnailer tio imagemagick sox poppler_utils ffmpeg fortune - osu-nixos.packages.${pkgs.system}.osu-lazer - # The python env created in overlay pkgs.defaultPythonEnv ]) ++ (with pkgs; [ @@ -48,5 +47,7 @@ in { # evolution evolution-data-server evolution-ews libreoffice-fresh + texlive.combined.scheme-full + ]); } diff --git a/nixhome/.config/nixpkgs/overlays/pythonEnv.nix b/nixhome/.config/nixpkgs/overlays/pythonEnv.nix index 0153538..e944313 100644 --- a/nixhome/.config/nixpkgs/overlays/pythonEnv.nix +++ b/nixhome/.config/nixpkgs/overlays/pythonEnv.nix @@ -5,14 +5,11 @@ self: super: { (self.python39.withPackages ( ps: with ps; [ ipython pep8 - jupyterlab jupyter-c-kernel - python-lsp-server # Math stuff numpy scipy matplotlib - pillow networkx pydot ] )) ]; diff --git a/nixhome/Scripts/nix_garbage b/nixhome/Scripts/nix_garbage index b7e8f22..db492ab 100755 --- a/nixhome/Scripts/nix_garbage +++ b/nixhome/Scripts/nix_garbage @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -x -nix-env --delete-generations +1 -home-manager expire-generations "-0 days" -sudo nix-collect-garbage -d +nix-env --delete-generations old +home-manager expire-generations "0 days" +sudo nix-collect-garbage --delete-older-than 10 sudo nixos-rebuild boot diff --git a/scripts/Scripts/setwall b/scripts/Scripts/setwall index 25bcfb0..d34ed8d 100755 --- a/scripts/Scripts/setwall +++ b/scripts/Scripts/setwall @@ -7,7 +7,8 @@ BINNAME="setwall" function unsetwalls() { for wall in $@; do echo unsetting $wall - sed -i.bak ":$wall:d" $WALLFILE + pat=$(echo $wall | sed 's/\//\\\//g') + sed -i.bak "/$pat/d" $WALLFILE done } function unsetcur() { diff --git a/termite/.config/termite/config b/termite/.config/termite/config index 14699fc..7cc3118 100644 --- a/termite/.config/termite/config +++ b/termite/.config/termite/config @@ -7,6 +7,7 @@ #clickable_url = true #dynamic_title = true font = Comic Mono 14 +font = Ubuntu Mono 15 # font = cozette 11 #fullscreen = true #icon_name = terminal |