From 1125198d5a5a1fefd8e337e92779b917c26826d4 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Wed, 2 Oct 2024 12:11:23 -0400 Subject: [PATCH] trying new wayland flake --- flake.nix | 6 +++++ home/home.nix | 46 +++------------------------------- system/eddie/configuration.nix | 15 ++++++++++- 3 files changed, 23 insertions(+), 44 deletions(-) diff --git a/flake.nix b/flake.nix index a03da83..d736577 100644 --- a/flake.nix +++ b/flake.nix @@ -22,12 +22,18 @@ url = "github:musnix/musnix"; 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, ... }: { nixosConfigurations = { eddie = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; + nixpkgs.overlays = [ inputs.nixpkgs-wayland.overlay ]; modules = [ nix-flatpak.nixosModules.nix-flatpak kmonad.nixosModules.default diff --git a/home/home.nix b/home/home.nix index 9ed2093..0ec605e 100644 --- a/home/home.nix +++ b/home/home.nix @@ -5,15 +5,9 @@ home = { packages = with pkgs; [ - #eza just - #fd - #fzf - #bat jq yt-dlp - #htop - # ripgrep erdtree age figlet @@ -25,8 +19,8 @@ unzip zip htop - owl - #pass + #owl + #opendrop dconf gnupg gcc @@ -65,11 +59,8 @@ sbcl nodejs_18 platformio-core - #borgmatic kanata-with-cmd - #wezterm lazygit - #nnn icloudpd jetbrains-mono libheif @@ -118,9 +109,9 @@ spice-protocol virt-viewer + impression zoom-us nyxt - librewolf ungoogled-chromium obsidian vlc @@ -182,12 +173,6 @@ stateVersion = "24.05"; }; - home.pointerCursor = { - gtk.enable = true; - package = pkgs.vanilla-dmz; - name = "Vanilla-DMZ"; - }; - programs = { home-manager.enable = true; 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: { renoise = pkgs.renoise.override { releasePath = /home/emenel/temp/rns_344_linux_x86_64.tar.gz; diff --git a/system/eddie/configuration.nix b/system/eddie/configuration.nix index 581ee28..c049829 100644 --- a/system/eddie/configuration.nix +++ b/system/eddie/configuration.nix @@ -269,7 +269,20 @@ }; 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; # services.thermald.enable = true;