diff --git a/flake.lock b/flake.lock index c4395ed..47a84c7 100644 --- a/flake.lock +++ b/flake.lock @@ -97,6 +97,21 @@ } }, "flake-compat_2": { + "locked": { + "lastModified": 1680531544, + "narHash": "sha256-8qbiDTYb1kGaDADRXTItpcMKQ1TeQVkuof6oEwHUvVA=", + "owner": "nix-community", + "repo": "flake-compat", + "rev": "95e78dc12268c5e4878621845c511077f3798729", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1673956053, @@ -112,6 +127,28 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nixpkgs-wayland", + "nix-eval-jobs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1680392223, + "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1629284811, @@ -142,6 +179,24 @@ "type": "github" } }, + "flake-utils_3": { + "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" + } + }, "grub2-themes": { "inputs": { "nixpkgs": [ @@ -304,6 +359,25 @@ "type": "github" } }, + "lib-aggregate": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1681214977, + "narHash": "sha256-pBaG4iKzF/YJQA06f87IZokB15Z13DYd6zsT/wlbWfI=", + "owner": "nix-community", + "repo": "lib-aggregate", + "rev": "19d70ca7a81956bd01a768297b84798f301e150f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "lib-aggregate", + "type": "github" + } + }, "neovim-flake": { "inputs": { "flake-utils": "flake-utils_2", @@ -350,6 +424,25 @@ "type": "github" } }, + "nix-eval-jobs": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1685435187, + "narHash": "sha256-2tSrjl16iHdG6FYMNKS+MdsIDrCWXuKQ0XRWcdbMdFg=", + "owner": "nix-community", + "repo": "nix-eval-jobs", + "rev": "a0e0808280535bc22ffde7d34ecad11014edd6a9", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-eval-jobs", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1684171562, @@ -366,6 +459,21 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1681001314, + "narHash": "sha256-5sDnCLdrKZqxLPK4KA8+f4A3YKO/u6ElpMILvX0g72c=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "367c0e1086a4eb4502b24d872cea2c7acdd557f4", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1683408522, @@ -382,7 +490,46 @@ "type": "github" } }, + "nixpkgs-wayland": { + "inputs": { + "flake-compat": "flake-compat_2", + "lib-aggregate": "lib-aggregate", + "nix-eval-jobs": "nix-eval-jobs", + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1685496381, + "narHash": "sha256-cWOujDYwKw/zs+FEuD3+/X6A5IGEFO4CXFrEvdKlM6o=", + "owner": "nix-community", + "repo": "nixpkgs-wayland", + "rev": "b978b691f2ef33b6416cea3cd91db65e2419fd18", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs-wayland", + "type": "github" + } + }, "nixpkgs_2": { + "locked": { + "lastModified": 1681347147, + "narHash": "sha256-B+hTioRc3Jdf4SJyeCiO0fW5ShIznJk2OTiW2vOV+mc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1a9d9175ecc48ecd033062fa09b1834d13ae9c69", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1679793451, "narHash": "sha256-JafTtgMDATE8dZOImBhWMA9RCn9AP8FVOpN+9K/tTlg=", @@ -427,6 +574,7 @@ "neovim-nightly-overlay": "neovim-nightly-overlay", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", + "nixpkgs-wayland": "nixpkgs-wayland", "nur": "nur", "rosepine-base16": "rosepine-base16", "slambda": "slambda", @@ -472,9 +620,9 @@ "stylix": { "inputs": { "base16": "base16", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1684436450, @@ -490,6 +638,21 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1667395993, diff --git a/flake.nix b/flake.nix index f87cd36..a1d3fc5 100644 --- a/flake.nix +++ b/flake.nix @@ -61,6 +61,10 @@ # Hyprland (available in nix unstable only atm) hyprland-contrib.url = "github:hyprwm/contrib"; hyprland-contrib.inputs.nixpkgs.follows = "nixpkgs-unstable"; + + # Contains a bunch of wayland stuff not on nixpkgs + nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; + nixpkgs-wayland.inputs.nixpkgs.follows = "nixpkgs-unstable"; }; # }}} @@ -180,10 +184,12 @@ nixConfig = { extra-substituters = [ "https://nix-community.cachix.org" # I think I need this for neovim-nightly? + "https://nixpkgs-wayland.cachix.org" ]; extra-trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA=" ]; }; # }}} diff --git a/home/features/wayland/default.nix b/home/features/wayland/default.nix index ba091cc..bbf59c2 100644 --- a/home/features/wayland/default.nix +++ b/home/features/wayland/default.nix @@ -1,9 +1,10 @@ # Common wayland stuff -{ lib, pkgs, upkgs, ... }: { +{ lib, pkgs, upkgs, inputs, ... }: { imports = [ ./wofi.nix ./dunst.nix + ./wlsunset.nix ../desktop/wezterm # Default hyprland terminal ]; @@ -49,6 +50,7 @@ wl-ocr # Custom ocr script wl-clipboard # Clipboard manager wlogout # Nice logout script + wlsunset # Day/night gamma display adjustments # REASON: not available on stable yet upkgs.hyprpicker # Color picker diff --git a/home/features/wayland/wlsunset.nix b/home/features/wayland/wlsunset.nix new file mode 100644 index 0000000..73bc326 --- /dev/null +++ b/home/features/wayland/wlsunset.nix @@ -0,0 +1,9 @@ +{ + services.wlsunset = { + enable = true; + + # Random Netherlands coordinates + latitude = "53.2"; + longitude = "6.5"; + }; +} diff --git a/hosts/nixos/tethys/default.nix b/hosts/nixos/tethys/default.nix index e77e616..6115559 100644 --- a/hosts/nixos/tethys/default.nix +++ b/hosts/nixos/tethys/default.nix @@ -25,6 +25,7 @@ # {{{ A few ad-hoc hardware settings hardware.opengl.enable = true; + # TODO: persistence of config hardware.opentabletdriver.enable = true; # }}} # {{{ A few ad-hoc programs