diff --git a/flake.lock b/flake.lock index 96307c6..5e4e9cc 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1672740976, - "narHash": "sha256-r+th+iHy+nwnxH0OjyZynjA+3yP1m1yH7e6QLFFYw8Y=", + "lastModified": 1674359560, + "narHash": "sha256-gobqd75ujP/zFH6kSZNB3bA3YS4NMXWpZgMo1RAFEdk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "0505d6fa58724b02898c3ca2b7373dcf699ae3b5", + "rev": "184ae9c371a6251564e0b07391f7e9aaf310f002", "type": "github" }, "original": { @@ -51,16 +51,32 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1672616755, - "narHash": "sha256-dvwU2ORLpiP6ZMXL3CJ/qrqmtLBLF6VAc+Fois7Qfew=", + "lastModified": 1673362319, + "narHash": "sha256-Pjp45Vnj7S/b3BRpZEVfdu8sqqA6nvVjvYu59okhOyI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "87673d7c13a799d95ce25ff5dc7b9e15f01af2ea", + "rev": "82c16f1682cf50c01cb0280b38a1eed202b3fe9f", "type": "github" }, "original": { @@ -122,11 +138,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1672688183, - "narHash": "sha256-3sNEWKTg3XXVDnvzVatdyetiUQWL+ibJ1YkvxSk3PuM=", + "lastModified": 1674250603, + "narHash": "sha256-SBolFspxBHpW3hCCDNAFXUiO2mucmkVmf17UmSIK3Cs=", "owner": "nix-community", "repo": "home-manager", - "rev": "c1a830c8fabb13f95f51ecf48552f0a794d8718a", + "rev": "275ab728912006eecb549338a50f24f294a7cfb7", "type": "github" }, "original": { @@ -135,9 +151,52 @@ "type": "github" } }, + "hyprland": { + "inputs": { + "hyprland-protocols": "hyprland-protocols", + "nixpkgs": "nixpkgs_2", + "wlroots": "wlroots", + "xdph": "xdph" + }, + "locked": { + "lastModified": 1674403405, + "narHash": "sha256-FPOER3tINOEI+oWQGeiWLkpCudVJC3V8wk5cvP9857s=", + "owner": "hyprwm", + "repo": "Hyprland", + "rev": "cb98242ea7faff04dad3ae166aff7126184f17c5", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "Hyprland", + "type": "github" + } + }, + "hyprland-protocols": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1671839510, + "narHash": "sha256-+PY1qqJfmZzzROgcIY4I7AkCwpnC+qBIYk2eFoA9RWc=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "b8f55e02a328c47ed373133c52483bbfa20a1b75", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, "mailserver": { "inputs": { "blobs": "blobs", + "flake-compat": "flake-compat", "nixpkgs": [ "nixpkgs" ], @@ -145,11 +204,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1671659164, - "narHash": "sha256-DbpT+v1POwFOInbrDL+vMbYV3mVbTkMxmJ5j50QnOcA=", + "lastModified": 1671738303, + "narHash": "sha256-PRgqtaWf2kMSYqVmcnmhTh+UsC0RmvXRTr+EOw5VZUA=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "bc667fb6afc45f6cc2d118ab77658faf2227cffd", + "rev": "6d0d9fb966cc565a3df74d3b686f924c7615118c", "type": "gitlab" }, "original": { @@ -166,11 +225,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1672050722, - "narHash": "sha256-+6assS03GsJB5YpoUpBsh3irX5nBfLxLwB0EQzV2dlA=", + "lastModified": 1673620854, + "narHash": "sha256-kQruy/z1+82iq+7ySGdw6GScSXvILn91t/o+0tbRx9w=", "owner": "nbfc-linux", "repo": "nbfc-linux", - "rev": "e3cdbf5e59fdcd5693367179d53efa78ea3f4b44", + "rev": "c267469684d620e6055ec3382f247979704c90e9", "type": "github" }, "original": { @@ -189,11 +248,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1672728900, - "narHash": "sha256-VroAlqUj2N5wgbXpf47qaPdyI075AA1cgReTHFhA2a8=", + "lastModified": 1674285754, + "narHash": "sha256-7EKYM0Cdd0AOSQ4+lyLgLSTLOS4yRCgWqJfgMrOss/I=", "owner": "neovim", "repo": "neovim", - "rev": "4dd793a256fefb481159f9f93bf7572391e266de", + "rev": "7ef5e363d360f86c5d8d403e90ed256f4de798ec", "type": "github" }, "original": { @@ -225,16 +284,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1670047204, - "narHash": "sha256-5NcSGchQbl9DKMQ31qmgfscmrAg7qilJF/no2nBSRzs=", + "lastModified": 1673540789, + "narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "809f15f2e7fd66c3d3ba6aabffa946fbd67f93fc", + "rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-22_11": { @@ -272,27 +333,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1672633908, - "narHash": "sha256-sP0BMp4DprVCBjcTYPsTPwkJMsc45vM0FxHdDx6qE8U=", - "owner": "nixos", + "lastModified": 1673540789, + "narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "a4379d2b0deefedc8dba360897557707ea9ee9a7", + "rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1672633908, - "narHash": "sha256-sP0BMp4DprVCBjcTYPsTPwkJMsc45vM0FxHdDx6qE8U=", + "lastModified": 1674236650, + "narHash": "sha256-B4GKL1YdJnII6DQNNJ4wDW1ySJVx2suB1h/v4Ql8J0Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a4379d2b0deefedc8dba360897557707ea9ee9a7", + "rev": "cfb43ad7b941d9c3606fb35d91228da7ebddbfc5", "type": "github" }, "original": { @@ -304,15 +365,15 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1665296151, - "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=", - "owner": "NixOS", + "lastModified": 1671983799, + "narHash": "sha256-Z2Ro6hFPZHkBqkVXY5/aBUzxi5xizQGvuHQ9+T5B/ks=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "14ccaaedd95a488dd7ae142757884d8e125b3363", + "rev": "fad51abd42ca17a60fc1d4cb9382e2d79ae31836", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" @@ -320,16 +381,16 @@ }, "nvim-overlay": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "neovim-flake": "neovim-flake", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1672733667, - "narHash": "sha256-RHcgShzAHJhywtwCyz0woIUza8K78I31eZAo9AwZ8E8=", + "lastModified": 1674288814, + "narHash": "sha256-Mso2c8XcbMwL+r8BIuEU8WwVJiO6A0HVZHbRFQEd9og=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "adfef49a8d0c66eda55256a2b6d7b9d31e0bde29", + "rev": "4e7c0bc2a80f67e300906d090546f91b4c4c44db", "type": "github" }, "original": { @@ -343,10 +404,11 @@ "emacs-overlay": "emacs-overlay", "flake-parts": "flake-parts", "home-manager": "home-manager", + "hyprland": "hyprland", "mailserver": "mailserver", "nbfc": "nbfc", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nvim-overlay": "nvim-overlay", "rust-overlay": "rust-overlay" } @@ -354,14 +416,16 @@ "rust-overlay": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_4" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1672712534, - "narHash": "sha256-8S0DdMPcbITnlOu0uA81mTo3hgX84wK8S9wS34HEFY4=", + "lastModified": 1674354556, + "narHash": "sha256-vUuhf6VTW2hIdBGgivUZiAVkzByHji8TsTQGwS8Wh+s=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "69fb7bf0a8c40e6c4c197fa1816773774c8ac59f", + "rev": "a16fb5f08d16e33727c8303dabefd81f06cb64c7", "type": "github" }, "original": { @@ -414,6 +478,49 @@ "repo": "flake-utils", "type": "github" } + }, + "wlroots": { + "flake": false, + "locked": { + "host": "gitlab.freedesktop.org", + "lastModified": 1672824257, + "narHash": "sha256-SbYoZj57VlopTzI+OSW9jlgYxN1gI1KLg/s/HV+87eE=", + "owner": "wlroots", + "repo": "wlroots", + "rev": "5f264a7d6c8af27d41ff440c05262b022c055593", + "type": "gitlab" + }, + "original": { + "host": "gitlab.freedesktop.org", + "owner": "wlroots", + "repo": "wlroots", + "type": "gitlab" + } + }, + "xdph": { + "inputs": { + "hyprland-protocols": [ + "hyprland", + "hyprland-protocols" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1673116118, + "narHash": "sha256-eR0yDSkR2XYMesfdRWJs25kAdXET2mbNNHu5t+KUcKA=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "d479c846531fd0e1d2357c9588b8310a2b859ef2", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 364ea2d..e8dea20 100644 --- a/flake.nix +++ b/flake.nix @@ -3,18 +3,19 @@ inputs = { nixpkgs.url = github:nixos/nixpkgs/nixpkgs-unstable; + flake-parts.url = github:hercules-ci/flake-parts; home-manager = { url = github:nix-community/home-manager; inputs.nixpkgs.follows = "nixpkgs"; }; - flake-parts.url = github:hercules-ci/flake-parts; - nvim-overlay.url = github:nix-community/neovim-nightly-overlay; mailserver = { url = gitlab:simple-nixos-mailserver/nixos-mailserver; inputs.nixpkgs.follows = "nixpkgs"; }; - emacs-overlay.url = github:nix-community/emacs-overlay; - rust-overlay.url = github:oxalica/rust-overlay; + rust-overlay = { + url = github:oxalica/rust-overlay; + inputs.nixpkgs.follows = "nixpkgs"; + }; nix-gaming = { url = github:fufexan/nix-gaming; inputs.nixpkgs.follows = "nixpkgs"; @@ -23,6 +24,12 @@ url = github:nbfc-linux/nbfc-linux; inputs.nixpkgs.follows = "nixpkgs"; }; + emacs-overlay.url = github:nix-community/emacs-overlay; + nvim-overlay = { + url = github:nix-community/neovim-nightly-overlay; + inputs.nixpkgs.url = github:nixos/nixpkgs?rev=fad51abd42ca17a60fc1d4cb9382e2d79ae31836; + }; + hyprland.url = github:hyprwm/Hyprland; }; outputs = inputs@{ self, nixpkgs, ... }: diff --git a/home/natto/programs.nix b/home/natto/programs.nix index ee021f7..0e0e28e 100644 --- a/home/natto/programs.nix +++ b/home/natto/programs.nix @@ -24,5 +24,6 @@ go.enable = true; password-store.enable = true; direnv.enable = true; + foot.enable = false; }; } diff --git a/home/natto/wayland.nix b/home/natto/wayland.nix index a3a1138..6968b77 100644 --- a/home/natto/wayland.nix +++ b/home/natto/wayland.nix @@ -5,6 +5,15 @@ sway = { enable = true; }; + hyprland = { + enable = false; + xwayland = { + enable = true; + hidpi = true; + }; + nvidiaPatches = true; + }; }; }; + }