Overhaul configurations

3 files changed, 43 insertions, 20 deletions

diff --git a/nix/etc/nixos/awesome.nix b/nix/etc/nixos/awesome.nix
index 25e639e..dfd526d 100644
--- a/nix/etc/nixos/awesome.nix
+++ b/nix/etc/nixos/awesome.nix
@@ -28,10 +28,11 @@
 
   environment.systemPackages = with pkgs; [
     gnome.adwaita-icon-theme qt5ct
-    gnome.networkmanagerapplet mate.mate-power-manager playerctl pulsemixer
+    gnome.networkmanagerapplet keynav mate.mate-power-manager
+    clipnotify playerctl pulsemixer xclip xdotool
     rxvt_unicode-with-plugins urxvt_autocomplete_all_the_things urxvt_font_size
-    aerc amfora autocutsel firefox keynav newsboat ranger
-    arandr audacious gimp scrot vim_configurable
+    aerc amfora newsboat ranger ueberzug vim_configurable
+    arandr audacious firefox gimp nheko scrot xorg.xkill zathura
   ];
 
   programs.nm-applet.enable = true;
diff --git a/nix/etc/nixos/configuration.nix b/nix/etc/nixos/configuration.nix
index 7e6e108..2829879 100644
--- a/nix/etc/nixos/configuration.nix
+++ b/nix/etc/nixos/configuration.nix
@@ -13,13 +13,19 @@
 
   # Use the systemd-boot EFI boot loader.
   boot.loader = {
-    systemd-boot.enable = true;
     efi.canTouchEfiVariables = true;
-    grub.useOSProber = true;
+    grub = {
+      enable = true;
+      device = "nodev";
+      efiSupport = true;
+      useOSProber = true;
+      splashImage = null;
+    };
   };
 
   networking = {
     hostName = "nix";
+    nameservers = [ "9.9.9.11" "149.112.112.11" ];
     networkmanager.enable = true;
 
     # The global useDHCP flag is deprecated, therefore explicitly set
@@ -56,23 +62,30 @@
 
   environment.systemPackages = with pkgs; [
     htop isync killall oathToolkit rsync stow w3m wget
-    ffmpeg mpv pavucontrol pqiv
+    ffmpeg mpv pavucontrol vimiv-qt youtube-dl
   ];
 
+  security.rtkit.enable = true;
   # List services that you want to enable:
-  services.printing.enable = true;
+  services = {
+    pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+      jack.enable = true;
 
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    jack.enable = true;
-
-    # Use the example session manager (no others are packaged yet so this is
-    # enabled by default, no need to redefine it in your config for now)
-    # media-session.enable = true;
+      # Use the example session manager (no others are packaged yet so this is
+      # enabled by default, no need to redefine it in your config for now)
+      # media-session.enable = true;
+    };
+
+    printing.enable = true;
+
+    dictd = {
+      enable = true;
+      DBs = with pkgs.dictdDBs; [ wiktionary wordnet ];
+    };
   };
 
   # This value determines the NixOS release from which the default
diff --git a/nix/etc/nixos/devel.nix b/nix/etc/nixos/devel.nix
index 86c842c..e554da9 100644
--- a/nix/etc/nixos/devel.nix
+++ b/nix/etc/nixos/devel.nix
@@ -2,8 +2,8 @@
 
 {
   environment.systemPackages = with pkgs; [
-    exa fd git ripgrep
-    clojure guile leiningen python3 rakudo zig
+    exa fd git glow ripgrep rlwrap
+    clojure guile julia-stable leiningen lua python3 rakudo zig
     texlive.combined.scheme-tetex
   ];
 
@@ -19,5 +19,14 @@
       enable = true;
       dataDir = "/data/IPFS";
     };
+
+    postgresql = {
+      enable = true;
+      enableTCPIP = true;
+      authentication = pkgs.lib.mkOverride 10 ''
+        local all all trust
+        host all all ::1/128 trust
+      '';
+    };
   };
 }