feat: fixed hyprland

This commit is contained in:
Nick 2025-02-01 23:30:06 -06:00
parent a4afc18937
commit 7cf28c791c
11 changed files with 32 additions and 18 deletions

View file

@ -84,7 +84,7 @@
./profiles/user0 ./profiles/user0
./profiles/user1 ./profiles/user1
config.nixosModules.desktop config.nixosModules.desktop
config.nixosModules.plasma config.nixosModules.hyprland
config.nixosModules.personal config.nixosModules.personal
config.nixosModules.shared config.nixosModules.shared
config.nixosModules.sops config.nixosModules.sops

View file

@ -50,6 +50,7 @@ in
messaging messaging
sharing sharing
tools tools
desktop
; ;
}; };
}; };

View file

@ -0,0 +1,11 @@
{
pkgs,
...
}:
{
home.packages = builtins.attrValues {
inherit (pkgs)
pamixer
;
};
}

View file

@ -22,7 +22,7 @@ in
General = { General = {
disabledTrayIcon = true; disabledTrayIcon = true;
showStartupLaunchMessage = false; showStartupLaunchMessage = false;
# disabledGrimWarning = true; disabledGrimWarning = true;
}; };
}; };
}; };

View file

@ -23,4 +23,6 @@ in
"bluetoothctl power on" "bluetoothctl power on"
"gsettings set org.gnome.desktop.interface cursor-theme 'catppuccin-mocha-dark-cursors'" "gsettings set org.gnome.desktop.interface cursor-theme 'catppuccin-mocha-dark-cursors'"
"gsettings set org.gnome.desktop.interface cursor-size ${builtins.toString cursor.size}" "gsettings set org.gnome.desktop.interface cursor-size ${builtins.toString cursor.size}"
"systemctl --user import-environment PATH"
"systemctl --user restart xdg-desktop-portal.service"
] ]

View file

@ -40,6 +40,7 @@ in
inherit (modules) inherit (modules)
android android
audio audio
bluetooth
corectrl corectrl
dconf dconf
disks disks

View file

@ -1,4 +1,8 @@
{ pkgs, ... }: {
pkgs,
...
}:
{ {
hardware = { hardware = {
bluetooth = { bluetooth = {

View file

@ -1,6 +1,5 @@
{ {
imports = map (file: ./${file}.nix) [ imports = map (file: ./${file}.nix) [
"bluetooth"
"geoclue2" "geoclue2"
"greetd" "greetd"
"network" "network"

View file

@ -9,12 +9,8 @@
xdgOpenUsePortal = true; xdgOpenUsePortal = true;
extraPortals = builtins.attrValues { extraPortals = builtins.attrValues {
inherit (pkgs) inherit (pkgs)
xdg-desktop-portal-wlr
xdg-desktop-portal-gtk xdg-desktop-portal-gtk
; ;
inherit (pkgs.kdePackages)
xdg-desktop-portal-kde
;
}; };
}; };
}; };

View file

@ -14,13 +14,13 @@ in
{ {
services = { services = {
ollama = { ollama = {
# acceleration = "rocm"; acceleration = "rocm";
# package = pkgs.ollama.override { package = pkgs.ollama.override {
# config = { config = {
# rocmSupport = true; rocmSupport = true;
# cudaSupport = false; cudaSupport = false;
# }; };
# }; };
enable = true; enable = true;
group = service.name; group = service.name;
host = "http://${localhost}"; host = "http://${localhost}";

View file

@ -71,11 +71,11 @@ in
in in
{ {
"/" = { "/" = {
device = "/dev/disk/by-uuid/5c416d6a-9c2b-4b0c-9e0e-9bb3bf56a863"; device = "/dev/disk/by-uuid/c22a06af-8855-4938-9d04-68cd4d88d7f0";
fsType = "ext4"; fsType = "ext4";
}; };
"/boot" = { "/boot" = {
device = "/dev/disk/by-uuid/B1B8-E776"; device = "/dev/disk/by-uuid/7B8C-1E95";
fsType = "vfat"; fsType = "vfat";
options = desktop.boot.options; options = desktop.boot.options;
}; };
@ -85,7 +85,7 @@ in
// (builtins.listToAttrs (map sambaMounts sambaDrives)); // (builtins.listToAttrs (map sambaMounts sambaDrives));
swapDevices = [ swapDevices = [
{ device = "/dev/disk/by-uuid/644ad843-337d-429f-abb8-2423c8ed111e"; } { device = "/dev/disk/by-uuid/8c9d0c0b-0bc8-442b-a3fd-02a37acd409f"; }
]; ];
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [