Nix flake update
Change-Id: I3d9539b048855de2263805cfa92cf5826ec7ec5e
Reviewed-on: https://git.clicks.codes/c/Chimera/NixFiles/+/509
Tested-by: Skyler Grey <minion@clicks.codes>
Reviewed-by: Samuel Shuert <coded@clicks.codes>
diff --git a/flake.lock b/flake.lock
index 78668a3..0d251f1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -117,11 +117,11 @@
]
},
"locked": {
- "lastModified": 1707607386,
- "narHash": "sha256-hj/RgQMTvCWQVInkZwiMMieumkfOjHXhtWhfuXHop/8=",
+ "lastModified": 1709204054,
+ "narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "bfd0ae29a86eff4603098683b516c67e22184511",
+ "rev": "2f3367769a93b226c467551315e9e270c3f78b15",
"type": "github"
},
"original": {
@@ -133,17 +133,18 @@
"hyprland": {
"inputs": {
"hyprland-protocols": "hyprland-protocols",
+ "hyprlang": "hyprlang",
"nixpkgs": "nixpkgs",
"systems": "systems",
"wlroots": "wlroots",
"xdph": "xdph"
},
"locked": {
- "lastModified": 1707586793,
- "narHash": "sha256-Vdf5QGzkZe6UUdVZ80YT78id7Yw5ww9Fku0rEyPAkCg=",
+ "lastModified": 1709243510,
+ "narHash": "sha256-e47KWaUGQc+JLUABYdG0eCeqY1fFf1xGvakpKcdOP9c=",
"owner": "hyprwm",
"repo": "Hyprland",
- "rev": "e4bb5fa4af1a6c36aab1c28651b5403dc4952f93",
+ "rev": "f590505daf90dfb4059289a906863b59663e70a6",
"type": "github"
},
"original": {
@@ -181,16 +182,19 @@
"inputs": {
"nixpkgs": [
"hyprland",
- "xdph",
"nixpkgs"
+ ],
+ "systems": [
+ "hyprland",
+ "systems"
]
},
"locked": {
- "lastModified": 1704287638,
- "narHash": "sha256-TuRXJGwtK440AXQNl5eiqmQqY4LZ/9+z/R7xC0ie3iA=",
+ "lastModified": 1708787654,
+ "narHash": "sha256-7ACgM3ZuAhPqurXHUvR2nWMRcnmzGGPjLK6q4DSTelI=",
"owner": "hyprwm",
"repo": "hyprlang",
- "rev": "6624f2bb66d4d27975766e81f77174adbe58ec97",
+ "rev": "0fce791ba2334aca183f2ed42399518947550d0d",
"type": "github"
},
"original": {
@@ -206,11 +210,11 @@
]
},
"locked": {
- "lastModified": 1707620986,
- "narHash": "sha256-XE0tCSkSVBeJDWhjFwusNInwAhrnp+TloUNUpvnTiLw=",
+ "lastModified": 1708830466,
+ "narHash": "sha256-nGKe3Y1/jkLR2eh1aRSVBtKadMBNv8kOnB52UXqRy6A=",
"owner": "nix-community",
"repo": "nix-index-database",
- "rev": "0cb4345704123492e6d1f1068629069413c80de0",
+ "rev": "f070c7eeec3bde8c8c8baa9c02b6d3d5e114d73b",
"type": "github"
},
"original": {
@@ -221,11 +225,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1708594753,
- "narHash": "sha256-c/gH7iXS/IYH9NrFOT+aJqTq+iEBkvAkpWuUHGU3+f0=",
+ "lastModified": 1709147990,
+ "narHash": "sha256-vpXMWoaCtMYJ7lisJedCRhQG9BSsInEyZnnG5GfY9tQ=",
"owner": "nixos",
"repo": "nixos-hardware",
- "rev": "3f7d0bca003eac1a1a7f4659bbab9c8f8c2a0958",
+ "rev": "33a97b5814d36ddd65ad678ad07ce43b1a67f159",
"type": "github"
},
"original": {
@@ -237,11 +241,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1706191920,
- "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=",
+ "lastModified": 1708807242,
+ "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "ae5c332cbb5827f6b1f02572496b141021de335f",
+ "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a",
"type": "github"
},
"original": {
@@ -253,11 +257,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1708210246,
- "narHash": "sha256-Q8L9XwrBK53fbuuIFMbjKvoV7ixfLFKLw4yV+SD28Y8=",
+ "lastModified": 1708819810,
+ "narHash": "sha256-1KosU+ZFXf31GPeCBNxobZWMgHsSOJcrSFA6F2jhzdE=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "69405156cffbdf2be50153f13cbdf9a0bea38e49",
+ "rev": "89a2a12e6c8c6a56c72eb3589982c8e2f89c70ea",
"type": "github"
},
"original": {
@@ -269,11 +273,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1707546158,
- "narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=",
+ "lastModified": 1709150264,
+ "narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0",
+ "rev": "9099616b93301d5cf84274b184a3a5ec69e94e08",
"type": "github"
},
"original": {
@@ -285,11 +289,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1708151420,
- "narHash": "sha256-MGT/4aGCWQPQiu6COqJdCj9kSpLPiShgbwpbC38YXC8=",
+ "lastModified": 1708751719,
+ "narHash": "sha256-0uWOKSpXJXmXswOvDM5Vk3blB74apFB6rNGWV5IjoN0=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "6e2f00c83911461438301db0dba5281197fe4b3a",
+ "rev": "f63ce824cd2f036216eb5f637dfef31e1a03ee89",
"type": "github"
},
"original": {
@@ -301,11 +305,11 @@
},
"nur": {
"locked": {
- "lastModified": 1707853532,
- "narHash": "sha256-ioduK+UsEs8YGYB/ZvVObvBXJHU5dgk1wEf5XPgxzsE=",
+ "lastModified": 1709248623,
+ "narHash": "sha256-Zmo187XIeCGlGHRcczf5tboirJghYesHmX2Eug8CQRY=",
"owner": "nix-community",
"repo": "nur",
- "rev": "26ae54f21cacae653cf9561c9afe5ba9496e80b6",
+ "rev": "14de3286e2081dbffaa7ebb595363227b6af2a74",
"type": "github"
},
"original": {
@@ -338,15 +342,16 @@
]
},
"locked": {
- "lastModified": 1696432959,
- "narHash": "sha256-oJQZv2MYyJaVyVJY5IeevzqpGvMGKu5pZcCCJvb+xjc=",
+ "lastModified": 1708862582,
+ "narHash": "sha256-uW5hZGSAqxl7kOIOb2UIetNMG5sDWppRp2xdTnvVDDk=",
"owner": "snowfallorg",
"repo": "lib",
- "rev": "92803a029b5314d4436a8d9311d8707b71d9f0b6",
+ "rev": "14411fe1db8722d9497e4cb30388bb998008869d",
"type": "github"
},
"original": {
"owner": "snowfallorg",
+ "ref": "dev",
"repo": "lib",
"type": "github"
}
@@ -357,11 +362,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1708500294,
- "narHash": "sha256-mvJIecY3tDKZh7297mqOtOuAvP7U1rqjfLNfmfkjFpU=",
+ "lastModified": 1708987867,
+ "narHash": "sha256-k2lDaDWNTU5sBVHanYzjDKVDmk29RHIgdbbXu5sdzBA=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "f6b80ab6cd25e57f297fe466ad689d8a77057c11",
+ "rev": "a1c8de14f60924fafe13aea66b46157f0150f4cf",
"type": "github"
},
"original": {
@@ -419,18 +424,18 @@
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
- "lastModified": 1706359063,
- "narHash": "sha256-5HUTG0p+nCJv3cn73AmFHRZdfRV5AD5N43g8xAePSKM=",
+ "lastModified": 1708558866,
+ "narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=",
"owner": "wlroots",
"repo": "wlroots",
- "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2",
+ "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5",
"type": "gitlab"
},
"original": {
"host": "gitlab.freedesktop.org",
"owner": "wlroots",
"repo": "wlroots",
- "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2",
+ "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5",
"type": "gitlab"
}
},
@@ -440,7 +445,10 @@
"hyprland",
"hyprland-protocols"
],
- "hyprlang": "hyprlang",
+ "hyprlang": [
+ "hyprland",
+ "hyprlang"
+ ],
"nixpkgs": [
"hyprland",
"nixpkgs"
@@ -451,11 +459,11 @@
]
},
"locked": {
- "lastModified": 1706145785,
- "narHash": "sha256-j9MP4fv2U/vdRKAXXc2gyMTmYwVnHP6kHx1/y6jprrU=",
+ "lastModified": 1708696469,
+ "narHash": "sha256-shh5wmpeYy3MmsBfkm4f76yPsBDGk6OLYRVG+ARy2F0=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
- "rev": "5a592647587cd20b9692a347df6939b6d371b3bb",
+ "rev": "1b713911c2f12b96c2574474686e4027ac4bf826",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index c9de99c..b886ce7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,7 +31,7 @@
nur.url = "github:nix-community/nur";
snowfall-lib = {
- url = "github:snowfallorg/lib";
+ url = "github:snowfallorg/lib/dev";
inputs.nixpkgs.follows = "nixpkgs";
};
@@ -42,21 +42,16 @@
outputs =
{ self, nixpkgs, ... }@inputs:
- let
- extraHomeModules = [
+ inputs.snowfall-lib.mkFlake {
+ inherit inputs;
+ src = ./.;
+
+ homes.modules = [
inputs.anyrun.homeManagerModules.default
inputs.hyprland.homeManagerModules.default
inputs.nur.hmModules.nur
inputs.nix-index-database.hmModules.nix-index
];
- in
- inputs.snowfall-lib.mkFlake {
- inherit inputs;
- src = ./.;
-
- homes.users."coded@shorthair".modules = extraHomeModules;
-
- homes.users."minion@greylag".modules = extraHomeModules;
systems.modules.nixos = [
inputs.hyprland.nixosModules.default
diff --git a/modules/home/eww/default.nix b/modules/home/eww/default.nix
index b9a60be..bb80448 100644
--- a/modules/home/eww/default.nix
+++ b/modules/home/eww/default.nix
@@ -2,7 +2,6 @@
{
programs.eww = {
enable = true;
- package = pkgs.eww-wayland;
configDir = ./config;
};
diff --git a/modules/nixos/audio/default.nix b/modules/nixos/audio/default.nix
index 0c1bfcd..a72c6a2 100644
--- a/modules/nixos/audio/default.nix
+++ b/modules/nixos/audio/default.nix
@@ -8,20 +8,19 @@
};
pulse.enable = true;
jack.enable = true;
- };
-
- environment.etc."pipewire/pipewire.conf.d/VirtualAudioDevice.conf".text = ''
- context.objects = [
- {
- factory = adapter
- args = {
- factory.name = support.null-audio-sink
- node.name = Microphone-Proxy
- node.description = Microphone
- media.class = Audio/Source/Virtual
- audio.posistion = MONO
+ extraConfig.pipewire."virtual-audio-device" = {
+ "context.objects" = [
+ {
+ factory = "adapter";
+ args = {
+ "factory.name" = "support.null-audio-sink";
+ "node.name" = "Microphone-Proxy";
+ "node.description" = "Microphone";
+ "media.class" = "Audio/Source/Virtual";
+ "audio.posistion" = "MONO";
+ };
}
- }
- ]
- '';
+ ];
+ };
+ };
}