diff --git a/flake.lock b/flake.lock index d4b622f..f3fef2c 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1725199881, - "narHash": "sha256-jsmipf/u1GFZE5tBUkr56CHMN6VpUWCAjfLIhvQijU0=", + "lastModified": 1725753098, + "narHash": "sha256-/NO/h/qD/eJXAQr/fHA4mdDgYsNT9thHQ+oT6KPi2ac=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "f8a687dd29ff019657498f1bd14da2fbbf0e604b", + "rev": "e4a13203112a036fc7f437d391c7810f3dd5ab52", "type": "github" }, "original": { @@ -115,11 +115,11 @@ ] }, "locked": { - "lastModified": 1720042825, - "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", + "lastModified": 1725703823, + "narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", + "rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba", "type": "github" }, "original": { @@ -174,11 +174,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1725667615, - "narHash": "sha256-ksmD1gNS/AX4qHvcCS7u+agvB+0fg2wCukFr3Hy4A3I=", + "lastModified": 1726430622, + "narHash": "sha256-50vt1snpVwS5lqvvH4p6DHiEWspJUZuJ1kYy1DKtrfM=", "ref": "refs/heads/main", - "rev": "0500213086f8402ccbdb2acb4748dbc6d22e21f6", - "revCount": 5192, + "rev": "9e356562446f44c471ae38a80506a9df039305d6", + "revCount": 5224, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -232,11 +232,11 @@ ] }, "locked": { - "lastModified": 1725188252, - "narHash": "sha256-yBH8c4GDaEAtBrh+BqIlrx5vp6gG/Gu8fQQK63KAQgs=", + "lastModified": 1725997860, + "narHash": "sha256-d/rZ/fHR5l1n7PeyLw0StWMNLXVU9c4HFyfskw568so=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "c12ab785ce1982f82594aff03b3104c598186ddd", + "rev": "dfeb5811dd6485490cce18d6cc1e38a055eea876", "type": "github" }, "original": { @@ -252,11 +252,11 @@ ] }, "locked": { - "lastModified": 1724608787, - "narHash": "sha256-t2BzxfdLhMY8pnzmQe76bLGL8bB5p5bdIXHhkSV+xr8=", + "lastModified": 1726437584, + "narHash": "sha256-lMIFDORuyMYHtUPrRWU5WjGcS+ZMrR4/wBSO+sgUVSY=", "owner": "KZDKM", "repo": "Hyprspace", - "rev": "b328501fbad4159e404697e25cdaaab0ad9f81a4", + "rev": "8f14fa2e10d24742d713f04c278bc7651037b74b", "type": "github" }, "original": { @@ -322,11 +322,11 @@ ] }, "locked": { - "lastModified": 1725628909, - "narHash": "sha256-xI0OSqPHcs/c/utJsU0Zvcp1VhejMI9mgwr68uHHlPs=", + "lastModified": 1726188813, + "narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "76559183801030451e200c90a1627c1d82bb4910", + "rev": "21fe31f26473c180390cfa81e3ea81aca0204c80", "type": "github" }, "original": { @@ -369,11 +369,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1726412209, - "narHash": "sha256-QgwbKp6e6oHidv3BMPdLdw+t7PHUaR9VNpkDny53a7I=", + "lastModified": 1726453173, + "narHash": "sha256-GnFxniWjQYqg9cAqHj7E+EEip1nZdvcUOH/StIod++c=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "c893f7113553b8dcc27f398deb285e3ada568577", + "rev": "9907e5b7f5cbe92c97fd922b562dba691d3d8585", "type": "github" }, "original": { @@ -384,11 +384,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1725477728, - "narHash": "sha256-ahej1VRqKmWbG7gewty+GlrSBEeGY/J2Zy8Nt8+3fdg=", + "lastModified": 1726489388, + "narHash": "sha256-JBHtN+n1HzKawpnOQAz6jdgvrtYV9c/kyzgoIdguQGo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "880be1ab837e1e9fe0449dae41ac4d034694d4ce", + "rev": "dc8b0296f68f72f3fe77469c549a6f098555c2e9", "type": "github" }, "original": { @@ -416,11 +416,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1726062281, - "narHash": "sha256-PyFVySdGj3enKqm8RQuo4v1KLJLmNLOq2yYOHsI6e2Q=", + "lastModified": 1726320982, + "narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e65aa8301ba4f0ab8cb98f944c14aa9da07394f8", + "rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49", "type": "github" }, "original": { @@ -432,11 +432,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1725407940, - "narHash": "sha256-tiN5Rlg/jiY0tyky+soJZoRzLKbPyIdlQ77xVgREDNM=", + "lastModified": 1726320982, + "narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6f6c45b5134a8ee2e465164811e451dcb5ad86e3", + "rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49", "type": "github" }, "original": { @@ -469,11 +469,11 @@ ] }, "locked": { - "lastModified": 1726280639, - "narHash": "sha256-YfLRPlFZWrT2oRLNAoqf7G3+NnUTDdlIJk6tmBU7kXM=", + "lastModified": 1726382494, + "narHash": "sha256-T7W+ohiXe1IY0yf/PpS4wQItZ0SyRO+/v8kqNpMXlI4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e9f8641c92f26fd1e076e705edb12147c384171d", + "rev": "ff13821613ffe5dbfeb4fe353b1f4bf291d831db", "type": "github" }, "original": { @@ -536,11 +536,11 @@ }, "unstable": { "locked": { - "lastModified": 1725638002, - "narHash": "sha256-XA/qBjBGNC3FrbyXF3w528GnOhSVmr/uHHWYkqjUZ2w=", + "lastModified": 1726491728, + "narHash": "sha256-bopKO2CikcosUq+gPKRRzeaSyj4lPvrqgyfxAMLjIbM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88dbefd1f2b93561ac398b0b6c38971ca0378a51", + "rev": "107b787d201c792c41c2d716eecc480194b8b3fe", "type": "github" }, "original": { @@ -557,11 +557,11 @@ ] }, "locked": { - "lastModified": 1725628988, - "narHash": "sha256-Y6TBMTGu4bddUwszGjlcOuN0soVc1Gv43hp+1sT/GNI=", + "lastModified": 1726440980, + "narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=", "owner": "nix-community", "repo": "home-manager", - "rev": "127ccc3eb7e36fa75e8c3fbd8a343154f66cc1c6", + "rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff", "type": "github" }, "original": { @@ -588,11 +588,11 @@ ] }, "locked": { - "lastModified": 1725203932, - "narHash": "sha256-VLULC/OnI+6R9KEP2OIGk+uLJJsfRlaLouZ5gyFd2+Y=", + "lastModified": 1726046979, + "narHash": "sha256-6SEsjurq9cdTkITA6d49ncAJe4O/8CgRG5/F//s6Xh8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "2425e8f541525fa7409d9f26a8ffaf92a3767251", + "rev": "e695669fd8e1d1be9eaae40f35e00f8bd8b64c18", "type": "github" }, "original": { diff --git a/modules/nixos/common/hardware/sound.nix b/modules/nixos/common/hardware/sound.nix index 0fe215c..94eb428 100644 --- a/modules/nixos/common/hardware/sound.nix +++ b/modules/nixos/common/hardware/sound.nix @@ -21,5 +21,8 @@ in alsa.support32Bit = true; jack.enable = true; }; + services.jack = { + alsa.enable = true; + }; }; } diff --git a/modules/nixos/desktop/cosmic.nix b/modules/nixos/desktop/cosmic.nix index f009593..ee3ee78 100644 --- a/modules/nixos/desktop/cosmic.nix +++ b/modules/nixos/desktop/cosmic.nix @@ -11,6 +11,6 @@ in }; config = lib.mkIf cfg.enabled { services.desktopManager.cosmic.enable = true; - # services.displayManager.cosmic-greeter.enable = true; + # services.displayManager.cosmic-greeter.enable = true; }; } diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index 42d1a29..cacdb01 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -1,6 +1,4 @@ -{ config, lib, ... }: -with lib; - +{ config, lib, pkgs, ... }: let cfg = config.skyg.nixos; in @@ -17,19 +15,35 @@ in options = { skyg.nixos.desktop = { - enabled = mkEnableOption + enabled = lib.mkEnableOption "Enable Desktop"; }; }; - config = mkIf cfg.desktop.enabled { + config = lib.mkIf cfg.desktop.enabled { services.displayManager.sddm.enable = false; services.displayManager.sddm.wayland.enable = false; services.xserver.displayManager.gdm.enable = true; services.xserver.displayManager.gdm.wayland = true; - xdg.portal = { - enable = true; - wlr.enable = true; - xdgOpenUsePortal = true; + xdg = { + autostart.enable = true; + mime.enable = true; + menus.enable = true; + icons.enable = true; + sounds.enable = true; + terminal-exec.enable = true; + portal = { + enable = true; + wlr.enable = true; + xdgOpenUsePortal = true; + config = { + common.default = [ "gtk" ]; + hyprland.default = [ "gtk" "hyprland" ]; + plasma6.default = [ "gtk" "kde" ]; + }; + extraPortals = [ + pkgs.xdg-desktop-portal-gtk + ]; + }; }; services.pipewire = { enable = true; diff --git a/modules/nixos/desktop/wayland.nix b/modules/nixos/desktop/wayland.nix index 5c02e44..ea32e2d 100644 --- a/modules/nixos/desktop/wayland.nix +++ b/modules/nixos/desktop/wayland.nix @@ -10,6 +10,7 @@ in wayland-protocols wayland-utils xdg-desktop-portal-wlr + xdg-desktop-portal-gtk ]; programs.xwayland.enable = true; };