diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 10f2e35..8472e35 120000 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1 +1 @@ -/nix/store/1y2prhr11kqqf6ky1z8kmhbv4djcy499-pre-commit-config.json \ No newline at end of file +/nix/store/irqhrjyjaz9rb8ns04fp12dlcc6hq2q5-pre-commit-config.json \ No newline at end of file diff --git a/GUIDELINES.md b/GUIDELINES.md index e57fdd8..7a1dde7 100644 --- a/GUIDELINES.md +++ b/GUIDELINES.md @@ -131,7 +131,7 @@ system-level and HM-level options. The HM entry point is `modules/home/default.n ### Greeter Both desktop hosts (`fwbook`, `hl-fwdesk`) use DankMaterialShell greeter via: ```nix -programs.dank-material-shell.greeter = { +services.displayManager.dms-greeter = { enable = true; compositor.name = "niri"; configHome = "/home/"; diff --git a/configs/fwbook/hypr/conf/keybindings.lua b/configs/fwbook/hypr/conf/keybindings.lua index ec8d493..a1f0612 100644 --- a/configs/fwbook/hypr/conf/keybindings.lua +++ b/configs/fwbook/hypr/conf/keybindings.lua @@ -82,7 +82,7 @@ hl.bind(mod .. " + G", hl.dsp.group.toggle()) hl.bind(mod .. " + SHIFT + F", hl.dsp.window.fullscreen({ mode = "fullscreen", action = "toggle" })) hl.bind(mod .. " + V", hl.dsp.window.float({ action = "toggle" })) hl.bind(mod .. " + C", hl.dsp.layout("focus current")) -hl.bind("ALT + TAB", hl.dsp.window.cycle_next()) +hl.bind("ALT + TAB", hl.dsp.exec_cmd("noctalia msg window-switcher toggle")) -- ========================= -- Resizing @@ -135,14 +135,16 @@ hl.bind( hl.bind(mod .. " + ALT + L", hl.dsp.exec_cmd("noctalia msg notification-clear-active")) -- Media & brightness -hl.bind(mod .. " + M + up", hl.dsp.exec_cmd("noctalia msg volume-up")) -hl.bind(mod .. " + M + down", hl.dsp.exec_cmd("noctalia msg volume-down")) -hl.bind(mod .. " + M + right", hl.dsp.exec_cmd("playerctl next")) -hl.bind(mod .. " + M + left", hl.dsp.exec_cmd("playerctl previous")) -hl.bind(mod .. " + M + Space", hl.dsp.exec_cmd("playerctl play-pause")) +-- hl.bind(mod .. " + M + up", hl.dsp.exec_cmd("noctalia msg volume-up")) +-- hl.bind(mod .. " + M + down", hl.dsp.exec_cmd("noctalia msg volume-down")) +-- hl.bind(mod .. " + M + right", hl.dsp.exec_cmd("playerctl next")) +-- hl.bind(mod .. " + M + left", hl.dsp.exec_cmd("playerctl previous")) +-- hl.bind(mod .. " + M + Space", hl.dsp.exec_cmd("playerctl play-pause")) hl.bind("XF86AudioPause", hl.dsp.exec_cmd("playerctl play-pause")) hl.bind("XF86AudioRaiseVolume", hl.dsp.exec_cmd("noctalia msg volume-up"), { locked = true }) hl.bind("XF86AudioLowerVolume", hl.dsp.exec_cmd("noctalia msg volume-down"), { locked = true }) hl.bind("XF86AudioMute", hl.dsp.exec_cmd("noctalia msg volume-mute"), { locked = true }) hl.bind("XF86MonBrightnessUp", hl.dsp.exec_cmd("noctalia msg brightness-up"), { locked = true }) hl.bind("XF86MonBrightnessDown", hl.dsp.exec_cmd("noctalia msg brightness-down"), { locked = true }) + +hl.bind(mod .. " + M", hl.dsp.exec_cmd("wl-paste --primary | piper -m en_US-hfc_female-medium")) diff --git a/configs/fwbook/hypr/conf/window-rules.lua b/configs/fwbook/hypr/conf/window-rules.lua index 7de8761..5f0aad2 100644 --- a/configs/fwbook/hypr/conf/window-rules.lua +++ b/configs/fwbook/hypr/conf/window-rules.lua @@ -46,10 +46,21 @@ hl.window_rule({ float = true, name = "float-slack-huddle", }) +hl.window_rule({ + match = { class = "com.gabm.satty" }, + float = true, + name = "float-satty", +}) +hl.window_rule({ + match = { class = "dev.noctalia.Noctalia" }, + float = true, + name = "float-noctalia", + center = true, + size = { "(monitor_w*0.5)", "(monitor_h*0.9)" }, +}) hl.window_rule({ match = { float = true }, name = "float-style", no_screen_share = true, xray = true, - -- stay_focused = true }) diff --git a/configs/hl-fwdesk/hypr/conf/keybindings.lua b/configs/hl-fwdesk/hypr/conf/keybindings.lua index 506e350..00ff42e 100644 --- a/configs/hl-fwdesk/hypr/conf/keybindings.lua +++ b/configs/hl-fwdesk/hypr/conf/keybindings.lua @@ -41,8 +41,8 @@ hl.bind(mod .. " + P", hl.dsp.exec_cmd('grim -g "$(slurp)" - | satty -f -')) -- ========================= -- Session -- ========================= --- UWSM: use `uwsm stop` instead of the `exit` dispatcher (ordered shutdown). hl.bind("CTRL + ALT + Delete", hl.dsp.exec_cmd("uwsm stop")) +hl.bind("ALT + TAB", hl.dsp.exec_cmd("noctalia msg window-switcher toggle")) -- ========================= -- Mouse drag (move / resize windows) diff --git a/configs/hl-fws1/hypr/conf/keybindings.lua b/configs/hl-fws1/hypr/conf/keybindings.lua index 88176a4..8c9f348 100644 --- a/configs/hl-fws1/hypr/conf/keybindings.lua +++ b/configs/hl-fws1/hypr/conf/keybindings.lua @@ -61,7 +61,7 @@ hl.bind("XF86AudioStop", hl.dsp.exec_cmd("playerctl stop")) hl.bind("XF86ChannelUp", hl.dsp.focus({ direction = "right" })) hl.bind("XF86ChannelDown", hl.dsp.focus({ direction = "left" })) -hl.bind("XF86HomePage", hl.dsp.exec_cmd("dms ipc spotlight toggle")) +hl.bind("XF86HomePage", hl.dsp.exec_cmd("skygqts carousel ~/.config/hypr/skygqts-carousel.json")) hl.bind("XF86AudioRaiseVolume", hl.dsp.exec_cmd("noctalia msg volume-up"), { locked = true }) hl.bind("XF86AudioLowerVolume", hl.dsp.exec_cmd("noctalia msg volume-down"), { locked = true }) @@ -70,7 +70,7 @@ hl.bind("XF86AudioLowerVolume", hl.dsp.exec_cmd("noctalia msg volume-down"), { l -- hl.bind("XF86Launch6", hl.dsp.exec_cmd("")) -- TV Series -- hl.bind("F7", hl.dsp.exec_cmd("")) -- Void -- hl.bind("XF86Launch5", hl.dsp.exec_cmd("")) -- ⭐ Fav --- hl.bind("F4", hl.dsp.exec_cmd("")) -- Server +hl.bind("F4", hl.dsp.exec_cmd("dms ipc spotlight toggle")) -- Server -- hl.bind("Menu", hl.dsp.exec_cmd("")) -- Menu -- hl.bind("F6", hl.dsp.exec_cmd("")) -- Guide -- hl.bind("XF86Back", hl.dsp.exec_cmd("")) -- Back diff --git a/configs/hl-fws1/hypr/images/Chromium.svg b/configs/hl-fws1/hypr/images/Chromium.svg new file mode 100644 index 0000000..416ae3f --- /dev/null +++ b/configs/hl-fws1/hypr/images/Chromium.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/configs/hl-fws1/hypr/images/Netflix.svg b/configs/hl-fws1/hypr/images/Netflix.svg new file mode 100644 index 0000000..7a044f4 --- /dev/null +++ b/configs/hl-fws1/hypr/images/Netflix.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/configs/hl-fws1/hypr/images/jellyfin.png b/configs/hl-fws1/hypr/images/jellyfin.png new file mode 100644 index 0000000..feb10f2 Binary files /dev/null and b/configs/hl-fws1/hypr/images/jellyfin.png differ diff --git a/configs/hl-fws1/hypr/images/settings.png b/configs/hl-fws1/hypr/images/settings.png new file mode 100644 index 0000000..95badd5 Binary files /dev/null and b/configs/hl-fws1/hypr/images/settings.png differ diff --git a/configs/hl-fws1/hypr/skygqts-carousel.json b/configs/hl-fws1/hypr/skygqts-carousel.json new file mode 100644 index 0000000..a7665a9 --- /dev/null +++ b/configs/hl-fws1/hypr/skygqts-carousel.json @@ -0,0 +1,35 @@ +{ + "autoStart": true, + "apps": [ + { + "name": "Sosnovsky Video", + "image": "~/.config/hypr/images/jellyfin.png", + "exec": ["chromium", "--app=http://bigbox1.lab.internal:8096"] + }, + { + "name": "Netflix", + "image": "~/.config/hypr/images/Netflix.svg", + "exec": ["chromium", "--app=https://www.netflix.com"] + }, + { + "name": "Paramount+", + "image": "https://www.paramountplus.com/assets/pplus/PPlus_Logo_1200x630_BLUE.png", + "exec": ["chromium", "--app=https://www.paramountplus.com"] + }, + { + "name": "Prime Video", + "image": "https://m.media-amazon.com/images/G/01/digital/video/DVUI/favicons/mstile-310x150.png", + "exec": ["chromium", "--app=https://www.primevideo.com"] + }, + { + "name": "Chromium", + "image": "~/.config/hypr/images/Chromium.svg", + "exec": ["chromium"] + }, + { + "name": "Settings", + "image": "~/.config/hypr/images/settings.png", + "exec": ["dms", "ipc", "call", "settings", "toggle"] + } + ] +} diff --git a/flake.lock b/flake.lock index 394655b..cd70400 100644 --- a/flake.lock +++ b/flake.lock @@ -163,11 +163,11 @@ ] }, "locked": { - "lastModified": 1786695136, - "narHash": "sha256-7MqeyKcuBLVTHQHLKNKnoFVVYye+7NesBjNTuayeJ+c=", + "lastModified": 1789051356, + "narHash": "sha256-BJyQh9V3y2oVT6z9xkwbqdBznBNtY8Pq2WMYV7fRvZA=", "owner": "patrickjaja", "repo": "claude-desktop-extra", - "rev": "548854c1124a9c64d81e642859bb222c62e99d75", + "rev": "ce139de76c00aab7a47914b63e7a0b8d1592b7e2", "type": "github" }, "original": { @@ -191,6 +191,22 @@ "type": "github" } }, + "dank-qml-common": { + "flake": false, + "locked": { + "lastModified": 1788376015, + "narHash": "sha256-/tT8rTznLADndTwLBzdgzzgfJH1ZhYQibYo5v/F8U+U=", + "owner": "AvengeMedia", + "repo": "dank-qml-common", + "rev": "26396ce432d6c71c3f5367438f96f4a8d667e160", + "type": "github" + }, + "original": { + "owner": "AvengeMedia", + "repo": "dank-qml-common", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -294,17 +310,18 @@ }, "dms": { "inputs": { + "dank-qml-common": "dank-qml-common", "flake-compat": "flake-compat_2", "nixpkgs": [ "nixpkgs-unstable" ] }, "locked": { - "lastModified": 1785111455, - "narHash": "sha256-aTNuC9NDBnYAeEtFsleeUwmGX3AZlKOutbl+LQRPkmQ=", + "lastModified": 1788959433, + "narHash": "sha256-MAbxGEomcpGomFfw+WYurNkSKBIh7PKEc1U5OV0X6oU=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "069ddab041c738236a8910e4c39b65d9628d3018", + "rev": "fe293b7379a51f62a4db7043fc09df71f78e72ef", "type": "github" }, "original": { @@ -559,11 +576,11 @@ ] }, "locked": { - "lastModified": 1784288435, - "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=", + "lastModified": 1788267358, + "narHash": "sha256-nt+lUqYVpc9Y6JeMd2WmXzCDojasdadKo0mWcluvY2Y=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9", + "rev": "27555e2624241fb116b49095df4caaee85a25691", "type": "github" }, "original": { @@ -639,11 +656,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1788910531, - "narHash": "sha256-IfO2SVreHPRwWmRMR2mgd1ffuP67TxLsR7YrcC4z/EU=", + "lastModified": 1789133212, + "narHash": "sha256-OBfmEiwe5z+E9jESNsg3viqkwTBVlTaBh5WbArdF7oo=", "owner": "herdrdev", "repo": "herdr", - "rev": "b9ce96869e89937278d673d70ae4c135dd318469", + "rev": "cd7edeb06048892ce6d6bb1a9dc37b9af494e966", "type": "github" }, "original": { @@ -655,6 +672,7 @@ "hermes-agent": { "inputs": { "flake-parts": "flake-parts_2", + "home-manager": "home-manager_2", "nixpkgs": "nixpkgs_5", "npm-lockfile-fix": "npm-lockfile-fix", "pyproject-build-systems": "pyproject-build-systems", @@ -662,11 +680,11 @@ "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1786887518, - "narHash": "sha256-vKQZoNk86Sp7tb2AAAECE38tXF0fmQT7nK4KcB+0WHE=", + "lastModified": 1789135847, + "narHash": "sha256-uoD5wzQPRBANRJ9WWAoW+tvPdxx/JA2QcfkGBlq2qnI=", "owner": "NousResearch", "repo": "hermes-agent", - "rev": "7095e23eb2066fe9a2f93b99cdbfe0e2b5ece397", + "rev": "0b8daf30aae1d0b129ede9b857cac2158eb50324", "type": "github" }, "original": { @@ -699,15 +717,36 @@ "home-manager_2": { "inputs": { "nixpkgs": [ + "hermes-agent", "nixpkgs" ] }, "locked": { - "lastModified": 1785119570, - "narHash": "sha256-Rgs2xKnGLFWQscxUaXX07oyZeuMDOHEbqDOsgliLFGM=", + "lastModified": 1786487128, + "narHash": "sha256-ad60hrRVhH/bo3Jl1YLzO+QcS3mUNZr9LNJdzhMO2P4=", "owner": "nix-community", "repo": "home-manager", - "rev": "d4fd24667c8cbef124bb70a20380cab75ec8474d", + "rev": "f404edbfa4117810c96b97048299242fc50e5362", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_3": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1788642154, + "narHash": "sha256-sPpQFVaFTDqO/4vvCAhuAhqTgqN/ygu+9eJcs5eB0js=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "fd0956c99c41ae3c13a73a638f1f7e963aebc4ab", "type": "github" }, "original": { @@ -1008,11 +1047,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1786644260, - "narHash": "sha256-whKdDsmN1xRgmafBzAth/Rq7nKHuZ1OAk+AuKes4ZM8=", + "lastModified": 1788960399, + "narHash": "sha256-SOr8P3nkyFfgnXtGPNamZ8BqWAdedG/K7PmFSmVBZi0=", "owner": "hyprwm", "repo": "hyprlauncher", - "rev": "bcb061197be7a01452acc69deddf9e2cb5dd6c4f", + "rev": "339be04ba0fa8cde392dd0bae85cb23bf09212a5", "type": "github" }, "original": { @@ -1337,11 +1376,11 @@ ] }, "locked": { - "lastModified": 1786852476, - "narHash": "sha256-IM5CYtf86W4w8eUPpKcY/LpdHElmVBtJhaKnoTKxZEA=", + "lastModified": 1788680125, + "narHash": "sha256-amGSoDobwmp4CFvCn841ws2iuitus+HUJdD/gKgsrJA=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "c7962dc97b45129df8d751bedaf37beb5a17706e", + "rev": "116ad1c2adb642405ef8916f6a94c8626f971344", "type": "github" }, "original": { @@ -1355,11 +1394,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1786867632, - "narHash": "sha256-ez+ubZlA1RtdjCB18a6zJ9M4u8qoPDy08EcnsW5M3Xw=", + "lastModified": 1789127271, + "narHash": "sha256-vL/Fpo7Zxa7wvO8V5FAToUBvP+K3XsMB1wUglTtd/J0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ff17823245ab9ff7bcae6acf950bd89cba82c38c", + "rev": "24cfdc1f9344b90a1eee329a3906e2f39f4d0f1e", "type": "github" }, "original": { @@ -1419,12 +1458,12 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1786599213, - "narHash": "sha256-yNJd40f11EzXBjSByCB7IPpeFFAdeoSKKM67dGkfFoU=", - "rev": "0e251e24a4f24e036a084b6b4b2d2491af4167f4", - "revCount": 1053317, + "lastModified": 1789006805, + "narHash": "sha256-xB8mKMOx1IA9vTDNLmJZ6n4wCMq/cuWBBOzGCRnqxrU=", + "rev": "8ce4ef6cb6f871616146b9fe26d2a5ae594e94fe", + "revCount": 1070770, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.1053317%2Brev-0e251e24a4f24e036a084b6b4b2d2491af4167f4/019ffab9-5757-7122-a14d-d75093644390/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.1070770%2Brev-8ce4ef6cb6f871616146b9fe26d2a5ae594e94fe/01a08a9d-0319-7011-9335-3ce05f6c241f/source.tar.gz" }, "original": { "type": "tarball", @@ -1540,12 +1579,12 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1786711500, - "narHash": "sha256-QvnceIGTBeDvDd9oCn+GvdsnkquliuwbVgpiRH68qaQ=", - "rev": "02e08985a27c65ffd33d434eeb2e660a2e4dc84d", - "revCount": 1011966, + "lastModified": 1789009968, + "narHash": "sha256-GB16oaxpsrnGNnGIE+0uYBqMRzB9X6FYDUvjvnJAYew=", + "rev": "d58a46e3bc02d91ebe04667f8397752a749c0024", + "revCount": 1013789, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2605.1011966%2Brev-02e08985a27c65ffd33d434eeb2e660a2e4dc84d/01a003f1-59bd-7782-b0ed-5cbf8697f61e/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2605.1013789%2Brev-d58a46e3bc02d91ebe04667f8397752a749c0024/01a08c66-89e7-7412-a065-b78992b3113a/source.tar.gz" }, "original": { "type": "tarball", @@ -1559,11 +1598,11 @@ ] }, "locked": { - "lastModified": 1786892487, - "narHash": "sha256-zNSXD0iT4o9W99CJQvb02qUCuRGWMYz+RV1uFELt1qs=", + "lastModified": 1789120272, + "narHash": "sha256-NO+3iOEW9Xztq6/07eBuzofvhV+WA15pKQZ5OAevxPY=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "2fbc93e021d601c49f83366e6a99e78fd3ebcfef", + "rev": "8b68a3094595b9b586919d3f526a8bbad18845a2", "type": "github" }, "original": { @@ -1724,7 +1763,7 @@ "git-hooks": "git-hooks", "herdr": "herdr", "hermes-agent": "hermes-agent", - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "hyprland": "hyprland", "hyprlauncher": "hyprlauncher", "nix-darwin": "nix-darwin", @@ -1734,6 +1773,7 @@ "nixpkgs": "nixpkgs_9", "nixpkgs-unstable": "nixpkgs-unstable", "noctalia": "noctalia", + "skygqts": "skygqts", "stylix": "stylix", "systems": "systems_6", "tether": "tether" @@ -1777,6 +1817,26 @@ "type": "github" } }, + "skygqts": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1789155631, + "narHash": "sha256-a41FlYSbWsIv2qXO6NOmPPNpxwUpCTuDk/r/Gr9wrYs=", + "ref": "refs/heads/main", + "rev": "ca9047901ad587772daa64fc6b0403e8607e6f2a", + "revCount": 9, + "type": "git", + "url": "ssh://gitea@minipc1.lab.internal:22/ari/skygqts.git" + }, + "original": { + "type": "git", + "url": "ssh://gitea@minipc1.lab.internal:22/ari/skygqts.git" + } + }, "stylix": { "inputs": { "base16": "base16", @@ -1908,11 +1968,11 @@ ] }, "locked": { - "lastModified": 1788494641, - "narHash": "sha256-3AV6UCAPw3A2bYXvxHN2xfcOk0Ch/OzYKCuaVCgg83g=", + "lastModified": 1789105799, + "narHash": "sha256-d4jugzSbsLnH7p0DDg8yHaWz3l3c1XWyN40IUYNkKaE=", "owner": "zackb", "repo": "tether", - "rev": "530d219dcbea42cbea116cc307f6a7b751bafbbc", + "rev": "c02c331ab94cae7eab48ed35e29f20f67f7d54a7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d90b2b6..1e6c571 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,8 @@ { inputs = { + # my apps + skygqts.url = "git+ssh://gitea@minipc1.lab.internal:22/ari/skygqts.git"; + skygqts.inputs.nixpkgs.follows = "nixpkgs"; # Hardware nixos-hardware.url = "github:NixOS/nixos-hardware/master"; systems.url = "github:nix-systems/default"; @@ -74,6 +77,7 @@ }; outputs = { self + , skygqts , nixpkgs-unstable , flox , determinate @@ -130,6 +134,7 @@ nix-index-database hermes-agent claude-desktop + skygqts flox determinate tether diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 333ac6f..3fc4da7 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -88,7 +88,7 @@ in services.tailscale.enable = true; services.tailscale.extraDaemonFlags = [ "--statedir=/var/lib/tailscale" ]; # Desktop Env - DankGreeter - programs.dank-material-shell.greeter = { + services.displayManager.dms-greeter = { enable = true; compositor.name = "niri"; configHome = "/home/${user.name}"; @@ -152,6 +152,8 @@ in f3 nixd kdePackages.qtdeclarative + piper-tts + ffmpeg # Work postgresql @@ -249,6 +251,8 @@ in herdr + # My apps + skygqts ]); services.usbmuxd.enable = true; diff --git a/hosts/hl-fwdesk.nix b/hosts/hl-fwdesk.nix index b47f90b..63c62df 100644 --- a/hosts/hl-fwdesk.nix +++ b/hosts/hl-fwdesk.nix @@ -126,7 +126,7 @@ in # Tailscale services.tailscale.enable = true; # Desktop Env - DankGreeter - programs.dank-material-shell.greeter = { + services.displayManager.dms-greeter = { enable = true; compositor.name = "hyprland"; configHome = "/home/ari"; @@ -137,6 +137,10 @@ in enable = true; user = "ari"; }; + # home manager - only configure if skyg.user.enable is true + home-manager.users.${user.name} = lib.mkIf config.skyg.user.enable { + services.blueman-applet.enable = true; + }; # Firmware updater services.fwupd.enable = true; # Bluetooth @@ -170,6 +174,9 @@ in # Hermes gateway - Signal bridge (used to link the device + run the daemon) signal-cli + + # bluetooth + blueman ]); services.usbmuxd.enable = true; # Steam diff --git a/hosts/hl-fws1.nix b/hosts/hl-fws1.nix index 933c106..112f5ce 100644 --- a/hosts/hl-fws1.nix +++ b/hosts/hl-fws1.nix @@ -43,7 +43,7 @@ boot.tmp.useTmpfs = true; # Greeter - programs.dank-material-shell.greeter = { + services.displayManager.dms-greeter = { enable = true; compositor.name = "hyprland"; configHome = "/home/${config.skyg.user.name}"; @@ -53,4 +53,9 @@ user = config.skyg.user.name; }; services.displayManager.defaultSession = "hyprland"; + + # environment + environment.systemPackages = with pkgs; [ + skygqts + ]; } diff --git a/hosts/hl-pi1.nix b/hosts/hl-pi1.nix index 7eba7ed..dc02402 100644 --- a/hosts/hl-pi1.nix +++ b/hosts/hl-pi1.nix @@ -57,7 +57,7 @@ # SD image has no swap partition; use compressed RAM swap instead. zramSwap.enable = true; - programs.dank-material-shell.greeter = { + services.displayManager.dms-greeter = { enable = true; compositor.name = "hyprland"; configHome = "/home/${config.skyg.user.name}"; diff --git a/hosts/hl-pi2.nix b/hosts/hl-pi2.nix index 70b91a4..87f863f 100644 --- a/hosts/hl-pi2.nix +++ b/hosts/hl-pi2.nix @@ -40,7 +40,7 @@ boot.kernelParams = [ "console=ttyS0,115200n8" "console=tty0" ]; zramSwap.enable = true; - programs.dank-material-shell.greeter = { + services.displayManager.dms-greeter = { enable = true; compositor.name = "hyprland"; configHome = "/home/${config.skyg.user.name}"; diff --git a/modules/core/default.nix b/modules/core/default.nix index 385eaf8..800ba00 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -1,4 +1,4 @@ -{ lib, herdr, flox, claude-desktop, ... }: +{ lib, herdr, flox, claude-desktop, skygqts, ... }: { imports = [ ./user.nix @@ -35,6 +35,7 @@ herdr = herdr.packages.${final.system}.default; # flox (flox/flox) — see flake.nix input. flox_dev = flox.packages.${final.system}.default; + skygqts = skygqts.packages.${final.system}.default; }) (final: prev: { pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [ diff --git a/modules/nixos/desktop/tiler/default.nix b/modules/nixos/desktop/tiler/default.nix index e3754c0..ff34d0b 100644 --- a/modules/nixos/desktop/tiler/default.nix +++ b/modules/nixos/desktop/tiler/default.nix @@ -46,6 +46,8 @@ in services.gnome.gcr-ssh-agent.enable = false; # use standard SSH agent instead security.pam.services.greetd = { enableGnomeKeyring = true; + fprintAuth = true; + u2fAuth = true; text = lib.mkDefault '' auth include login account include login