diff --git a/flake.lock b/flake.lock index 73fee5a..acda0ed 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ ] }, "locked": { - "lastModified": 1731274291, - "narHash": "sha256-cZ0QMpv5p2a6WEE+o9uu0a4ma6RzQDOQTbm7PbixWz8=", + "lastModified": 1731746438, + "narHash": "sha256-f3SSp1axoOk0NAI7oFdRzbxG2XPBSIXC+/DaAXnvS1A=", "owner": "nix-community", "repo": "disko", - "rev": "486250f404f4a4f4f33f8f669d83ca5f6e6b7dfc", + "rev": "cb64993826fa7a477490be6ccb38ba1fa1e18fa8", "type": "github" }, "original": { @@ -296,11 +296,11 @@ ] }, "locked": { - "lastModified": 1730814269, - "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "d70155fdc00df4628446352fc58adc640cd705c2", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1731235328, - "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", + "lastModified": 1731832479, + "narHash": "sha256-icDDuYwJ0avTMZTxe1qyU/Baht5JOqw4pb5mWpR+hT0=", "owner": "nix-community", "repo": "home-manager", - "rev": "60bb110917844d354f3c18e05450606a435d2d10", + "rev": "5056a1cf0ce7c2a08ab50713b6c4af77975f6111", "type": "github" }, "original": { @@ -577,11 +577,11 @@ ] }, "locked": { - "lastModified": 1731284192, - "narHash": "sha256-+j6clqTmoM05sGkoSUFg2yMYJqmQhJkgLD3MBy7/S/A=", + "lastModified": 1731842377, + "narHash": "sha256-UN1TcbN9wfrXT7qkyv9t1wYgR0GuEcyIIMK55VuXyDM=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "6844f66deb364e804f9b875db3fc87ee14b52141", + "rev": "591995260069de8a4dcd5490a204a43f26151419", "type": "github" }, "original": { @@ -593,11 +593,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1731246444, - "narHash": "sha256-j7Ls3SaF8JzbaM2aU6ZqcHfyzqC+0F9pLiwZ+fwXgpo=", + "lastModified": 1731800171, + "narHash": "sha256-nw7SUV3FiDSHdtuq+LsJh8deSteNPtxeBfaITxIQAi8=", "owner": "neovim", "repo": "neovim", - "rev": "0e54931b99530cd58af0434e12c58fe6243acb64", + "rev": "9c718bc2bce53b5be45061bff940f99e50c8bfcb", "type": "github" }, "original": { @@ -615,11 +615,11 @@ ] }, "locked": { - "lastModified": 1731375802, - "narHash": "sha256-CvWPEzrl2EA3xrtg9X6K8aqV7T5r0SaDz6PLpGA0yIY=", + "lastModified": 1731808593, + "narHash": "sha256-dyMU//DLz1Zs1bl7jAZA6d68bXCRzTYim4JyrLFfqME=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "b873a123366b9a62f9262414ada8d83b03f1f0bf", + "rev": "ada86c417801a44c32b59374b1e0b3141826291a", "type": "github" }, "original": { @@ -658,11 +658,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1731087557, - "narHash": "sha256-W70xy7WFqA5940zhodAsGiC/nvqGwZ07YE34ObMK/po=", + "lastModified": 1731645784, + "narHash": "sha256-VBmrvzXm+jtvl9CKBvGjcMWfBx/FCtsbn/7D4//Ru2k=", "owner": "nix-community", "repo": "nixd", - "rev": "1cf9ec0a82bcac57c7c12b6378bd8c28513cd3a6", + "rev": "0f3c0c730e5cb9414f3b269dc9b36062a0e5236e", "type": "github" }, "original": { @@ -673,11 +673,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731403644, - "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=", + "lastModified": 1731797098, + "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f6581f1c3b137086e42a08a906bdada63045f991", + "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", "type": "github" }, "original": { @@ -732,29 +732,13 @@ "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1730602179, - "narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "type": "github" }, "original": { @@ -871,11 +855,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1731401702, - "narHash": "sha256-ochSeBlvsA4o6pMBpuaZA9IBkrV9mYLDRaNhgDXCmEw=", + "lastModified": 1731838571, + "narHash": "sha256-LOD43r5y2RYtz2VW0jMVetDwa4/FVGhQZU6d2J7HTrs=", "owner": "wamserma", "repo": "flake-programs-sqlite", - "rev": "d23aa07bbbcd8c3023334f95b1c970e708507db1", + "rev": "789da27c81e9db8ce43f74fe4b6a781321f650f6", "type": "github" }, "original": { @@ -940,11 +924,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1731378398, - "narHash": "sha256-a0QWaiX8+AJ9/XBLGMDy6c90GD7HzpxKVdlFwCke5Pw=", + "lastModified": 1731820690, + "narHash": "sha256-/hHFMTD+FGURXZ4JtfXoIgpy87zL505pVi6AL76Wc+U=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0ae9fc2f2fe5361837d59c0bdebbda176427111e", + "rev": "bbab2ab9e1932133b1996baa1dc00fefe924ca81", "type": "github" }, "original": { @@ -957,15 +941,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" + ] }, "locked": { - "lastModified": 1731364708, - "narHash": "sha256-HC0anOL+KmUQ2hdRl0AtunbAckasxrkn4VLmxbW/WaA=", + "lastModified": 1731854022, + "narHash": "sha256-lgOoC3t5Wp3LWgzIwhK0d6xfPgF6TaAzFzu9O4xVxpo=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4c91d52db103e757fc25b58998b0576ae702d659", + "rev": "0ec0d5d3c58ccafc622cb273e5458471931c65b6", "type": "github" }, "original": { diff --git a/home/modules/default.nix b/home/modules/default.nix index 017eab6..8d25b29 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -12,4 +12,5 @@ inputs: { "dunst" = import ./dunst inputs; "eww" = import ./wayland/eww inputs; "foot" = import ./foot inputs; + "way-displays" = import ./way-displays inputs; } diff --git a/home/modules/way-displays/default.nix b/home/modules/way-displays/default.nix new file mode 100644 index 0000000..3352bd0 --- /dev/null +++ b/home/modules/way-displays/default.nix @@ -0,0 +1,19 @@ +_:{ pkgs, ... }: +{ + home.packages = [ pkgs.way-displays ]; + + systemd.user.services.way-displays = { + Unit = { + Description = "way-displays"; + Documentation = [ "man:way-displays(1)" ]; + }; + + Service = { + ExecStart = "${pkgs.way-displays}/bin/way-displays"; + }; + + Install = { + WantedBy = [ "graphical-session.target" ]; + }; + }; +} diff --git a/home/modules/wayland/hyprland/default.nix b/home/modules/wayland/hyprland/default.nix index d041bb3..6e63f84 100644 --- a/home/modules/wayland/hyprland/default.nix +++ b/home/modules/wayland/hyprland/default.nix @@ -43,16 +43,7 @@ let gblast = lib.getExe pkgs.grimblast; wpctl = "${pkgs.wireplumber}/bin/wpctl"; - scripts = pkgs.callPackage ./scripts.nix { }; - workspaceConf = { monitor }: '' - workspace=1,persistent:true,monitor:${monitor} - workspace=2,persistent:true,on-created-empty:${lib.getExe scripts.wsNix},monitor:${monitor} - workspace=3,persistent:true,monitor:${monitor} - workspace=4,persistent:true,monitor:${monitor} - workspace=5,persistent:true,on-created-empty:firefox-beta -p 'sxm',monitor:${monitor} - workspace=6,persistent:true,on-created-empty:footclient -e btm,monitor:${monitor} - ''; in { imports = [ @@ -118,10 +109,6 @@ in bindel=,XF86AudioLowerVolume,exec,${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 5%- bindl=,XF86AudioMute,exec,${wpctl} set-mute @DEFAULT_AUDIO_SINK@ toggle - ${workspaceConf { monitor = "${scripts.extMonitor}"; }} - - exec-once=${lib.getExe scripts.monitorInit} - exec-once=${lib.getExe pkgs.hyprland-monitor-attached} ${lib.getExe scripts.monitorAdded} ${lib.getExe scripts.monitorRemoved} exec-once=${lib.getExe pkgs.hyprpaper} exec-once=${pkgs.pyprland}/bin/pypr exec-once=${pkgs.blueman}/bin/blueman-applet