diff --git a/dotfiles/sway/config b/dotfiles/sway/config index 57a4292..5bbabee 100644 --- a/dotfiles/sway/config +++ b/dotfiles/sway/config @@ -33,7 +33,7 @@ floating_modifier $mod normal bindsym $mod+Shift+c reload bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit' bindsym $mod+Shift+p exec keepassxc -bindsym $mod+z exec swaylock -t +bindsym $mod+z exec swaylock -t -i /home/stefan/Downloads/bg.jpg bindsym $mod+Up exec light -A 5 bindsym $mod+Down exec light -U 5 bindsym Print exec grim -g "$(slurp)" - | wl-copy -t image/png @@ -146,3 +146,10 @@ include /etc/sway/config.d/* exec mako --border-color=#cc6666 \ --background-color=#2d2a2eee exec emacs --daemon + +set $gnome-schema org.gnome.desktop.interface +exec_always { + gsettings set $gnome-schema gtk-theme 'Arc-Dark' + gsettings set $gnome-schema icon-theme 'elementary Xfce' + gsettings set $gnome-schema cursor-theme 'Capitaine Cursors - White' +} diff --git a/hardware/x360-raven.nix b/hardware/x360-raven.nix index f13994a..19cca78 100644 --- a/hardware/x360-raven.nix +++ b/hardware/x360-raven.nix @@ -3,7 +3,9 @@ # to /etc/nixos/configuration.nix instead. { config, lib, pkgs, ... }: -{ +let + unstable = import { config.allowUnfree = true; }; +in { imports = [ @@ -29,7 +31,9 @@ boot.extraModulePackages = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.kernelParams = [ "amdgpu.dpm=1" ]; - boot.kernelPackages = pkgs.linuxPackages_latest; + #boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelPackages = unstable.linuxPackages_latest; + #boot.kernelPackages = unstable.linux_testing; boot.loader.systemd-boot.enable = true; diff --git a/roles/base.nix b/roles/base.nix index 6499705..2c36d0d 100644 --- a/roles/base.nix +++ b/roles/base.nix @@ -81,7 +81,7 @@ precmd_user_func = "title" }; users.users.stefan = { - extraGroups = [ "wheel" ]; + extraGroups = [ "wheel" "dialout" ]; home = "/home/stefan"; isNormalUser = true; uid = 1000; diff --git a/roles/desktop.nix b/roles/desktop.nix index fffafcc..1c77b8a 100644 --- a/roles/desktop.nix +++ b/roles/desktop.nix @@ -43,6 +43,7 @@ in { noto-fonts-emoji ]; + nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs; [ # firefox also needs: # @@ -51,7 +52,7 @@ in { # # check in `about:support` that # * Composing -> Webrenderer - unstable.firefox-bin + firefox-bin libva libva-utils mesa @@ -60,9 +61,13 @@ in { mypaint mypaint-brushes + gsettings-desktop-schemas + glib # provides gsettings + arc-theme capitaine-cursors elementary-xfce-icon-theme hicolor-icon-theme + numix-icon-theme alacritty imv @@ -71,14 +76,14 @@ in { libsecret lxappearance mumble - mumble neofetch pavucontrol + pcmanfm pulseaudio pulsemixer unstable.keepassxc wl-clipboard - xfce.thunar + xdg_utils ( pkgs.writeTextFile { name = "startsway"; @@ -88,12 +93,12 @@ in { #! ${pkgs.bash}/bin/bash export _JAVA_AWT_WM_NOREPARENTING=1 - export MOZ_ENABLE_WAYLAND=1 - export QT_AUTO_SCREEN_SCALE_FACTOR=0 + export MOZ_ENABLE_WAYLAND=1 export QT_AUTO_SCREEN_SCALE_FACTOR=0 export QT_WAYLAND_FORCE_DPI=96 export QT_QPA_PLATFORM=wayland-egl export SDL_VIDEODRIVER=wayland - exec ${pkgs.dbus}/bin/dbus-run-session ${pkgs.sway}/bin/sway + + ${pkgs.dbus}/bin/dbus-run-session ${pkgs.sway}/bin/sway ''; } ) @@ -112,6 +117,8 @@ in { dataDir = "/home/stefan"; }; + services.avahi.enable = true; + services.printing.enable = true; services.printing.drivers = [ pkgs.gutenprint diff --git a/roles/dev.nix b/roles/dev.nix index ebec090..915bb95 100644 --- a/roles/dev.nix +++ b/roles/dev.nix @@ -7,6 +7,13 @@ let unstable = import {}; in { environment.systemPackages = with pkgs; [ + arduino + avrdude + pkgsCross.avr.avrlibc + pkgsCross.avr.libcCross + pkgsCross.avr.buildPackages.gcc8 + pkgsCross.avr.buildPackages.binutils + go python37 python37Packages.pyls-black