From 4f448dd0ff3724c344b95a7f59a97153167d9835 Mon Sep 17 00:00:00 2001 From: DerGrumpf Date: Sat, 6 Sep 2025 01:07:46 +0200 Subject: [PATCH] Added Brightnessctl --- darwin/macbook.nix | 14 ++++ flake.nix | 5 +- home/hyprland/hyprland.nix | 4 +- hosts/hp15-n028sg/default.nix | 6 +- hosts/m920q/configuration.nix | 127 ---------------------------------- users/phil/nixos.nix | 1 + 6 files changed, 22 insertions(+), 135 deletions(-) create mode 100644 darwin/macbook.nix delete mode 100644 hosts/m920q/configuration.nix diff --git a/darwin/macbook.nix b/darwin/macbook.nix new file mode 100644 index 0000000..d837d04 --- /dev/null +++ b/darwin/macbook.nix @@ -0,0 +1,14 @@ +{ pkgs, ... }: +{ + # macOS-specific settings + services.nix-daemon.enable = true; + programs.zsh.enable = true; + environment.systemPackages = with pkgs; [ + neovim + git + ]; + + # System settings + system.stateVersion = 4; + nixpkgs.hostPlatform = "aarch64-darwin"; +} diff --git a/flake.nix b/flake.nix index 3ad8138..b961139 100644 --- a/flake.nix +++ b/flake.nix @@ -93,7 +93,7 @@ }; }; - # System Builder + # System Builder for NixOS mkSystem = { hostname, @@ -165,9 +165,10 @@ hp15-n028sg = mkSystem { hostname = "hp15-n028sg"; username = "phil"; - monitorSetup = "dual"; + monitorSetup = "single"; }; }; + }; } diff --git a/home/hyprland/hyprland.nix b/home/hyprland/hyprland.nix index 6b1bfa2..32c2fc4 100644 --- a/home/hyprland/hyprland.nix +++ b/home/hyprland/hyprland.nix @@ -275,8 +275,8 @@ in # Multi Media Control ", XF86AudioRaiseVolume, exec, pamixer -i 5" ", XF86AudioLowerVolume, exec, pamixer -d 5" - ", XF86MonBrightnessUp, exec, bri --up" - ", XF86MonBrightnessDown, exec, bri --down" + ", XF86MonBrightnessUp, exec, brightnessctl set +5%" + ", XF86MonBrightnessDown, exec, brightnessctl set -5%" ]; bindm = [ diff --git a/hosts/hp15-n028sg/default.nix b/hosts/hp15-n028sg/default.nix index b1cd274..4f69ca1 100644 --- a/hosts/hp15-n028sg/default.nix +++ b/hosts/hp15-n028sg/default.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, lib, ... }: +{ config, pkgs, ... }: { imports = [ @@ -19,12 +19,11 @@ ../../modules/regreet/regreet.nix ../../modules/plymouth.nix ../../modules/file_managers/spacefm.nix - ../../modules/python.nix # Include the results of the hardware scan. ./hardware-configuration.nix ]; - programs.geary.enable = true; + environment.systemPackages = with pkgs; [ brightnessctl ]; boot.loader = { systemd-boot.enable = true; @@ -39,7 +38,6 @@ enable = true; networks = { LANFRED.pskRaw = "36e2b41b51328800a9582be1a05f13f796f943569610ccdb61304803b86ce3da"; - #free.wifi = {}; }; }; diff --git a/hosts/m920q/configuration.nix b/hosts/m920q/configuration.nix deleted file mode 100644 index fb80303..0000000 --- a/hosts/m920q/configuration.nix +++ /dev/null @@ -1,127 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page, on -# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). - -{ - pkgs, - ... -}: - -{ - imports = [ - # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; - - # Use the systemd-boot EFI boot loader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - # networking.hostName = "nixos"; # Define your hostname. - # Pick only one of the below networking options. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. - - # Set your time zone. - time.timeZone = "Europe/Berlin"; - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Select internationalisation properties. - # i18n.defaultLocale = "en_US.UTF-8"; - # console = { - # font = "Lat2-Terminus16"; - # keyMap = "us"; - # useXkbConfig = true; # use xkb.options in tty. - # }; - - # Enable the X11 windowing system. - # services.xserver.enable = true; - - # Configure keymap in X11 - services.xserver.xkb.layout = "de"; - # services.xserver.xkb.options = "eurosign:e,caps:escape"; - - # Enable CUPS to print documents. - # services.printing.enable = true; - - # Enable sound. - # hardware.pulseaudio.enable = true; - # OR - # services.pipewire = { - # enable = true; - # pulse.enable = true; - # }; - - # Enable touchpad support (enabled default in most desktopManager). - # services.libinput.enable = true; - - # Define a user account. Don't forget to set a password with ‘passwd’. - users.users.phil = { - initialPassword = "!P2h3i4lon"; - isNormalUser = true; - extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. - packages = with pkgs; [ - tree - neovim - git - wget - curl - ]; - }; - - # programs.firefox.enable = true; - - # List packages installed in system profile. To search, run: - # $ nix search wget - # environment.systemPackages = with pkgs; [ - # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. - # wget - # ]; - - # 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; - # }; - - # List services that you want to enable: - - # Enable the OpenSSH daemon. - services.openssh.enable = true; - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - - # Copy the NixOS configuration file and link it from the resulting system - # (/run/current-system/configuration.nix). This is useful in case you - # accidentally delete configuration.nix. - system.copySystemConfiguration = true; - - # This option defines the first version of NixOS you have installed on this particular machine, - # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. - # - # Most users should NEVER change this value after the initial install, for any reason, - # even if you've upgraded your system to a new NixOS release. - # - # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, - # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how - # to actually do that. - # - # This value being lower than the current NixOS release does NOT mean your system is - # out of date, out of support, or vulnerable. - # - # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, - # and migrated your data accordingly. - # - # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . - system.stateVersion = "24.11"; # Did you read the comment? - -} diff --git a/users/phil/nixos.nix b/users/phil/nixos.nix index 1e5b2b7..e435f5d 100644 --- a/users/phil/nixos.nix +++ b/users/phil/nixos.nix @@ -13,6 +13,7 @@ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCaLHfxVylghDMYR8t4QMUpeRRqXasNABQKBEy9MmhbUXCcWiPbPMSZH8FMHON34rm2OrXP1kY/8jQxqBJDA+SqpFR2AZ4Khk9iVMaq5GHxxpn2amZUjoBa+fB29WaiE1npV5JVJV3O0ylw6GtiCnpneE6fGx2MO1vOY/7zKrUX/OK7WfwkDpeEzZgV/j/md917HrzUVeZwdeTq3WCRO8Gew6R8Xs6FRjSiGuH0dq14D4Ow5Zf1cI1jx+JfD/5vGasw8HXPu1NdxsOE+6D7/22IKqGr+S74/lAoyyD5qqk0s05lw8UY/PXBLJaNLZu9Fwx0BqTHpJEvftpmvd9wUxgR3msx9VXtKNSrqivIbDgeU+3oGzzkrGZODl7FCp4XKGmbrX85Z6lKwEGgv5jez4MLZcmT86bxB7m1wIbqSbVtfhS+GI7yPTA/kLzzFa14Im/+LTj95pb8qs2ALMwTMP1j2f9A6D3RriOFihL+68qn+YbK58KuV1R0f+CQRmlfVbk= phil@web.cyperpunk.de" ]; shell = pkgs.fish; + extraGroups = [ "video" ]; }; # Fix underlying System POSIX bugs