diff --git a/dot_config/flake/home/darkman.nix b/dot_config/flake/home/darkman.nix new file mode 100644 index 0000000..cf1b780 --- /dev/null +++ b/dot_config/flake/home/darkman.nix @@ -0,0 +1,22 @@ +{pkgs, ...}: { + services.darkman = { + enable = true; + settings = { + usegeoclue = true; + }; + + lightModeScripts = { + gtk-theme = '' + ${pkgs.dconf}/bin/dconf write \ + /org/gnome/desktop/interface/color-scheme "'prefer-light'" + ''; + }; + + darkModeScripts = { + gtk-theme = '' + ${pkgs.dconf}/bin/dconf write \ + /org/gnome/desktop/interface/color-scheme "'prefer-dark'" + ''; + }; + }; +} diff --git a/dot_config/flake/home/wash/wash.nix b/dot_config/flake/home/wash/wash.nix deleted file mode 100644 index 7db14c4..0000000 --- a/dot_config/flake/home/wash/wash.nix +++ /dev/null @@ -1,24 +0,0 @@ -{pkgs, ...}: { - imports = [ - ../stylix.nix - ../common.nix - - ../waybar/mechabar - ../sway - - ../home-backup.nix - ../gui.nix - ]; - - home = { - username = "tyler"; - homeDirectory = "/home/tyler"; - - packages = with pkgs; [ - ventoy - # (config.lib.nixGL.wrap renderdoc) - ]; - - stateVersion = "23.11"; - }; -} diff --git a/dot_config/flake/home/waybar/mechabar/default.nix b/dot_config/flake/home/waybar/mechabar/default.nix index 77e2727..e3026a6 100644 --- a/dot_config/flake/home/waybar/mechabar/default.nix +++ b/dot_config/flake/home/waybar/mechabar/default.nix @@ -1,11 +1,14 @@ {pkgs, ...}: { + # Waybar dotfiles from https://github.com/sejjy/mechabar + imports = [ ./scripts.nix ./rofi.nix ]; home.packages = with pkgs; [ - rofi + rofi-wayland + bluetui ]; programs.waybar = { @@ -104,7 +107,7 @@ } #workspaces button.active { - color: @active-fg; + color: @hover-fg; background: @hover-bg; text-shadow: 0 0 2px rgba(0, 0, 0, 0.6); box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.4); diff --git a/dot_config/flake/machines/wash/configuration.nix b/dot_config/flake/machines/wash/configuration.nix index 25bc46e..d849b5e 100644 --- a/dot_config/flake/machines/wash/configuration.nix +++ b/dot_config/flake/machines/wash/configuration.nix @@ -63,7 +63,7 @@ # Enable the GNOME Desktop Environment. services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; + # services.xserver.desktopManager.gnome.enable = true; # Configure keymap in X11 services.xserver.xkb = { @@ -94,6 +94,15 @@ services.gnome.gnome-keyring.enable = true; + services.avahi.enable = true; + services.geoclue2 = { + enable = true; + enableWifi = true; + geoProviderUrl = "https://api.beacondb.net/v1/geolocate"; + + enableDemoAgent = true; + }; + # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; diff --git a/dot_config/flake/machines/wash/home.nix b/dot_config/flake/machines/wash/home.nix index 3734391..7636f0b 100644 --- a/dot_config/flake/machines/wash/home.nix +++ b/dot_config/flake/machines/wash/home.nix @@ -3,6 +3,8 @@ ../../home/stylix.nix ../../home/common.nix + ../../home/darkman.nix + ../../home/waybar/mechabar ../../home/sway diff --git a/dot_config/flake/nixos/wash/configuration.nix b/dot_config/flake/nixos/wash/configuration.nix deleted file mode 100644 index 25bc46e..0000000 --- a/dot_config/flake/nixos/wash/configuration.nix +++ /dev/null @@ -1,153 +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 -# and in the NixOS manual (accessible by running ‘nixos-help’). -{ - outputs, - pkgs, - ... -}: { - imports = [ - # Include the results of the hardware scan. - ../../home/stylix.nix - ./hardware-configuration.nix - ]; - - nixpkgs = { - overlays = [ - outputs.overlays.additions - outputs.overlays.modifications - outputs.overlays.unstable-packages - ]; - - config = { - allowUnfree = true; - }; - }; - - # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - nix.settings.experimental-features = ["nix-command" "flakes"]; - - networking.hostName = "wash"; # Define your hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Enable networking - networking.networkmanager.enable = true; - - # Set your time zone. - time.timeZone = "America/New_York"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "en_US.UTF-8"; - LC_IDENTIFICATION = "en_US.UTF-8"; - LC_MEASUREMENT = "en_US.UTF-8"; - LC_MONETARY = "en_US.UTF-8"; - LC_NAME = "en_US.UTF-8"; - LC_NUMERIC = "en_US.UTF-8"; - LC_PAPER = "en_US.UTF-8"; - LC_TELEPHONE = "en_US.UTF-8"; - LC_TIME = "en_US.UTF-8"; - }; - - # Enable the X11 windowing system. - services.xserver.enable = true; - - # Enable the GNOME Desktop Environment. - services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; - - # Configure keymap in X11 - services.xserver.xkb = { - layout = "us"; - variant = ""; - }; - - # Enable CUPS to print documents. - services.printing.enable = true; - - services.fprintd.enable = true; - - # Enable sound with pipewire. - hardware.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - # If you want to use JACK applications, uncomment this - #jack.enable = true; - - # use the example session manager (no others are packaged yet so this is enabled by default, - # no need to redefine it in your config for now) - #media-session.enable = true; - }; - - services.gnome.gnome-keyring.enable = true; - - # Enable touchpad support (enabled default in most desktopManager). - # services.xserver.libinput.enable = true; - - # Define a user account. Don't forget to set a password with ‘passwd’. - users.users.tyler = { - isNormalUser = true; - description = "tyler"; - extraGroups = ["networkmanager" "wheel"]; - shell = pkgs.fish; - }; - - environment.systemPackages = with pkgs; [ - sqlite - vscode - lm_sensors - ]; - - fonts.packages = with pkgs; [ - nerdfonts - ]; - - # Install firefox. - programs.firefox.enable = true; - programs.fish.enable = true; - programs.sway = { - enable = true; - # package = null; - wrapperFeatures.gtk = true; - }; - - # 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; - - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "24.11"; # Did you read the comment? -} diff --git a/dot_config/flake/nixos/wash/hardware-configuration.nix b/dot_config/flake/nixos/wash/hardware-configuration.nix deleted file mode 100644 index 6ae3ebf..0000000 --- a/dot_config/flake/nixos/wash/hardware-configuration.nix +++ /dev/null @@ -1,40 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/16fd6400-4e28-4d88-8719-a76aa590f59c"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/6BB1-3DA5"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/eac18653-6290-46d3-b925-c1974f2c8f48"; } - ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -}