diff --git a/flake.lock b/flake.lock index ced0e464..a12d8395 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,23 @@ { "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -64,6 +82,28 @@ "type": "github" } }, + "newm": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ], + "pywmpkg": "pywmpkg" + }, + "locked": { + "lastModified": 1685880078, + "narHash": "sha256-tvaeY5DjzgfXFtOzpEZqUziaixInJXgJk6MK0ExQG/I=", + "owner": "~atha", + "repo": "newm-atha", + "rev": "9c075588b7486df885eb85fbf2861498bedbdd39", + "type": "sourcehut" + }, + "original": { + "owner": "~atha", + "repo": "newm-atha", + "type": "sourcehut" + } + }, "nixpkgs": { "locked": { "lastModified": 1687681650, @@ -80,14 +120,55 @@ "type": "github" } }, + "pywmpkg": { + "inputs": { + "flake-utils": [ + "newm", + "flake-utils" + ], + "nixpkgs": [ + "newm", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1683389971, + "narHash": "sha256-HI4jkvH+CCxSTDFcJ0R69tV7dD34NMFklGFDStU3uHo=", + "owner": "~atha", + "repo": "pywm-atha", + "rev": "4bfa3c75ba6678aeed8b3b33b2c4f43453d4319a", + "type": "sourcehut" + }, + "original": { + "owner": "~atha", + "repo": "pywm-atha", + "type": "sourcehut" + } + }, "root": { "inputs": { "home-manager": "home-manager", "hyprland": "hyprland", + "newm": "newm", "nixpkgs": "nixpkgs", "wallpapers": "wallpapers" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "wallpapers": { "locked": { "lastModified": 1687523055, diff --git a/flake.nix b/flake.nix index e536de2f..b1d8f8eb 100644 --- a/flake.nix +++ b/flake.nix @@ -11,6 +11,10 @@ url = "github:hyprwm/Hyprland"; inputs.nixpkgs.follows = "nixpkgs"; }; + newm = { + url = "sourcehut:~atha/newm-atha"; + inputs.nixpkgs.follows = "nixpkgs"; + }; wallpapers.url = "git+https://git.xenia.me.uk/xenia/wallpapers.git"; }; diff --git a/users/elitherl/Ronin.nix b/users/elitherl/Ronin.nix index dff10fea..12d56f85 100644 --- a/users/elitherl/Ronin.nix +++ b/users/elitherl/Ronin.nix @@ -17,16 +17,12 @@ in { ]; wayland.windowManager.hyprland.extraConfig = '' source=./common.conf - monitor = eDP-1,1920x1080,0x0,1.0 monitor = DP-3,1920x1200,1920x0,1.0 monitor = DP-4,1920x1080,3840x0,1.0,transform,1 bindl=,switch:Lid Switch,exec,check-laptop-lid-state bindl=,switch:Lid Switch,exec,swaylock exec = ${laptop-state}/bin/check-laptop-lid-state - - windowrule = workspace 3 silent, ^(teams-for-linux)$ - exec-once = teams-for-linux ''; programs.waybar.settings = { main."output" = "!DP-4";