From 6d9b3beddbcd84155256189a591c982bdfa3c1e6 Mon Sep 17 00:00:00 2001
From: Julian Mutter <julian.mutter@comumail.de>
Date: Mon, 13 Mar 2023 14:36:07 +0100
Subject: [PATCH] nix: add unstable channel, adapt packages to i3 changes

---
 nix/configuration.nix | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/nix/configuration.nix b/nix/configuration.nix
index 95e1410..28bc89b 100644
--- a/nix/configuration.nix
+++ b/nix/configuration.nix
@@ -38,7 +38,7 @@
     LC_MEASUREMENT = "de_DE.UTF-8";
     LC_MONETARY = "de_DE.UTF-8";
     LC_NAME = "de_DE.UTF-8";
-    LC_NUMERIC = "de_DE.UTF-8";
+    LC_NUMERIC = "en_US.UTF-8";
     LC_PAPER = "de_DE.UTF-8";
     LC_TELEPHONE = "de_DE.UTF-8";
     LC_TIME = "de_DE.UTF-8";
@@ -77,10 +77,8 @@
   services.xserver.windowManager.i3.extraPackages = with pkgs; [
     rofi
     i3lock
-    # i3scrot
     i3status-rust
     nitrogen
-    dunst
   ];
 
   # Configure keymap in X11
@@ -126,7 +124,7 @@
     packages = with pkgs; [
       firefox
       thunderbird
-      nextcloud-client
+      unstable.nextcloud-client
       qalculate-gtk
       schildichat-desktop
       tdesktop
@@ -140,13 +138,9 @@
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
-  #  nixpkgs.config.packageOverrides = pkgs: {
-  #    emacs = pkgs.lib.overrideDerivation (pkgs.emacs.override {
-  #        # Use gtk2
-  #        withGTK2 = true;
-  #        withGTK3 = false;
-  #    });
-  #  };
+  nixpkgs.config.packageOverrides = pkgs: {
+    unstable = import <nixos-unstable> { config = config.nixpkgs.config; };
+  };
 
   environment.etc."manual-links/xfce4-notifyd".source =
     "${pkgs.xfce.xfce4-notifyd}/lib/xfce4/notifyd/xfce4-notifyd";
@@ -158,12 +152,14 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
+    tldr
     gcolor2 # gcolor3 does not work
     vim
     neovim
     wget
     gparted
     emacs
+    nodejs
     git
     dotter
     mc
@@ -195,21 +191,13 @@
     direnv
     nix-direnv
     handbrake
+    nmap
+    jq
   ];
 
   nixpkgs.overlays = [
     (self: super: {
       nix-direnv = super.nix-direnv.override { enableFlakes = true; };
-      # nextcloud-client = super.nextcloud-client.overrideAttrs (old: {
-      #   version = "3.7.4";
-      #   src = super.fetchFromGitHub {
-      #     owner = "nextcloud";
-      #     repo = "desktop";
-      #     rev = "v3.7.4";
-      #     sha256 = "sha256-K9P9avZdW+QR+K+GSp4kqWVZX5J7mHpu4gyuR4smmcU=";
-      #   };
-      #   patches = [ ];
-      # });
     })
   ];
 
@@ -224,6 +212,7 @@
     fira-code
     fira-code-symbols
     source-code-pro
+    xorg.xkill
   ];
 
   # Some programs need SUID wrappers, can be configured further or are
@@ -237,7 +226,7 @@
   # List services that you want to enable:
 
   # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
+  services.openssh.enable = false;
 
   # Open ports in the firewall.
   # networking.firewall.allowedTCPPorts = [ ... ];