diff --git a/flake.nix b/flake.nix index ba93d25..5d3816f 100644 --- a/flake.nix +++ b/flake.nix @@ -126,6 +126,8 @@ (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix") ./systems/nixbook/configuration.nix nixos-hardware.nixosModules.common-cpu-amd + nixos-hardware.nixosModules.common-hidpi + nixos-hardware.nixosModules.common-pc-laptop ]; }; syl = lib.nixosSystem { @@ -140,6 +142,7 @@ home-manager.nixosModules.home-manager niri.nixosModules.niri nixos-hardware.nixosModules.framework-11th-gen-intel + nixos-hardware.nixosModules.common-hidpi { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; diff --git a/home/modules/niri.nix b/home/modules/niri.nix index f2d2dd2..1d01164 100644 --- a/home/modules/niri.nix +++ b/home/modules/niri.nix @@ -106,7 +106,7 @@ in "Super+I".action.spawn = ["alacritty" "--class" "btm" "-e" "btop"]; "Super+Alt+B".action.spawn = ["alacritty" "--class" "bluetui" "-e" "bluetui"]; "Super+Alt+W".action.spawn = ["alacritty" "--class" "impala" "-e" "impala"]; - "Super+A".action.spawn = ["alacritty" "--class" "pulsemixer" "-e" "${pkgs.wiremix}/bin/wiremix"]; + "Super+A".action.spawn = ["alacritty" "--class" "pulsemixer" "-e" "${pkgs.wiremix}/bin/wiremix" "-v" "output"]; "Super+Shift+F".action.spawn = ["cosmic-files"]; "Super+Shift+Q".action = quit; "Super+O".action = toggle-overview; diff --git a/systems/nixbook/configuration.nix b/systems/nixbook/configuration.nix index c34efaf..11fe8a3 100644 --- a/systems/nixbook/configuration.nix +++ b/systems/nixbook/configuration.nix @@ -27,11 +27,19 @@ boot.supportedFilesystems = [ "ntfs" ]; services = { - desktopManager.cosmic.enable = true; + desktopManager.plasma6.enable = true; }; - services.displayManager.cosmic-greeter = { + services.displayManager.sddm = { enable = true; + enableHidpi = true; + wayland.enable = true; + settings = { + Autologin = { + Session = "plasma.desktop"; + User = "abbie"; + }; + }; }; programs.nix-ld.enable = true; @@ -116,6 +124,7 @@ # Configure keymap in X11 services.xserver.xkb.layout = "us"; + services.xserver.videoDrivers = lib.mkDefault [ "modesetting" ]; # Enable CUPS to print documents. services.printing.enable = true; @@ -159,10 +168,14 @@ hardware.graphics = { enable = true; + enable32Bit = true; extraPackages = with pkgs; [ libvdpau-va-gl + vaapiVdpau + libva1 ]; }; + hardware.amdgpu.initrd.enable = lib.mkDefault true; # systemd.services.display-manager = { # wants = [ @@ -184,6 +197,7 @@ # Define a user account. Don't forget to set a password with ‘passwd’. users.users.abbie = { isNormalUser = true; + initialPassword = "abbie"; extraGroups = [ "adbusers" "wheel" "networkmanager" "input" "uinput" "dialout" ]; }; @@ -192,10 +206,10 @@ # Some programs need SUID wrappers, can be configured further or are # started in user sessions. # programs.mtr.enable = true; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # }; + programs.gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; # Enable the OpenSSH daemon. services.openssh.enable = true; diff --git a/systems/nixbook/pkgs.nix b/systems/nixbook/pkgs.nix index c66645f..3344d26 100644 --- a/systems/nixbook/pkgs.nix +++ b/systems/nixbook/pkgs.nix @@ -48,8 +48,9 @@ # scribus brightnessctl mpc-cli - # ungoogled-chromium + ungoogled-chromium brave + # google-chrome kdePackages.kwallet-pam aria2 kdePackages.kwallet @@ -61,8 +62,14 @@ papirus-icon-theme phinger-cursors gzip - # virt-viewer + virt-viewer # inkscape + kdePackages.ark + kdePackages.ffmpegthumbs + kdePackages.okular + kdePackages.discover + kdePackages.kdegraphics-thumbnailers + kdePackages.kdesdk-thumbnailers libreoffice-qt6-fresh vlc any-nix-shell @@ -76,10 +83,11 @@ # texlive.combined.scheme-full pamixer playerctl - # gimp + gimp power-profiles-daemon python3 wireguard-tools + cosmic-player # cosmic-settings ]; }