fabianhauser/dotfiles
1
0
Fork 0
Code Issues 4 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Migrate to 21.05 on federispitz

Browse source
This commit is contained in:
Fabian Hauser 2021-06-06 14:26:02 +02:00
parent 58987f6eee
commit f7f7148713
8 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
defaults/base/unfree.nix
View file

@ -9,6 +9,7 @@
"google-chrome"
"spotify"
"spotify-unwrapped"
"skypeforlinux"
"slack"
"teams"

10
defaults/desktop/desktop-environment.nix
View file

@ -10,25 +10,29 @@
numlockx # TODO: Does this work?
lxappearance
] ++ [ # Networking
gnome3.networkmanager-openconnect
gnome.networkmanager-openconnect
] ++ [ # Various
xfce.thunar
xfce.thunar-archive-plugin
xfce.xfce4-appfinder # xfce.thunar-volman # needed?
xfce.terminal
gnome3.gnome-screenshot
gnome.gnome-screenshot
pinentry-gtk2 # Required by gnupg
];
programs = {
gnome-terminal.enable = false;
evolution = {
enable = true;
plugins = [ pkgs.evolution-ews ];
};
geary.enable = false;
light.enable = true;
dconf.enable = true;
};
services.gnome3 = {
services.gnome = {
# TODO: Do this manually and not all at once.
core-utilities.enable = true;
core-os-services.enable = true;

2
defaults/desktop/hardware.nix
View file

@ -22,7 +22,7 @@
bluetooth = {
enable = true;
package = pkgs.bluezFull;
config.General.Enable = "Source,Sink,Media,Socket";
settings.General.Enable = "Source,Sink,Media,Socket";
};
};

2
defaults/games/default.nix
View file

@ -11,7 +11,7 @@
extremetuxracer
zeroad
] ++ (with pkgs.gnome3; [ # Selection of gnome3 games
] ++ (with pkgs.gnome; [ # Selection of gnome games
five-or-more
four-in-a-row
gnome-chess

2
defaults/user-configuration/fhauser/applications/redshift.nix
View file

@ -2,7 +2,7 @@
home-manager.users.fhauser.services.redshift = {
enable = true;
package = pkgs.redshift-wlr;
brightness.night = "0.9";
settings.redshift.brightness-night = "0.9";
temperature.day = 6300;
temperature.night = 5500;

11
defaults/user-configuration/fhauser/sway.nix
View file

@ -2,7 +2,7 @@
# environment.systemPackages = with pkgs; [ polkit_gnome ]; #TODO: Needed?
programs.sway.enable = true;
services.gnome3.gnome-remote-desktop.enable = true;
services.gnome.gnome-remote-desktop.enable = true;
environment.systemPackages = with pkgs; [ pipewire_0_2 ];
systemd.user.services.pipewire.environment.XDG_CURRENT_DESKTOP = "sway";
systemd.user.services.xdg-desktop-portal-wlr.environment.XDG_CURRENT_DESKTOP =
@ -14,12 +14,13 @@
Install.WantedBy = lib.mkForce [ "sway-session.target" ];
Unit.PartOf = lib.mkForce [ "sway-session.target" ];
};
# TODO: active screen with -m $active_screen
bemenuLauncher = pkgs.writeScriptBin "bemenuLauncher" ''
#!${pkgs.stdenv.shell}
active_screen=$(swaymsg -r -t get_outputs | \
${pkgs.jq}/bin/jq '. [] | select (.focused == true) | .name | split ("-") | last')
#active_screen=$(swaymsg -r -t get_outputs | \
# ${pkgs.jq}/bin/jq '. [] | select (.focused == true) | .name | split ("-") | last')
${pkgs.dmenu}/bin/dmenu_path | \
${pkgs.bemenu}/bin/bemenu -m $active_screen --list 20 --ignorecase --prompt 'Start: ' | \
${pkgs.bemenu}/bin/bemenu --list 20 --ignorecase --prompt 'Start: ' | \
xargs swaymsg exec --
'';
homeManagerConfig = config.home-manager.users.fhauser;
@ -28,7 +29,7 @@
sway-contrib.grimshot
wl-clipboard
libappindicator
gnome3.defaultIconTheme
gnome.defaultIconTheme
gnome2.gnome-icon-theme
hicolor-icon-theme # TODO: Move these requirements?
];

16
hardware/thinkpad-t470s.nix
View file

@ -8,16 +8,20 @@
];
boot.initrd.availableKernelModules =
[ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
boot.kernelModules = [ "kvm-intel" ];
# Ignore Alcor smartcard (gpg is not very smart)
[ "xhci_pci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
boot.kernelModules = [ "kvm-intel" "qmi_wwan" ]; # TODO: qmi_wwan required?
environment.systemPackages = with pkgs; [ modemmanager libmbim libqmi ]; # TODO: this should not be required
# Ignore Realtek smartcard (gpg is not very smart)
# See https://ludovicrousseau.blogspot.com/2015/12/remove-andor-customize-pcsc-reader-names.html
#systemd.services.pcscd.environment.PCSCLITE_FILTER_IGNORE_READER_NAMES =
# "Alcor";
systemd.services.pcscd.environment.PCSCLITE_FILTER_IGNORE_READER_NAMES =
"Realtek";
hardware.video.hidpi.enable = true;
# Power configuration
services.tlp.enable = true;
services.power-profiles-daemon.enable = false;
# CPU Configuration
hardware.cpu.intel.updateMicrocode = true;
services.throttled.enable = true;

2
host/federispitz/default.nix
View file

@ -37,6 +37,6 @@
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "20.09"; # Did you read the comment?
system.stateVersion = "21.05"; # Did you read the comment?
}