diff --git a/devices/nas/default.nix b/devices/nas/default.nix index 6eb1075..f657727 100644 --- a/devices/nas/default.nix +++ b/devices/nas/default.nix @@ -1,5 +1,5 @@ # WIP -{...}: { +{...}: { imports = [ ./modules/arion ./modules/borgbackup.nix diff --git a/devices/oksys/default.nix b/devices/oksys/default.nix index 06c78ee..d446520 100644 --- a/devices/oksys/default.nix +++ b/devices/oksys/default.nix @@ -1,5 +1,4 @@ # Not currently operational - {config, ...}: let inherit (config.vars) mainUser hostName; in { diff --git a/flake.lock b/flake.lock index 18a3b15..edadccd 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1708344886, - "narHash": "sha256-QY/EvjH0LhcsyQF/tZMJK1p5vjeteCWiXwpZ3cfY8ag=", + "lastModified": 1708472464, + "narHash": "sha256-dZzhUDumm6GlT3iokCycOQakWbH1IZANltu+gLdKtEY=", "owner": "Aylur", "repo": "ags", - "rev": "5c23b1e49341e1d11afb540b0bcb77015994b791", + "rev": "7465dcfa064c1aed1ca9c843f3a76c520c43a3d3", "type": "github" }, "original": { @@ -302,11 +302,11 @@ "gpu-screen-recorder-src": { "flake": false, "locked": { - "lastModified": 1708017850, - "narHash": "sha256-qEAPiXhuDDFSCU0tv/zyaITXMdHYesxhL9lRQDwJemI=", + "lastModified": 1708452244, + "narHash": "sha256-emvvOij2g91RQYgRMtReN69oVSERjiarVlVjS2S0xas=", "ref": "refs/heads/master", - "rev": "6f1caab3451ab135ab0653e41c018dd9c4dcc0d0", - "revCount": 492, + "rev": "d56db4acb43fa141dcd91bc2793e45dceb420603", + "revCount": 493, "type": "git", "url": "https://repo.dec05eba.com/gpu-screen-recorder" }, @@ -398,11 +398,11 @@ ] }, "locked": { - "lastModified": 1708354127, - "narHash": "sha256-upcUfwI5BDrM4AoyJNYqeatGcFMOVJc1zAlPNwe5EFk=", + "lastModified": 1708468433, + "narHash": "sha256-1Myq6NRTcH+aj1HlRXWPiUX2Cp5UYrZDDRufApW1wzk=", "owner": "matt1432", "repo": "home-manager", - "rev": "c64bd6d784d4eb4ab69fd5b9a6535ed9789c8c2f", + "rev": "bdf84b3cd08b38004fbfdfe9480664bb4d937d50", "type": "github" }, "original": { @@ -418,11 +418,11 @@ ] }, "locked": { - "lastModified": 1708306759, - "narHash": "sha256-VbdUnPNn1JSg3oka3zIIptqPrGpPqH5nFVlj/8hbQiM=", + "lastModified": 1708389842, + "narHash": "sha256-L7/xpfqHi4vugxy0rfGntX5SOEmOpzO1wlPA+bZzoLk=", "owner": "DreamMaoMao", "repo": "hycov", - "rev": "310603cd5998dd6e25a09b419e09f3d5cea6786c", + "rev": "6baf4d3040cb62c2c5f7fc8b9d794bde70d545d6", "type": "github" }, "original": { @@ -463,11 +463,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1708346705, - "narHash": "sha256-Zevax+tbcABJ9ZT/jOtJ8x4nudSAXhlBF0uIDSp8v4o=", + "lastModified": 1708452876, + "narHash": "sha256-UrFrNfIwd0pcCTZYc6RAppzvpL6icfhelFMgufY5vxU=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "df82625206b6faffbf02d5d802e857143d656239", + "rev": "13d985489788fa5349b3457d6eb1c19bad8f37e9", "type": "github" }, "original": { @@ -647,11 +647,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1708267826, - "narHash": "sha256-sv5L5iFnXa5wFxMXAEdW7Fcd6dFtAcvDETbKaS7JWZw=", + "lastModified": 1708461141, + "narHash": "sha256-5+pfsLMLFF1zbjy9thho/fWvNhDcvyrCzcEty7xn6e0=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "f961c5727fd812c2f0db1425d09ad55b35652587", + "rev": "2fe855d4d45cf88f4372ff150607761bbd8ff73c", "type": "github" }, "original": { @@ -707,11 +707,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1707326932, - "narHash": "sha256-sxZ7f5Ki6zaYAHQtQ+kulhRHjBj4Y5q3idPyVnnkZoQ=", + "lastModified": 1708375128, + "narHash": "sha256-GIASK5tYXM2TQIYwg5Kb+Kl+myZU6Mv9JT4u+gZbr30=", "owner": "nix-community", "repo": "nix-melt", - "rev": "06bce36cc2172b8d326e23e9595cd5f6a4fe5cd8", + "rev": "46d1c35ec006da573143c78b404a5e2bd834d997", "type": "github" }, "original": { @@ -851,11 +851,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1708345677, - "narHash": "sha256-kmay2PfLBNL1fDYDlKyYj7P/JSqyFeMKzA+PMhEPbJI=", + "lastModified": 1708457584, + "narHash": "sha256-bcu7zHORoF+xtkmiRZR/Ipu9ZMR8CBg0m/gQmDEYcW8=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "e01cca334cae6d9e852c8d657633695c681250fd", + "rev": "119087e7a51a320b699d97463f837b75dd5768fc", "type": "github" }, "original": { @@ -866,11 +866,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1708151420, - "narHash": "sha256-MGT/4aGCWQPQiu6COqJdCj9kSpLPiShgbwpbC38YXC8=", + "lastModified": 1708407374, + "narHash": "sha256-EECzarm+uqnNDCwaGg/ppXCO11qibZ1iigORShkkDf0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e2f00c83911461438301db0dba5281197fe4b3a", + "rev": "f33dd27a47ebdf11dc8a5eb05e7c8fbdaf89e73f", "type": "github" }, "original": { @@ -898,11 +898,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1708118438, - "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", + "lastModified": 1708296515, + "narHash": "sha256-FyF489fYNAUy7b6dkYV6rGPyzp+4tThhr80KNAaF/yY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", + "rev": "b98a4e1746acceb92c509bc496ef3d0e5ad8d4aa", "type": "github" }, "original": { @@ -930,11 +930,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1708118438, - "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", + "lastModified": 1708296515, + "narHash": "sha256-FyF489fYNAUy7b6dkYV6rGPyzp+4tThhr80KNAaF/yY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", + "rev": "b98a4e1746acceb92c509bc496ef3d0e5ad8d4aa", "type": "github" }, "original": { @@ -946,11 +946,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1689850295, - "narHash": "sha256-fUYf6WdQlhd2H+3aR8jST5dhFH1d0eE22aes8fNIfyk=", + "lastModified": 1708296515, + "narHash": "sha256-FyF489fYNAUy7b6dkYV6rGPyzp+4tThhr80KNAaF/yY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5df4d78d54f7a34e9ea1f84a22b4fd9baebc68d0", + "rev": "b98a4e1746acceb92c509bc496ef3d0e5ad8d4aa", "type": "github" }, "original": { @@ -1052,11 +1052,11 @@ }, "nur": { "locked": { - "lastModified": 1708353184, - "narHash": "sha256-BdSI+j49fZmMD9to0Har0wRvkN14x2Ipzipu6cQfp2A=", + "lastModified": 1708490325, + "narHash": "sha256-DGHWfk4nNZMja9lC3xRt49/ABvPp0xc6/TOgB77VqRI=", "owner": "nix-community", "repo": "NUR", - "rev": "0746498eec8c0a0b2ac98fe835d6af996b719531", + "rev": "d080c30d6c656d1bc59abb3f511b32d41f5486e9", "type": "github" }, "original": { @@ -1070,11 +1070,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1707326390, - "narHash": "sha256-LfC+reR+U2waKBjFVC8k0daJ5FYtg9CV20hMpi4hvQg=", + "lastModified": 1708368674, + "narHash": "sha256-QzvpuikAHHHN91pDkBDoUx3x8LJVHbk2JDwYXe87WCc=", "owner": "nix-community", "repo": "nurl", - "rev": "ab31c18a3bc3df673331b7c26cf75f8ba5e66b91", + "rev": "7f789ea2da9ff52724efb38df01ecda87704fc87", "type": "github" }, "original": { diff --git a/modules/hyprland/inputs.nix b/modules/hyprland/inputs.nix index 50f5b1d..9521452 100644 --- a/modules/hyprland/inputs.nix +++ b/modules/hyprland/inputs.nix @@ -25,9 +25,9 @@ }; in { wayland.windowManager.hyprland = { - device = map (d: (nagaConf d)) nagaProNames; - settings = { + device = map (d: (nagaConf d)) nagaProNames; + input = { kb_layout = xkb.layout; kb_variant = xkb.variant;