trying new wayland flake

This commit is contained in:
Matt Nish-Lapidus 2024-10-02 12:11:23 -04:00
parent f5a5d699fa
commit 1125198d5a
3 changed files with 23 additions and 44 deletions

View file

@ -22,12 +22,18 @@
url = "github:musnix/musnix"; url = "github:musnix/musnix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixpkgs-wayland = {
url = "github:nix-community/nixpkgs-wayland";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = inputs @ {self, nixpkgs, nixpkgs-stable, home-manager, nix-flatpak, kmonad, musnix, ... }: { outputs = inputs @ {self, nixpkgs, nixpkgs-stable, home-manager, nix-flatpak, kmonad, musnix, ... }: {
nixosConfigurations = { nixosConfigurations = {
eddie = nixpkgs.lib.nixosSystem { eddie = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
nixpkgs.overlays = [ inputs.nixpkgs-wayland.overlay ];
modules = [ modules = [
nix-flatpak.nixosModules.nix-flatpak nix-flatpak.nixosModules.nix-flatpak
kmonad.nixosModules.default kmonad.nixosModules.default

View file

@ -5,15 +5,9 @@
home = { home = {
packages = with pkgs; [ packages = with pkgs; [
#eza
just just
#fd
#fzf
#bat
jq jq
yt-dlp yt-dlp
#htop
# ripgrep
erdtree erdtree
age age
figlet figlet
@ -25,8 +19,8 @@
unzip unzip
zip zip
htop htop
owl #owl
#pass #opendrop
dconf dconf
gnupg gnupg
gcc gcc
@ -65,11 +59,8 @@
sbcl sbcl
nodejs_18 nodejs_18
platformio-core platformio-core
#borgmatic
kanata-with-cmd kanata-with-cmd
#wezterm
lazygit lazygit
#nnn
icloudpd icloudpd
jetbrains-mono jetbrains-mono
libheif libheif
@ -118,9 +109,9 @@
spice-protocol spice-protocol
virt-viewer virt-viewer
impression
zoom-us zoom-us
nyxt nyxt
librewolf
ungoogled-chromium ungoogled-chromium
obsidian obsidian
vlc vlc
@ -182,12 +173,6 @@
stateVersion = "24.05"; stateVersion = "24.05";
}; };
home.pointerCursor = {
gtk.enable = true;
package = pkgs.vanilla-dmz;
name = "Vanilla-DMZ";
};
programs = { programs = {
home-manager.enable = true; home-manager.enable = true;
direnv = { direnv = {
@ -276,31 +261,6 @@
}; };
}; };
# wayland.windowManager.sway = {
# enable = true;
# config = rec {
# modifier = "Mod4";
# # Use kitty as default terminal
# terminal = "wezterm";
# startup = [
# # Launch Firefox on start
# {command = "firefox";}
# ];
# };
# };
# # kanshi systemd service
# systemd.user.services.kanshi = {
# environment = {
# WAYLAND_DISPLAY="wayland-1";
# DISPLAY = ":0";
# };
# serviceConfig = {
# Type = "simple";
# ExecStart = ''${pkgs.kanshi}/bin/kanshi -c kanshi_config_file'';
# };
# };
nixpkgs.config.packageOverrides = pkgs: { nixpkgs.config.packageOverrides = pkgs: {
renoise = pkgs.renoise.override { renoise = pkgs.renoise.override {
releasePath = /home/emenel/temp/rns_344_linux_x86_64.tar.gz; releasePath = /home/emenel/temp/rns_344_linux_x86_64.tar.gz;

View file

@ -269,7 +269,20 @@
}; };
powerManagement.enable = true; powerManagement.enable = true;
services.power-profiles-daemon.enable = true; services.power-profiles-daemon.enable = false;
services.auto-cpufreq = {
enable = true;
settings = {
battery = {
governor = "powersave";
turbo = "never";
};
charger = {
governor = "performance";
turbo = "auto";
};
};
};
# powerManagement.powertop.enable = true; # powerManagement.powertop.enable = true;
# services.thermald.enable = true; # services.thermald.enable = true;