about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--nix/awesome.nix3
-rw-r--r--nix/configuration.nix11
-rw-r--r--nix/devel.nix6
-rw-r--r--nix/games.nix7
-rw-r--r--nix/overgrowth.nix57
5 files changed, 13 insertions, 71 deletions
diff --git a/nix/awesome.nix b/nix/awesome.nix
index 19b8903..1865b80 100644
--- a/nix/awesome.nix
+++ b/nix/awesome.nix
@@ -1,5 +1,4 @@
 { pkgs, ... }:
-
 {
   fonts.fonts = with pkgs; [
     gentium lmodern
@@ -40,7 +39,7 @@
     easyeffects gnome.adwaita-icon-theme networkmanagerapplet qt5ct
     clipbuzz keynav playerctl pulsemixer xclip xdotool xorg.xkill
     aerc amfora calcurse dante khard ncdu ranger ueberzug vim_configurable
-    arandr audacious liferea scrot rxvt-unicode zathura
+    arandr audacious gnucash liferea scrot rxvt-unicode zathura
     firefox libreoffice mepo-x11 nheko obs-studio tor-browser-bundle-bin
     nextcloud-client transmission-gtk
   ];
diff --git a/nix/configuration.nix b/nix/configuration.nix
index 5b1f698..139063d 100644
--- a/nix/configuration.nix
+++ b/nix/configuration.nix
@@ -29,7 +29,7 @@
   networking = {
     hostName = "nix";
     hosts = {
-      "0.0.0.0" = [ "9gag.com" "voz.vn" ];
+      "0.0.0.0" = [ ];
     };
     nameservers = [ "9.9.9.11" "149.112.112.11" ];
     networkmanager.enable = true;
@@ -44,6 +44,7 @@
     # proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
     # Open ports in the firewall.
+    firewall.allowedTCPPorts = [ 59879 ];
     firewall.allowedUDPPorts = [ 4001 ];
   };
 
@@ -58,13 +59,13 @@
 
   users.users.sea = {
     isNormalUser = true;
-    extraGroups = [ "dialout" "networkmanager" "video" "wheel" ];
+    extraGroups = [ "dialout" "ipfs" "networkmanager" "video" "wheel" ];
   };
 
   environment.systemPackages = with pkgs; [
-    compsize cryptsetup htop inotify-tools killall rsync unzip zip
+    compsize cryptsetup htop-vim inotify-tools killall rsync unzip zip
     oathToolkit isync stow tor w3m wget yt-dlp
-    mpv pavucontrol sent vimiv-qt yacreader
+    imv mpv pavucontrol sent yacreader
     ffmpeg gimp imagemagick inkscape mkvtoolnix pdftk simplescreenrecorder sox
   ];
 
@@ -74,6 +75,8 @@
   security.rtkit.enable = true;
   # List services that you want to enable:
   services = {
+    mullvad-vpn.enable = true;
+
     pipewire = {
       enable = true;
       alsa.enable = true;
diff --git a/nix/devel.nix b/nix/devel.nix
index 1be5435..76e60c5 100644
--- a/nix/devel.nix
+++ b/nix/devel.nix
@@ -1,9 +1,9 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
 {
   environment.systemPackages = with pkgs; [
     exa fd gitAndTools.gitFull glow jq minicom man-pages ripgrep rlwrap
-    gcc lua python3 qbe rakudo zig
+    clojure gcc go lua python3 qbe rakudo zig
     bintools gdb gnumake luaPackages.luacheck mypy pkg-config
     plantuml texlive.combined.scheme-full
   ] ++ (with python3Packages; [ flit pip tox ]);
@@ -29,4 +29,6 @@
       localDiscovery = true;
     };
   };
+
+  systemd.services.ipfs.preStart = lib.mkForce "";
 }
diff --git a/nix/games.nix b/nix/games.nix
index 2921486..74adf49 100644
--- a/nix/games.nix
+++ b/nix/games.nix
@@ -1,10 +1,5 @@
 { config, pkgs, ... }:
-
-let
-  overgrowth = pkgs.callPackage ./overgrowth.nix {
-    aux-data = "/home/sea/Games/Overgrowth";
-  };
-in {
+{
   environment.systemPackages = with pkgs; [
     scorched3d zeroad # hedgewars _20kly strategy
     astromenace chromium-bsu # scrolling
diff --git a/nix/overgrowth.nix b/nix/overgrowth.nix
deleted file mode 100644
index 5b59134..0000000
--- a/nix/overgrowth.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, makeDesktopItem
-, libGL, libGLU, SDL2, SDL2_net, gtk2, glib
-, openal, libogg, libvorbis, libtheora
-, libjpeg, freeimage, freetype, bzip2
-, aux-data ? "" }:
-
-let
-  desktopItem = makeDesktopItem {
-    name = "overgrowth";
-    desktopName = "Overgrowth";
-    icon = "overgrowth";
-    exec = "overgrowth";
-    path = aux-data;
-    categories = [ "Game" ];
-  };
-in stdenv.mkDerivation rec {
-  pname = "overgrowth";
-  version = "unstable-2022-04-29";
-
-  src = fetchFromGitHub {
-    owner = "WolfireGames";
-    repo = pname;
-    rev = "dbe069e42e1cea27654a8fb618fdde77f41ac257";
-    sha256 = "sha256-81VKN0mU8XFdOZb6jrii2FeyVXCUiytcF2pgdO0je0s=";
-  };
-
-  nativeBuildInputs = [ cmake pkg-config ];
-  buildInputs = [
-    libGL libGLU SDL2 SDL2_net gtk2 glib
-    openal libogg libvorbis libtheora
-    libjpeg freeimage freetype bzip2
-  ];
-
-  cmakeFlags = [
-    "-S../Projects"
-    "-DAUX_DATA=${aux-data}"
-    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
-    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
-  ];
-  hardeningDisable = [ "format" ];
-
-  installPhase = ''
-    install -D build/Overgrowth.bin.* $out/bin/overgrowth
-    install -D Projects/OGIcon.png\
-      $out/share/icons/hicolor/1024x1024/apps/overgrowth.png
-    install -D ${desktopItem}/share/applications/overgrowth.desktop \
-      $out/share/applications/overgrowth.desktop
-  '';
-
-  meta = {
-    description = "Third person ninja rabbit fighting game";
-    homepage = "https://overgrowth.wolfire.com";
-    license = lib.licenses.asl20;
-    maintainers = [ lib.maintainers.McSinyx ];
-    platforms = lib.platforms.linux;
-  };
-}