diff --git a/flake.lock b/flake.lock index 9a90bd7a..8e4304a5 100644 --- a/flake.lock +++ b/flake.lock @@ -159,11 +159,11 @@ ] }, "locked": { - "lastModified": 1722345621, - "narHash": "sha256-3ZZolUAhDElGd1fZyMmXniodfcjQeMueGlUxKCq7Id4=", + "lastModified": 1722381373, + "narHash": "sha256-BKx7uzHo3WyCmjjEWic3UuYDfq5i41ToCiHRlA7xZzU=", "owner": "nix-community", "repo": "flake-firefox-nightly", - "rev": "b2a9f7632877e013f4ee7f7ff53f3266b1ce5057", + "rev": "480f9615514981d2e1c6d634e878d6384ae73bc2", "type": "github" }, "original": { @@ -554,11 +554,11 @@ ] }, "locked": { - "lastModified": 1722321190, - "narHash": "sha256-WeVWVRqkgrbLzmk6FfJoloJ7Xe7HWD27Pv950IUG2kI=", + "lastModified": 1722407237, + "narHash": "sha256-wcpVHUc2nBSSgOM7UJSpcRbyus4duREF31xlzHV5T+A=", "owner": "nix-community", "repo": "home-manager", - "rev": "4fcd54df7cbb1d79cbe81209909ee8514d6b17a4", + "rev": "58cef3796271aaeabaed98884d4abaab5d9d162d", "type": "github" }, "original": { @@ -900,11 +900,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1722241867, - "narHash": "sha256-//9wuNlkw5JZU2C3ELs8TtAtZE5HWVPtcM6fmgk2IUA=", + "lastModified": 1722388137, + "narHash": "sha256-vIZC9sPCNJCYuT5k9hV7Ag8AnXDyjQfsYUZCnG2y3vs=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "7a07614bba2b5674b4f3b5c4d7baf80e71a55406", + "rev": "5327de38599220609e99ade12ba53f769bd2fc6f", "type": "github" }, "original": { diff --git a/home/cnst.nix b/home/cnst.nix deleted file mode 100644 index 374da0fa..00000000 --- a/home/cnst.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - lib, - self, - inputs, - ... -}: { - imports = [ - # inputs.matugen.nixosModules.default - # inputs.nix-index-db.hmModules.nix-index - # inputs.tailray.homeManagerModules.default - # self.nixosModules.theme - ]; - - home = { - username = "cnst"; - homeDirectory = "/home/cnst"; - stateVersion = "23.11"; - extraOutputsToInstall = ["doc" "devdoc"]; - }; - - # disable manuals as nmd fails to build often - manual = { - html.enable = false; - json.enable = false; - manpages.enable = false; - }; - - # let HM manage itself when in standalone mode - programs.home-manager.enable = true; -} diff --git a/home/core/gui/hypr/cnst.nix b/home/core/gui/hypr/cnst.nix index 269a740c..c0fd686c 100644 --- a/home/core/gui/hypr/cnst.nix +++ b/home/core/gui/hypr/cnst.nix @@ -8,10 +8,10 @@ systemd = { variables = ["--all"]; - extraCommands = [ - "systemctl --user stop graphical-session.target" - "systemctl --user start hyprland-session.target" - ]; + # extraCommands = [ + # "systemctl --user stop graphical-session.target" + # "systemctl --user start hyprland-session.target" + # ]; }; }; } diff --git a/home/core/gui/hypr/land/cnst/inputs.nix b/home/core/gui/hypr/land/cnst/inputs.nix index 31f210ad..6a48ced3 100644 --- a/home/core/gui/hypr/land/cnst/inputs.nix +++ b/home/core/gui/hypr/land/cnst/inputs.nix @@ -6,6 +6,12 @@ ]; env = [ "QT_WAYLAND_DISABLE_WINDOWDECORATION,1" + + "XDG_SESSION_DESKTOP, Hyprland" + + "GDK_BACKEND, wayland" + "SDL_VIDEODRIVER, wayland" + "QT_QPA_PLATFORM, wayland;xcb" ]; input = { diff --git a/home/core/gui/hypr/land/cnst/rules.nix b/home/core/gui/hypr/land/cnst/rules.nix index c6ea8d91..dfdffebf 100644 --- a/home/core/gui/hypr/land/cnst/rules.nix +++ b/home/core/gui/hypr/land/cnst/rules.nix @@ -37,6 +37,7 @@ "center, ^(xarchiver)$" "float, ^(xarchiver)$" "float, ^(org.gnome.FileRoller)$" + "float, ^(org.freedesktop.impl.portal.desktop.kde)$" ]; }; } diff --git a/home/core/gui/hypr/land/cnst/startup.nix b/home/core/gui/hypr/land/cnst/startup.nix index b7105e5f..17ce7aed 100644 --- a/home/core/gui/hypr/land/cnst/startup.nix +++ b/home/core/gui/hypr/land/cnst/startup.nix @@ -3,7 +3,7 @@ exec-once = [ # STARTUP # exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP - "systemctl --user start polkit-gnome-authentication-agent-1" + # "systemctl --user start polkit-gnome-authentication-agent-1" # exec-once = lxqt-policykit-agent & "waybar" "pamixer --set-volume 50" diff --git a/home/core/gui/xdg/default.nix b/home/core/gui/xdg/default.nix index aeb454ce..b7507c07 100644 --- a/home/core/gui/xdg/default.nix +++ b/home/core/gui/xdg/default.nix @@ -16,18 +16,6 @@ templates = "${config.home.homeDirectory}/documents/templates"; videos = "${config.home.homeDirectory}/media/videos"; }; - portal = { - enable = true; - xdgOpenUsePortal = true; - config = { - common.default = ["gtk"]; - hyprland.default = ["gtk" "hyprland"]; - }; - - extraPortals = [ - pkgs.xdg-desktop-portal-gtk - ]; - }; }; dconf = { settings = { diff --git a/home/users/cnst/default.nix b/home/users/cnst/default.nix index 6ab3f98c..f9cecde5 100644 --- a/home/users/cnst/default.nix +++ b/home/users/cnst/default.nix @@ -10,11 +10,15 @@ # ../../core/services/power-monitor ]; home = { + username = "cnst"; + homeDirectory = "/home/cnst"; + stateVersion = "23.11"; + extraOutputsToInstall = ["doc" "devdoc"]; + packages = with pkgs; [ # misc.gui virt-manager xfce.thunar - nautilus # misc.tui ranger @@ -36,10 +40,15 @@ BROWSER = "firefox"; EDITOR = "nvim"; TERM = "foot"; - - QT_QPA_PLATFORM = "wayland"; - SDL_VIDEODRIVER = "wayland"; - XDG_SESSION_TYPE = "wayland"; }; }; + # disable manuals as nmd fails to build often + manual = { + html.enable = false; + json.enable = false; + manpages.enable = false; + }; + + # let HM manage itself when in standalone mode + programs.home-manager.enable = true; } diff --git a/home/users/default.nix b/home/users/default.nix index adc4233b..645841c5 100644 --- a/home/users/default.nix +++ b/home/users/default.nix @@ -9,17 +9,14 @@ homeImports = { "cnst@cnix" = [ ../core - ../cnst.nix ./cnst ]; "adam@adampad" = [ ../core - ../adam.nix ./adam ]; "toothpick@toothpc" = [ ../core - ../toothpick.nix ./toothpick ]; }; diff --git a/nixos/core/hyprland.nix b/nixos/core/hyprland.nix index edc7e5dc..bce5107d 100644 --- a/nixos/core/hyprland.nix +++ b/nixos/core/hyprland.nix @@ -1,7 +1,17 @@ -{inputs, ...}: { +{ + inputs, + lib, + pkgs, + ... +}: { imports = [ inputs.hyprland.nixosModules.default ]; environment.variables.NIXOS_OZONE_WL = "1"; programs.hyprland.enable = true; + xdg.portal = { + enable = true; + config.common.default = lib.mkForce ["hyprland" "kde"]; + extraPortals = [pkgs.xdg-desktop-portal-kde]; + }; } diff --git a/nixos/hosts/cnix/system.nix b/nixos/hosts/cnix/system.nix index 849c2884..aa101332 100644 --- a/nixos/hosts/cnix/system.nix +++ b/nixos/hosts/cnix/system.nix @@ -24,6 +24,7 @@ settings = { auto-optimise-store = true; builders-use-substitutes = true; + warn-dirty = false; experimental-features = ["nix-command" "flakes"]; flake-registry = "/etc/nix/registry.json";