From 0ec94a7c648748313d3816878d9de5c5af5f48b0 Mon Sep 17 00:00:00 2001 From: bytequill Date: Tue, 1 Jul 2025 12:38:54 +0200 Subject: [PATCH] NixOS migration since I was basically making arch declarative --- .config/gtk-3.0/settings.ini | 4 ++++ .config/gtk-4.0/settings.ini | 4 ++++ .config/waybar/config.jsonc | 2 +- .stow-local-ignore | 2 +- README.md | 2 +- nix/modules/genericpkgs.nix | 31 +++++++++++++++++++++++++++++++ nix/modules/wayland.nix | 17 +++++++++++++++++ stow.sh | 2 +- 8 files changed, 60 insertions(+), 4 deletions(-) create mode 100644 .config/gtk-3.0/settings.ini create mode 100644 .config/gtk-4.0/settings.ini create mode 100644 nix/modules/genericpkgs.nix create mode 100644 nix/modules/wayland.nix diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini new file mode 100644 index 0000000..e28012f --- /dev/null +++ b/.config/gtk-3.0/settings.ini @@ -0,0 +1,4 @@ +[Settings] +gtk-theme-name = adw-gtk3 +gtk-application-prefer-dark-theme = 1 + diff --git a/.config/gtk-4.0/settings.ini b/.config/gtk-4.0/settings.ini new file mode 100644 index 0000000..e28012f --- /dev/null +++ b/.config/gtk-4.0/settings.ini @@ -0,0 +1,4 @@ +[Settings] +gtk-theme-name = adw-gtk3 +gtk-application-prefer-dark-theme = 1 + diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc index 00e0ca0..a63fd8b 100644 --- a/.config/waybar/config.jsonc +++ b/.config/waybar/config.jsonc @@ -230,7 +230,7 @@ // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name }, "custom/spotify": { - "exec": "$HOME/.config/waybar/spotify.sh 2> /dev/null", + "exec": "bash $HOME/.config/waybar/spotify.sh 2> /dev/null", "format": "{text}", "return-type": "text", "interval": 1, diff --git a/.stow-local-ignore b/.stow-local-ignore index c3570aa..37c1abc 100644 --- a/.stow-local-ignore +++ b/.stow-local-ignore @@ -13,4 +13,4 @@ # Custom files stow.sh -arch-requirements +nix/* diff --git a/README.md b/README.md index c9a55f5..13e84cc 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ git clone --recurse-submodules https://git.codebased.xyz/bytequill/dotfiles.git Using [GNU Stow](https://www.gnu.org/software/stow/) you can easily apply configs provided by this repo You can either run the script `stow.sh` or execute the below manually: ```sh -stow --target $HOME . +stow --no-folding --target $HOME . ``` # note diff --git a/nix/modules/genericpkgs.nix b/nix/modules/genericpkgs.nix new file mode 100644 index 0000000..31e586c --- /dev/null +++ b/nix/modules/genericpkgs.nix @@ -0,0 +1,31 @@ +{ config, pkgs, ... }: + +{ + services.blueman.enable = true; + hardware.bluetooth.enable = true; + hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot + + services.upower.enable = true; + + programs.zsh.enable = true; + users.defaultUserShell = pkgs.zsh; + + fonts.packages = with pkgs; [ + nerd-fonts.iosevka + nerd-fonts.iosevka-term + ]; + + environment.systemPackages = with pkgs; [ + firefox + spotify + vesktop + brightnessctl + networkmanagerapplet + gh # Github CLI + keepassxc + + gcc + clang + stow + ]; +} diff --git a/nix/modules/wayland.nix b/nix/modules/wayland.nix new file mode 100644 index 0000000..02af071 --- /dev/null +++ b/nix/modules/wayland.nix @@ -0,0 +1,17 @@ +{ config, pkgs, ... }: + +{ + programs.hyprland.enable = true; + programs.dconf.enable = true; + + services.displayManager.ly.enable = true; + + environment.systemPackages = with pkgs; [ + wofi + waybar + kitty + adw-gtk3 + glib + adwaita-icon-theme + ]; +} diff --git a/stow.sh b/stow.sh index 2a40aea..1de9f18 100755 --- a/stow.sh +++ b/stow.sh @@ -9,4 +9,4 @@ # - Handling of above mentioned auto functions # - Adopt(Overwrite) option -stow --target $HOME . +stow --no-folding --target $HOME .