diff --git a/configs/hyprland/mine/hypr/hyprland.d/bg-proc.conf b/configs/hyprland/mine/hypr/hyprland.d/bg-proc.conf index 9993371..63e0884 100644 --- a/configs/hyprland/mine/hypr/hyprland.d/bg-proc.conf +++ b/configs/hyprland/mine/hypr/hyprland.d/bg-proc.conf @@ -3,4 +3,6 @@ exec-once = dunst --startup_notification exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once = swww-daemon exec-once = hypridle -exec-once = waybar +# exec-once = waybar +exec-once = nwg-panel +exec-once = nwg-dock-hyprland diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 26dd022..83a66dd 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -1,5 +1,5 @@ -{ user, dataDir ? "/mnt/Data", unstable }: -{ pkgs, lib, config, ... }: +{ user, unstable }: +{ pkgs, ... }: let zshFWBook = builtins.filterSource (p: t: true) ./scripts/fwbook; zshFunctions = zshFWBook + "/functions.sh"; @@ -14,8 +14,9 @@ in kde.enabled = true; hyprland = { enabled = true; - useNWG = true; + useNWG = false; }; + crypto.enabled = true; }; services.displayManager.defaultSession = "hyprland"; skyg.nixos.common.hardware.sound.enable = true; @@ -55,21 +56,23 @@ in amdctl # python python312 - # crypto - trezor-suite - trezord - ledger-live-desktop # skype skypeforlinux # Work dvc-with-remotes awscli ]; - # udev rules for crypto wallets - services.udev.packages = with pkgs; [ ledger-udev-rules trezor-udev-rules ]; - # trezor groups - users.groups.trezord = { }; - users.groups.trezord.members = [ user.name ]; + programs.firefox = { + enable = true; + }; + programs.chromium = { + enable = true; + extensions = [ + "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin + "nngceckbapebfimnlniiiahkandclblb" + ]; + }; + # # Opengl hardware.opengl = { driSupport = true; @@ -157,4 +160,10 @@ in ''; }; systemd.sleep.extraConfig = "HibernateDelaySec=30m"; + # Family Storage + fileSystems."/mnt/EightTerra/FamilyStorage" = { + device = "tnas1.lab.internal:/mnt/EightTerra/FamilyStorage"; + fsType = "nfs"; + options = [ "x-systemd.automount" "noauto" ]; + }; } diff --git a/modules/nixos/desktop/crypto.nix b/modules/nixos/desktop/crypto.nix new file mode 100644 index 0000000..c3b7e60 --- /dev/null +++ b/modules/nixos/desktop/crypto.nix @@ -0,0 +1,29 @@ +{ config, lib, pkgs, ... }: +with lib; + +let + cfg = config.skyg.nixos.desktop.crypto; +in +{ + options = { + skyg.nixos.desktop.crypto = { + enabled = mkEnableOption + "Enable crypto wallets"; + }; + }; + config = mkIf cfg.enabled { + environment.systemPackages = with pkgs; [ + trezor-suite + trezord + ledger-live-desktop + ]; + # udev rules for crypto wallets + services.udev.packages = with pkgs; [ + ledger-udev-rules + trezor-udev-rules + ]; + # trezor groups + users.groups.trezord = { }; + users.groups.trezord.members = [ config.skyg.user.name ]; + }; +} diff --git a/modules/nixos/desktop/hyprland/common.nix b/modules/nixos/desktop/hyprland/common.nix index 905fe16..f337338 100644 --- a/modules/nixos/desktop/hyprland/common.nix +++ b/modules/nixos/desktop/hyprland/common.nix @@ -26,6 +26,7 @@ in lxqt.lxqt-policykit xdg-desktop-portal xdg-desktop-portal-hyprland + auto-cpufreq # general utilities brightnessctl # brightness ctl diff --git a/modules/nixos/desktop/hyprland/mine.nix b/modules/nixos/desktop/hyprland/mine.nix index aa10272..bef64c2 100644 --- a/modules/nixos/desktop/hyprland/mine.nix +++ b/modules/nixos/desktop/hyprland/mine.nix @@ -19,6 +19,9 @@ in waypaper # wallpaper manager swww # wallpaper service waybar # top bar + nwg-panel # top bar + nwg-dock-hyprland # bottom bar + nwg-displays # display management nwg-bar # logout window ]; system.userActivationScripts.hyprlandMineConfig.text = '' diff --git a/modules/nixos/desktop/hyprland/nwg-shell.nix b/modules/nixos/desktop/hyprland/nwg-shell.nix index 82a727e..011dc0a 100644 --- a/modules/nixos/desktop/hyprland/nwg-shell.nix +++ b/modules/nixos/desktop/hyprland/nwg-shell.nix @@ -12,7 +12,6 @@ in nwg-bar nwg-menu nwg-look - nwg-dock nwg-panel nwg-hello nwg-drawer