From 7cf28c791c29feab17a4a17598be557294c8d6d7 Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 1 Feb 2025 23:30:06 -0600 Subject: [PATCH] feat: fixed hyprland --- flake.nix | 2 +- home/default.nix | 1 + home/modules/cli/utilities/paMixer/default.nix | 11 +++++++++++ .../{desktop => apps/tools}/flameshot/default.nix | 2 +- .../gui/desktop/hyprland/config/exec-once.nix | 2 ++ nixos/default.nix | 1 + nixos/modules/{hyprland => }/bluetooth.nix | 6 +++++- nixos/modules/hyprland/default.nix | 1 - nixos/modules/hyprland/wayland.nix | 4 ---- nixos/modules/ollama.nix | 14 +++++++------- systems/desktop/config/filesystem.nix | 6 +++--- 11 files changed, 32 insertions(+), 18 deletions(-) create mode 100644 home/modules/cli/utilities/paMixer/default.nix rename home/modules/gui/{desktop => apps/tools}/flameshot/default.nix (94%) rename nixos/modules/{hyprland => }/bluetooth.nix (93%) diff --git a/flake.nix b/flake.nix index 163fbc1..d8808a2 100755 --- a/flake.nix +++ b/flake.nix @@ -84,7 +84,7 @@ ./profiles/user0 ./profiles/user1 config.nixosModules.desktop - config.nixosModules.plasma + config.nixosModules.hyprland config.nixosModules.personal config.nixosModules.shared config.nixosModules.sops diff --git a/home/default.nix b/home/default.nix index aa5aafe..eee8197 100755 --- a/home/default.nix +++ b/home/default.nix @@ -50,6 +50,7 @@ in messaging sharing tools + desktop ; }; }; diff --git a/home/modules/cli/utilities/paMixer/default.nix b/home/modules/cli/utilities/paMixer/default.nix new file mode 100644 index 0000000..a54039b --- /dev/null +++ b/home/modules/cli/utilities/paMixer/default.nix @@ -0,0 +1,11 @@ +{ + pkgs, + ... +}: +{ + home.packages = builtins.attrValues { + inherit (pkgs) + pamixer + ; + }; +} diff --git a/home/modules/gui/desktop/flameshot/default.nix b/home/modules/gui/apps/tools/flameshot/default.nix similarity index 94% rename from home/modules/gui/desktop/flameshot/default.nix rename to home/modules/gui/apps/tools/flameshot/default.nix index 2de352c..9246e61 100755 --- a/home/modules/gui/desktop/flameshot/default.nix +++ b/home/modules/gui/apps/tools/flameshot/default.nix @@ -22,7 +22,7 @@ in General = { disabledTrayIcon = true; showStartupLaunchMessage = false; - # disabledGrimWarning = true; + disabledGrimWarning = true; }; }; }; diff --git a/home/modules/gui/desktop/hyprland/config/exec-once.nix b/home/modules/gui/desktop/hyprland/config/exec-once.nix index 060bd3c..575b2b1 100755 --- a/home/modules/gui/desktop/hyprland/config/exec-once.nix +++ b/home/modules/gui/desktop/hyprland/config/exec-once.nix @@ -23,4 +23,6 @@ in "bluetoothctl power on" "gsettings set org.gnome.desktop.interface cursor-theme 'catppuccin-mocha-dark-cursors'" "gsettings set org.gnome.desktop.interface cursor-size ${builtins.toString cursor.size}" + "systemctl --user import-environment PATH" + "systemctl --user restart xdg-desktop-portal.service" ] diff --git a/nixos/default.nix b/nixos/default.nix index 5ed5fa5..50cb6a7 100755 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -40,6 +40,7 @@ in inherit (modules) android audio + bluetooth corectrl dconf disks diff --git a/nixos/modules/hyprland/bluetooth.nix b/nixos/modules/bluetooth.nix similarity index 93% rename from nixos/modules/hyprland/bluetooth.nix rename to nixos/modules/bluetooth.nix index 80619f4..a9d12a6 100755 --- a/nixos/modules/hyprland/bluetooth.nix +++ b/nixos/modules/bluetooth.nix @@ -1,4 +1,8 @@ -{ pkgs, ... }: +{ + pkgs, + ... +}: + { hardware = { bluetooth = { diff --git a/nixos/modules/hyprland/default.nix b/nixos/modules/hyprland/default.nix index 3eefd7d..7389e7b 100755 --- a/nixos/modules/hyprland/default.nix +++ b/nixos/modules/hyprland/default.nix @@ -1,6 +1,5 @@ { imports = map (file: ./${file}.nix) [ - "bluetooth" "geoclue2" "greetd" "network" diff --git a/nixos/modules/hyprland/wayland.nix b/nixos/modules/hyprland/wayland.nix index a5b5383..072afbd 100755 --- a/nixos/modules/hyprland/wayland.nix +++ b/nixos/modules/hyprland/wayland.nix @@ -9,12 +9,8 @@ xdgOpenUsePortal = true; extraPortals = builtins.attrValues { inherit (pkgs) - xdg-desktop-portal-wlr xdg-desktop-portal-gtk ; - inherit (pkgs.kdePackages) - xdg-desktop-portal-kde - ; }; }; }; diff --git a/nixos/modules/ollama.nix b/nixos/modules/ollama.nix index f2b22e7..c8ecc7f 100755 --- a/nixos/modules/ollama.nix +++ b/nixos/modules/ollama.nix @@ -14,13 +14,13 @@ in { services = { ollama = { - # acceleration = "rocm"; - # package = pkgs.ollama.override { - # config = { - # rocmSupport = true; - # cudaSupport = false; - # }; - # }; + acceleration = "rocm"; + package = pkgs.ollama.override { + config = { + rocmSupport = true; + cudaSupport = false; + }; + }; enable = true; group = service.name; host = "http://${localhost}"; diff --git a/systems/desktop/config/filesystem.nix b/systems/desktop/config/filesystem.nix index bd4b14a..9c99511 100755 --- a/systems/desktop/config/filesystem.nix +++ b/systems/desktop/config/filesystem.nix @@ -71,11 +71,11 @@ in in { "/" = { - device = "/dev/disk/by-uuid/5c416d6a-9c2b-4b0c-9e0e-9bb3bf56a863"; + device = "/dev/disk/by-uuid/c22a06af-8855-4938-9d04-68cd4d88d7f0"; fsType = "ext4"; }; "/boot" = { - device = "/dev/disk/by-uuid/B1B8-E776"; + device = "/dev/disk/by-uuid/7B8C-1E95"; fsType = "vfat"; options = desktop.boot.options; }; @@ -85,7 +85,7 @@ in // (builtins.listToAttrs (map sambaMounts sambaDrives)); swapDevices = [ - { device = "/dev/disk/by-uuid/644ad843-337d-429f-abb8-2423c8ed111e"; } + { device = "/dev/disk/by-uuid/8c9d0c0b-0bc8-442b-a3fd-02a37acd409f"; } ]; systemd.tmpfiles.rules = [