diff --git a/flake.lock b/flake.lock index b1d4b6e..005ac5c 100644 --- a/flake.lock +++ b/flake.lock @@ -142,6 +142,21 @@ } }, "flake-compat_2": { + "locked": { + "lastModified": 1717312683, + "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", + "owner": "nix-community", + "repo": "flake-compat", + "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -362,6 +377,24 @@ } }, "flake-utils_4": { + "inputs": { + "systems": "systems_5" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { "inputs": { "systems": [ "stylix", @@ -573,6 +606,25 @@ "type": "github" } }, + "lib-aggregate_2": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs-lib": "nixpkgs-lib_6" + }, + "locked": { + "lastModified": 1745151208, + "narHash": "sha256-DrWqBD3S5r+wcd9i339uctx8K9rpk4hk5f+vYEwhEhY=", + "owner": "nix-community", + "repo": "lib-aggregate", + "rev": "2b767b1c75e88222eeb3d1735d15da283d0307f9", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "lib-aggregate", + "type": "github" + } + }, "maomaowm": { "inputs": { "flake-parts": "flake-parts_2", @@ -702,17 +754,17 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1745314144, - "narHash": "sha256-3LTj3pOU2VIu59voAtHGnMfag6IMk7V/ba0pKkNnQeI=", + "lastModified": 1745476742, + "narHash": "sha256-5bfMdGLKqu/hm9QlZKXelcxG4XzwMXN4dF5DLshUtqg=", "owner": "YalTeR", "repo": "niri", - "rev": "4f60ded2c391cf5011a2fa31b2d9caaefebc5df3", + "rev": "9204719cd9c9145f6824bcc75485bcf7f7262468", "type": "github" }, "original": { "owner": "YalTeR", "repo": "niri", - "rev": "4f60ded2c391cf5011a2fa31b2d9caaefebc5df3", + "rev": "9204719cd9c9145f6824bcc75485bcf7f7262468", "type": "github" } }, @@ -824,6 +876,21 @@ "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" } }, + "nixpkgs-lib_6": { + "locked": { + "lastModified": 1745111456, + "narHash": "sha256-6k3oWdGcWOIzh3OQBkIf+HBU+xH5vbZtUhwzXEX4NWI=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "eab2ba94b72a8664e0fb92912160151d99db850e", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1744440957, @@ -876,6 +943,26 @@ "type": "github" } }, + "nixpkgs-wayland_2": { + "inputs": { + "flake-compat": "flake-compat_2", + "lib-aggregate": "lib-aggregate_2", + "nixpkgs": "nixpkgs_7" + }, + "locked": { + "lastModified": 1745499471, + "narHash": "sha256-aCoKnf90qe24Hqu00ASX73dJWyiQv7I89detce8Wc7A=", + "owner": "nix-community", + "repo": "nixpkgs-wayland", + "rev": "15c8cd0d5f737eb4b7bea99ede519f653cd13b94", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs-wayland", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1742800061, @@ -957,6 +1044,22 @@ } }, "nixpkgs_7": { + "locked": { + "lastModified": 1745391562, + "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { "locked": { "lastModified": 1744932701, "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", @@ -972,7 +1075,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1735554305, "narHash": "sha256-zExSA1i/b+1NMRhGGLtNfFGXgLtgo+dcuzHzaWA6w3Q=", @@ -1013,7 +1116,7 @@ "nur": { "inputs": { "flake-parts": "flake-parts_6", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "treefmt-nix": "treefmt-nix_3" }, "locked": { @@ -1055,7 +1158,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -1089,6 +1192,7 @@ "nixd": "nixd", "nixpkgs": "nixpkgs_6", "nixpkgs-stable": "nixpkgs-stable_2", + "nixpkgs-wayland": "nixpkgs-wayland_2", "nixvim": "nixvim", "nur": "nur", "stylix": "stylix", @@ -1123,8 +1227,8 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_4", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_5", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", @@ -1132,7 +1236,7 @@ "nixpkgs" ], "nur": "nur_2", - "systems": "systems_5", + "systems": "systems_6", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1228,6 +1332,21 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { @@ -1397,7 +1516,7 @@ }, "treefmt-nix_5": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1744961264, diff --git a/flake.nix b/flake.nix index fa3a266..5542ff4 100644 --- a/flake.nix +++ b/flake.nix @@ -54,7 +54,7 @@ }; flake-parts.url = "github:hercules-ci/flake-parts"; niri-unstable = { - url = "github:YalTeR/niri/4f60ded2c391cf5011a2fa31b2d9caaefebc5df3"; + url = "github:YalTeR/niri/9204719cd9c9145f6824bcc75485bcf7f7262468"; flake = false; }; niri = { @@ -82,5 +82,6 @@ treefmt-nix.url = "github:numtide/treefmt-nix"; agenix.url = "github:ryantm/agenix"; maomaowm.url = "github:DreamMaoMao/maomaowm"; + nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; }; } diff --git a/home/programs/desktop/default.nix b/home/programs/desktop/default.nix index 9b22668..ed7ddeb 100644 --- a/home/programs/desktop/default.nix +++ b/home/programs/desktop/default.nix @@ -6,8 +6,6 @@ ./mako.nix ./niri ./swhkd.nix - ./maomaowm - ./waycorner.nix ]; home.packages = with pkgs; [ swww diff --git a/home/programs/desktop/waycorner.nix b/home/programs/desktop/waycorner.nix deleted file mode 100644 index 0c13fbc..0000000 --- a/home/programs/desktop/waycorner.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.waycorner ]; - xdg.configFile."waycorner/config.toml".text = '' - [niri-overview] - enter_command = ["niri", "msg", "action", "toggle-overview"] - locations = ["top_right"] - size = 10 - margin = 20 - timeout_ms = 250 - color = "#FFFF0000" - - [niri-overview.output] - description = "" - ''; -} diff --git a/nix/substituters.nix b/nix/substituters.nix index 2d09644..bb1310a 100644 --- a/nix/substituters.nix +++ b/nix/substituters.nix @@ -9,6 +9,7 @@ "https://nix-community.cachix.org" "https://hyprland.cachix.org" "https://niri.cachix.org" + "https://nixpkgs-wayland.cachix.org" ]; trusted-public-keys = [ @@ -16,6 +17,7 @@ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964=" + "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA=" ]; }; } diff --git a/os/programs/default.nix b/os/programs/default.nix index 02bdef8..de268c0 100644 --- a/os/programs/default.nix +++ b/os/programs/default.nix @@ -5,8 +5,9 @@ ./niri.nix ./ai.nix ./swhkd.nix - ./maomaowm.nix - ./hellwm.nix - ./miracle-wm.nix + # ./maomaowm.nix + # ./hellwm.nix + # ./miracle-wm.nix + ./sway.nix ]; } diff --git a/os/programs/sway.nix b/os/programs/sway.nix new file mode 100644 index 0000000..30be2e9 --- /dev/null +++ b/os/programs/sway.nix @@ -0,0 +1,3 @@ +{ + programs.sway.enable = true; +} diff --git a/overlays/default.nix b/overlays/default.nix index 6273d28..948ac4a 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -19,6 +19,20 @@ runHook postInstall ''; }); + sway-unwrapped = + (prev.sway-unwrapped.overrideAttrs (oldAttrs: { + src = final.fetchFromGitHub { + owner = "dawsers"; + repo = "scroll"; + rev = "1bade4906068873259617f6f41a4ba93a3573fa3"; + hash = "sha256-QnCH98x9oRpGbikSHa68R9eqdgwWD/0p0Fai1aA7x+E="; + }; + patches = [ ]; + })).override + { inherit (inputs.nixpkgs-wayland.packages.${final.system}) wlroots; }; + sway = prev.sway.overrideAttrs (oldAttrs: { + passthru.providedSessions = [ "scroll" ]; + }); }; inherit (inputs.niri.overlays) niri;