nix: add unstable channel, adapt packages to i3 changes

This commit is contained in:
Julian Mutter 2023-03-13 14:36:07 +01:00
parent 80eeb563e7
commit 6d9b3beddb

View File

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