diff --git a/flake.lock b/flake.lock index e72c3b4..960276c 100644 --- a/flake.lock +++ b/flake.lock @@ -6,19 +6,19 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-9Y4cvbAzeBwYc+5mFkT2CyENx8fNrBK3/ufajA252GE=", - "path": "/nix/store/5riq46pmlr0nxpkfvwlr2fnavb4y58vm-source/ags", + "narHash": "sha256-hU9uZ4UrSrBntg9vhwQUzn7nC3UTeIV1iC5uprGhj+Y=", + "path": "/nix/store/2wib07g228id8j6wfv1nl7y2q0r4ac4h-source/ags", "type": "path" }, "original": { - "path": "/nix/store/5riq46pmlr0nxpkfvwlr2fnavb4y58vm-source/ags", + "path": "/nix/store/2wib07g228id8j6wfv1nl7y2q0r4ac4h-source/ags", "type": "path" } }, "ags_2": { "inputs": { - "nixpkgs": "nixpkgs_5", - "systems": "systems_3" + "nixpkgs": "nixpkgs_2", + "systems": "systems" }, "locked": { "lastModified": 1727303518, @@ -34,6 +34,18 @@ "type": "github" } }, + "ags_3": { + "locked": { + "lastModified": 1, + "narHash": "sha256-2ot0F3pi7xXJgNLUy77moOxYP6nfuXK4MUivfHjkxRY=", + "path": "/nix/store/3xz2pay1byii9zmd5h0j9p2vckfwxm22-source/ags", + "type": "path" + }, + "original": { + "path": "/nix/store/3xz2pay1byii9zmd5h0j9p2vckfwxm22-source/ags", + "type": "path" + } + }, "aquamarine": { "inputs": { "hyprutils": [ @@ -79,6 +91,51 @@ "type": "github" } }, + "aquamarine_2": { + "inputs": { + "hyprutils": [ + "system", + "prgms", + "hyprland", + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "system", + "prgms", + "hyprland", + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "system", + "prgms", + "hyprland", + "hyprland", + "nixpkgs" + ], + "systems": [ + "system", + "prgms", + "hyprland", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1727261104, + "narHash": "sha256-rxDI7WrxIRV9it9mDCHcLa7xQykf1JloXnoXr5xQ8zI=", + "owner": "hyprwm", + "repo": "aquamarine", + "rev": "b82fdaff917582a9d568969e15e61b398c71e990", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "aquamarine", + "type": "github" + } + }, "bat": { "locked": { "lastModified": 1, @@ -107,19 +164,31 @@ "external": { "inputs": { "digital": "digital", - "lobster": "lobster", - "nixpkgs": "nixpkgs_2", - "swww": "swww", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1, + "narHash": "sha256-71q6+u+ztKLS1V8MHPbIYyENwCenJspceTrY4TbLLh0=", + "path": "/nix/store/qfvx4x0x7rs9wl3ncrxcnykbs3vw37qc-source/external", + "type": "path" + }, + "original": { + "path": "/nix/store/qfvx4x0x7rs9wl3ncrxcnykbs3vw37qc-source/external", + "type": "path" + } + }, + "external_2": { + "inputs": { "waveforms": "waveforms" }, "locked": { "lastModified": 1, - "narHash": "sha256-ZS+Lcib5PQIR1vRfD623acFXQVcCCxIbHhqK4ao13UM=", - "path": "/nix/store/hgnyccs9lwpgab7gkqrw5mifaqycfm27-source/external", + "narHash": "sha256-BWhHfDAKpNghzSyoO3dU1EPLxl/ADB654NKb3JORQFE=", + "path": "/nix/store/5xfq2prdddvm68wmpy8ibvd2nxp4ijl4-source/external", "type": "path" }, "original": { - "path": "/nix/store/hgnyccs9lwpgab7gkqrw5mifaqycfm27-source/external", + "path": "/nix/store/5xfq2prdddvm68wmpy8ibvd2nxp4ijl4-source/external", "type": "path" } }, @@ -151,22 +220,6 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "fzf": { "locked": { "lastModified": 1, @@ -238,18 +291,56 @@ "type": "github" } }, + "hyprcursor_2": { + "inputs": { + "hyprlang": [ + "system", + "prgms", + "hyprland", + "hyprland", + "hyprlang" + ], + "nixpkgs": [ + "system", + "prgms", + "hyprland", + "hyprland", + "nixpkgs" + ], + "systems": [ + "system", + "prgms", + "hyprland", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1727532803, + "narHash": "sha256-ZaZ7h7PY8mQc4vtGmVqWLAq9CAO02gHMyNR5yY8zDmM=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "b98726e431d4d3ed58bd58bee1047cdb81cec69f", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, "hyprland": { "inputs": { "hyprland": "hyprland_2" }, "locked": { "lastModified": 1, - "narHash": "sha256-WjMrH78r9Fb1Hbqw7cl7J1xpjaUV72Js5z1H0HqxLio=", - "path": "/nix/store/5riq46pmlr0nxpkfvwlr2fnavb4y58vm-source/hyprland", + "narHash": "sha256-PoIwfLB8FwRvchRfLuR5Zt1Xez/G35ivu7y3ne4BrVo=", + "path": "/nix/store/2wib07g228id8j6wfv1nl7y2q0r4ac4h-source/hyprland", "type": "path" }, "original": { - "path": "/nix/store/5riq46pmlr0nxpkfvwlr2fnavb4y58vm-source/hyprland", + "path": "/nix/store/2wib07g228id8j6wfv1nl7y2q0r4ac4h-source/hyprland", "type": "path" } }, @@ -317,6 +408,70 @@ "type": "github" } }, + "hyprland-protocols_3": { + "inputs": { + "nixpkgs": [ + "system", + "prgms", + "hyprland", + "hyprland", + "nixpkgs" + ], + "systems": [ + "system", + "prgms", + "hyprland", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1727451107, + "narHash": "sha256-qV9savtHwmZUa0eJE294WYJjKPGB2+bJhwByFShsVyo=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "6b3261ee13a6d2b99de79a31d352f6996e35bde3", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprland-protocols_4": { + "inputs": { + "nixpkgs": [ + "system", + "prgms", + "hyprland", + "hyprland", + "xdph", + "nixpkgs" + ], + "systems": [ + "system", + "prgms", + "hyprland", + "hyprland", + "xdph", + "systems" + ] + }, + "locked": { + "lastModified": 1721326555, + "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, "hyprland_2": { "inputs": { "aquamarine": "aquamarine", @@ -325,8 +480,8 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_6", - "systems": "systems_4", + "nixpkgs": "nixpkgs_3", + "systems": "systems_2", "xdph": "xdph" }, "locked": { @@ -345,6 +500,49 @@ "url": "https://github.com/hyprwm/Hyprland" } }, + "hyprland_3": { + "inputs": { + "hyprland": "hyprland_4" + }, + "locked": { + "lastModified": 1, + "narHash": "sha256-QuKWRep1ec7TFDaCFoyMxQUplx3NRtF2kn9npN+MN00=", + "path": "/nix/store/3xz2pay1byii9zmd5h0j9p2vckfwxm22-source/hyprland", + "type": "path" + }, + "original": { + "path": "/nix/store/3xz2pay1byii9zmd5h0j9p2vckfwxm22-source/hyprland", + "type": "path" + } + }, + "hyprland_4": { + "inputs": { + "aquamarine": "aquamarine_2", + "hyprcursor": "hyprcursor_2", + "hyprland-protocols": "hyprland-protocols_3", + "hyprlang": "hyprlang_2", + "hyprutils": "hyprutils_2", + "hyprwayland-scanner": "hyprwayland-scanner_2", + "nixpkgs": "nixpkgs_8", + "systems": "systems_3", + "xdph": "xdph_2" + }, + "locked": { + "lastModified": 1727860939, + "narHash": "sha256-ZRYHQ/ZduCPxthuCFDYSDjKoSReYZy95rSm6ut8l/qE=", + "ref": "refs/heads/main", + "rev": "e2426942e5716a742ea353d2a1de7d7760fbbb41", + "revCount": 5286, + "submodules": true, + "type": "git", + "url": "https://github.com/hyprwm/Hyprland" + }, + "original": { + "submodules": true, + "type": "git", + "url": "https://github.com/hyprwm/Hyprland" + } + }, "hyprlang": { "inputs": { "hyprutils": [ @@ -383,6 +581,44 @@ "type": "github" } }, + "hyprlang_2": { + "inputs": { + "hyprutils": [ + "system", + "prgms", + "hyprland", + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "system", + "prgms", + "hyprland", + "hyprland", + "nixpkgs" + ], + "systems": [ + "system", + "prgms", + "hyprland", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1725997860, + "narHash": "sha256-d/rZ/fHR5l1n7PeyLw0StWMNLXVU9c4HFyfskw568so=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "dfeb5811dd6485490cce18d6cc1e38a055eea876", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -414,6 +650,37 @@ "type": "github" } }, + "hyprutils_2": { + "inputs": { + "nixpkgs": [ + "system", + "prgms", + "hyprland", + "hyprland", + "nixpkgs" + ], + "systems": [ + "system", + "prgms", + "hyprland", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1727300645, + "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, "hyprwayland-scanner": { "inputs": { "nixpkgs": [ @@ -445,6 +712,37 @@ "type": "github" } }, + "hyprwayland-scanner_2": { + "inputs": { + "nixpkgs": [ + "system", + "prgms", + "hyprland", + "hyprland", + "nixpkgs" + ], + "systems": [ + "system", + "prgms", + "hyprland", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1726874836, + "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, "kitty": { "locked": { "lastModified": 1, @@ -457,34 +755,15 @@ "type": "path" } }, - "lobster": { - "inputs": { - "nixpkgs": "nixpkgs", - "systems": "systems" - }, - "locked": { - "lastModified": 1726728133, - "narHash": "sha256-6UNJxOcFKZCE20yVdeXi3hhsNdo82o0WdI52bjw/Zx0=", - "owner": "justchokingaround", - "repo": "lobster", - "rev": "3cfac574621d0ffc3c44df053fb8df94b4c2480a", - "type": "github" - }, - "original": { - "owner": "justchokingaround", - "repo": "lobster", - "type": "github" - } - }, "mpdris": { "locked": { "lastModified": 1, - "narHash": "sha256-4C3KHzyA6BldYX6U4etlZkvRx9nek6N6rWYadTjtZmI=", - "path": "/nix/store/ywqcaandc3byjb7f3vqfx8z381b4l1yq-source/mpdris", + "narHash": "sha256-tpf1IJ2BpqYH5HgrhTDG9PVf4epb/r0tfVKN0Cw80Ag=", + "path": "/nix/store/czi2dkf1ipagwjbmhsd2z4pw09nry61q-source/mpdris", "type": "path" }, "original": { - "path": "/nix/store/ywqcaandc3byjb7f3vqfx8z381b4l1yq-source/mpdris", + "path": "/nix/store/czi2dkf1ipagwjbmhsd2z4pw09nry61q-source/mpdris", "type": "path" } }, @@ -496,12 +775,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-1oDfel7+ZVhXNWI9buSBEHCJwD7YiRqbt9pWbFEybbE=", - "path": "/nix/store/aswmlgh3bnpa1r1qi7c8jhy6dvrlx2lb-source/home", + "narHash": "sha256-d88FyZ+mMPLSr4SKuqnZQcwOsYSqnU+/vWCLh6yk+kQ=", + "path": "/nix/store/ln10g9parrikdk4nnp52wnwmz5z799qn-source/home", "type": "path" }, "original": { - "path": "/nix/store/aswmlgh3bnpa1r1qi7c8jhy6dvrlx2lb-source/home", + "path": "/nix/store/ln10g9parrikdk4nnp52wnwmz5z799qn-source/home", "type": "path" } }, @@ -509,26 +788,26 @@ "locked": { "lastModified": 1, "narHash": "sha256-tvSCDDUIW6BkzWSel1NV1dEKNplJHNBvMTkpWNSAO6I=", - "path": "/nix/store/5riq46pmlr0nxpkfvwlr2fnavb4y58vm-source/neovim", + "path": "/nix/store/2wib07g228id8j6wfv1nl7y2q0r4ac4h-source/neovim", "type": "path" }, "original": { - "path": "/nix/store/5riq46pmlr0nxpkfvwlr2fnavb4y58vm-source/neovim", + "path": "/nix/store/2wib07g228id8j6wfv1nl7y2q0r4ac4h-source/neovim", "type": "path" } }, "nixpkgs": { "locked": { - "lastModified": 1703961334, - "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", + "lastModified": 1727672256, + "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", + "rev": "1719f27dd95fd4206afb9cec9f415b539978827e", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -582,50 +861,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1727264057, - "narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "759537f06e6999e141588ff1c9be7f3a5c060106", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 0, - "narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=", - "path": "/nix/store/mvz96grv31nxq69ldw5a5pn2qh1s6ca6-source", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1725634671, "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", @@ -641,7 +876,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_3": { "locked": { "lastModified": 1727348695, "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", @@ -657,7 +892,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_4": { "locked": { "lastModified": 1727672256, "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", @@ -673,7 +908,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_5": { "locked": { "lastModified": 1727672256, "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", @@ -689,7 +924,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_6": { "locked": { "lastModified": 1727672256, "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", @@ -705,15 +940,43 @@ "type": "github" } }, + "nixpkgs_7": { + "locked": { + "lastModified": 0, + "narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=", + "path": "/nix/store/mvz96grv31nxq69ldw5a5pn2qh1s6ca6-source", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1727348695, + "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "ollama": { "locked": { "lastModified": 1, "narHash": "sha256-K9Jzz59VYosk9X4m050yw7oWgJD7XU//3QJ8zbA6sIA=", - "path": "/nix/store/ywqcaandc3byjb7f3vqfx8z381b4l1yq-source/ollama", + "path": "/nix/store/9c23h9fcc6j2914nvw1w3y4bcdbixp4x-source/ollama", "type": "path" }, "original": { - "path": "/nix/store/ywqcaandc3byjb7f3vqfx8z381b4l1yq-source/ollama", + "path": "/nix/store/9c23h9fcc6j2914nvw1w3y4bcdbixp4x-source/ollama", "type": "path" } }, @@ -725,13 +988,28 @@ "scripts": "scripts" }, "locked": { - "lastModified": 1727888126, - "narHash": "sha256-IdOx5CFj9n6qWYlsokSK7WnL1LEw3jvWwcMTZUefSq0=", - "path": "/home/nathan/.nixos/packages", + "lastModified": 1, + "narHash": "sha256-0dUQI6QYiZgvK+mil2a6Y3ARdHAfuVI3muoGadpwd9I=", + "path": "/nix/store/sqwcwiyb5xhz1pb072z956yqfjadriyd-source/packages", "type": "path" }, "original": { - "path": "/home/nathan/.nixos/packages", + "path": "/nix/store/sqwcwiyb5xhz1pb072z956yqfjadriyd-source/packages", + "type": "path" + } + }, + "pckgs": { + "inputs": { + "external": "external_2" + }, + "locked": { + "lastModified": 1, + "narHash": "sha256-6oCDKhDSqJMWeODXDHD5XorN7/+KXBBIPZ2z+obwUNY=", + "path": "/nix/store/m7wsdj5lhm31g7d8g5blz09qxmrlndxl-source/packages", + "type": "path" + }, + "original": { + "path": "/nix/store/m7wsdj5lhm31g7d8g5blz09qxmrlndxl-source/packages", "type": "path" } }, @@ -745,13 +1023,29 @@ "terminal": "terminal" }, "locked": { - "lastModified": 1727882500, - "narHash": "sha256-k93LpMGSJqlRaTrk+8nXm/ojSmaZ43vpp7Fi27p5+sY=", - "path": "/home/nathan/.nixos/programs", + "lastModified": 1, + "narHash": "sha256-9/J/KnEYKUFv2/3L2asbZWMG1oB5Ya2Svt+CwL6iEAs=", + "path": "/nix/store/sqwcwiyb5xhz1pb072z956yqfjadriyd-source/programs", "type": "path" }, "original": { - "path": "/home/nathan/.nixos/programs", + "path": "/nix/store/sqwcwiyb5xhz1pb072z956yqfjadriyd-source/programs", + "type": "path" + } + }, + "prgms_2": { + "inputs": { + "ags": "ags_3", + "hyprland": "hyprland_3" + }, + "locked": { + "lastModified": 1, + "narHash": "sha256-96Dpr1ejZUBA7m2x2YfNJJxwDRj7Z8r5QV4UrGGxdoU=", + "path": "/nix/store/m7wsdj5lhm31g7d8g5blz09qxmrlndxl-source/programs", + "type": "path" + }, + "original": { + "path": "/nix/store/m7wsdj5lhm31g7d8g5blz09qxmrlndxl-source/programs", "type": "path" } }, @@ -765,11 +1059,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-EVhBDAt1miiP7BA3SooJNTCm0pESsl4VlRYCDSMutFY=", - "path": "/nix/store/5riq46pmlr0nxpkfvwlr2fnavb4y58vm-source/pywal", + "path": "/nix/store/2wib07g228id8j6wfv1nl7y2q0r4ac4h-source/pywal", "type": "path" }, "original": { - "path": "/nix/store/5riq46pmlr0nxpkfvwlr2fnavb4y58vm-source/pywal", + "path": "/nix/store/2wib07g228id8j6wfv1nl7y2q0r4ac4h-source/pywal", "type": "path" } }, @@ -793,11 +1087,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-W1pO/5h94bemSfBkgwMcjnRJAySAtzd5RMTWKcmLkOI=", - "path": "/nix/store/5riq46pmlr0nxpkfvwlr2fnavb4y58vm-source/rofi", + "path": "/nix/store/2wib07g228id8j6wfv1nl7y2q0r4ac4h-source/rofi", "type": "path" }, "original": { - "path": "/nix/store/5riq46pmlr0nxpkfvwlr2fnavb4y58vm-source/rofi", + "path": "/nix/store/2wib07g228id8j6wfv1nl7y2q0r4ac4h-source/rofi", "type": "path" } }, @@ -805,19 +1099,19 @@ "inputs": { "home-manager": "home-manager", "nathan": "nathan", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_6", "system": "system" } }, "scripts": { "locked": { "lastModified": 1, - "narHash": "sha256-NIfQRQw9l/nj6vJeVaj8Ah+0rQtZES68gbDe32RZJvU=", - "path": "/nix/store/hgnyccs9lwpgab7gkqrw5mifaqycfm27-source/scripts", + "narHash": "sha256-xIJ15kilsIIsZ52uO6hZA9MeT9ypeJLTtWCwUf0WIQQ=", + "path": "/nix/store/qfvx4x0x7rs9wl3ncrxcnykbs3vw37qc-source/scripts", "type": "path" }, "original": { - "path": "/nix/store/hgnyccs9lwpgab7gkqrw5mifaqycfm27-source/scripts", + "path": "/nix/store/qfvx4x0x7rs9wl3ncrxcnykbs3vw37qc-source/scripts", "type": "path" } }, @@ -827,12 +1121,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-rcISoV4jVrutfC5Z7VPSZeFrr20TqcLV+GAnn/EEhYc=", - "path": "/nix/store/ndjnf771yn2w0vvl2mxr8h9k6qgr9b2l-source/sddm", + "narHash": "sha256-1lPCRKFKK2qmdS+akk6dkrSjXOBe0iBgQp6oTi5vCWM=", + "path": "/nix/store/m7wsdj5lhm31g7d8g5blz09qxmrlndxl-source/sddm", "type": "path" }, "original": { - "path": "/nix/store/ndjnf771yn2w0vvl2mxr8h9k6qgr9b2l-source/sddm", + "path": "/nix/store/m7wsdj5lhm31g7d8g5blz09qxmrlndxl-source/sddm", "type": "path" } }, @@ -854,8 +1148,8 @@ }, "spicetify-nix": { "inputs": { - "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs_7" + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1727842659, @@ -873,52 +1167,49 @@ }, "srvcs": { "inputs": { - "mpdris": "mpdris", - "ollama": "ollama" + "mpdris": "mpdris" }, "locked": { - "lastModified": 1727026230, - "narHash": "sha256-D1VemlF6VQcRjjTTRfL8BG1tTIa4HZxjcPMVxsFMmXI=", - "path": "/home/nathan/.nixos/services", + "lastModified": 1, + "narHash": "sha256-cuHsChgkjeeNyQiP8xebtVcqixs7dJLV59Q9BKIVXqI=", + "path": "/nix/store/sqwcwiyb5xhz1pb072z956yqfjadriyd-source/services", "type": "path" }, "original": { - "path": "/home/nathan/.nixos/services", + "path": "/nix/store/sqwcwiyb5xhz1pb072z956yqfjadriyd-source/services", "type": "path" } }, - "swww": { + "srvcs_2": { "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs_3", - "utils": "utils" + "ollama": "ollama" }, "locked": { - "lastModified": 1726747651, - "narHash": "sha256-Yg7c0XUgn82aNftvzSXTKMtZT1gdskun710aO5Dnd9M=", - "owner": "LGFae", - "repo": "swww", - "rev": "ddb0d5dbc83960d0c834d2a4dcb7f541474cb854", - "type": "github" + "lastModified": 1, + "narHash": "sha256-77xH7oSwHTKWMPseY3d8isc0oV0SgNM+CdrIxhRBOzQ=", + "path": "/nix/store/m7wsdj5lhm31g7d8g5blz09qxmrlndxl-source/services", + "type": "path" }, "original": { - "owner": "LGFae", - "repo": "swww", - "type": "github" + "path": "/nix/store/m7wsdj5lhm31g7d8g5blz09qxmrlndxl-source/services", + "type": "path" } }, "system": { "inputs": { - "sddm": "sddm" + "pckgs": "pckgs", + "prgms": "prgms_2", + "sddm": "sddm", + "srvcs": "srvcs_2" }, "locked": { "lastModified": 1, - "narHash": "sha256-ptknVfORoDZ3PJZrFqftg6PXI5BgshQdAsuKZQXOJVo=", - "path": "/nix/store/aswmlgh3bnpa1r1qi7c8jhy6dvrlx2lb-source/system", + "narHash": "sha256-/5EJj/nu2LEpI9O8HsT8OkbsEZoTwrX53bF/y71ijcI=", + "path": "/nix/store/ln10g9parrikdk4nnp52wnwmz5z799qn-source/system", "type": "path" }, "original": { - "path": "/nix/store/aswmlgh3bnpa1r1qi7c8jhy6dvrlx2lb-source/system", + "path": "/nix/store/ln10g9parrikdk4nnp52wnwmz5z799qn-source/system", "type": "path" } }, @@ -938,21 +1229,6 @@ } }, "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -967,7 +1243,7 @@ "type": "github" } }, - "systems_4": { + "systems_3": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -995,11 +1271,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-/6PqjAXsf3oJokNYPJJpE7izbi8E5y1Vmu7GJewdep0=", - "path": "/nix/store/5riq46pmlr0nxpkfvwlr2fnavb4y58vm-source/terminal", + "path": "/nix/store/2wib07g228id8j6wfv1nl7y2q0r4ac4h-source/terminal", "type": "path" }, "original": { - "path": "/nix/store/5riq46pmlr0nxpkfvwlr2fnavb4y58vm-source/terminal", + "path": "/nix/store/2wib07g228id8j6wfv1nl7y2q0r4ac4h-source/terminal", "type": "path" } }, @@ -1010,17 +1286,17 @@ "locked": { "lastModified": 1, "narHash": "sha256-4qcgTKJv2uerh2pzxBzFRaYh12KBI1ZlMhMtkl/MI90=", - "path": "/nix/store/0bhz93i8w5ssvw5i84h7kh03f63djyw0-source/themes/tokyo-night", + "path": "/nix/store/6dppl7xqlbra5jvjb4wgahs8h2nb6fhs-source/themes/tokyo-night", "type": "path" }, "original": { - "path": "/nix/store/0bhz93i8w5ssvw5i84h7kh03f63djyw0-source/themes/tokyo-night", + "path": "/nix/store/6dppl7xqlbra5jvjb4wgahs8h2nb6fhs-source/themes/tokyo-night", "type": "path" } }, "themecord": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1723741990, @@ -1048,34 +1324,16 @@ "type": "path" } }, - "utils": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "waveforms": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1726518634, - "narHash": "sha256-VsEAoGNO21d6irv6TyFd/m75o/+XoHz9ggRp4Nx583Y=", + "lastModified": 1727720938, + "narHash": "sha256-DvHmS+mcZP5bcBcI4WfugMgiXjmTLGGy+hdANYJFyts=", "owner": "liff", "repo": "waveforms-flake", - "rev": "eeb5438261394f3d0e35b7e20b511d6b865400c8", + "rev": "2ec4881d3a3ec5af30e65a5abb419fe5d813db63", "type": "github" }, "original": { @@ -1137,6 +1395,59 @@ "type": "github" } }, + "xdph_2": { + "inputs": { + "hyprland-protocols": "hyprland-protocols_4", + "hyprlang": [ + "system", + "prgms", + "hyprland", + "hyprland", + "hyprlang" + ], + "hyprutils": [ + "system", + "prgms", + "hyprland", + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "system", + "prgms", + "hyprland", + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "system", + "prgms", + "hyprland", + "hyprland", + "nixpkgs" + ], + "systems": [ + "system", + "prgms", + "hyprland", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1727524473, + "narHash": "sha256-1DGktDtSWIJpnDbVoj/qpvJSH5zg6JbOfuh6xqZMap0=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "7e500e679ede40e79cf2d89b5f5fa3e34923bd26", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } + }, "zoxide": { "locked": { "lastModified": 1, diff --git a/flake.nix b/flake.nix index 565e398..7f3084e 100644 --- a/flake.nix +++ b/flake.nix @@ -27,7 +27,6 @@ modules = [ inputs.system.nixosModule - inputs.nathan.nixosModule inputs.home-manager.nixosModules.home-manager ]; diff --git a/home/flake.nix b/home/flake.nix index c2ab0c4..44d4ef7 100644 --- a/home/flake.nix +++ b/home/flake.nix @@ -12,14 +12,6 @@ outputs = { self, ... }@inputs: { - nixosModule = { config, lib, pkgs, ... }: { - imports = [ - inputs.prgms.module - inputs.srvcs.module - inputs.packages.module - ]; - }; - homeManagerModule = { config, lib, pkgs, ... }: { imports = [ diff --git a/system/configuration/configuration.nix b/system/configuration/configuration.nix index 350b38a..be3f45e 100644 --- a/system/configuration/configuration.nix +++ b/system/configuration/configuration.nix @@ -232,12 +232,6 @@ users.defaultUserShell = pkgs.zsh; programs.zsh.enable = true; - home-manager.backupFileExtension = ".backup"; - home-manager.users = { - root = inputs.root.homeManagerModule; - # nathan = inputs.nathan.homeManagerModule; - }; - programs.nh = { enable = true; flake = "/home/nathan/.nixos"; diff --git a/system/flake.nix b/system/flake.nix index 1a0bad6..01ffe31 100755 --- a/system/flake.nix +++ b/system/flake.nix @@ -5,11 +5,11 @@ sddm.url = "./sddm"; - services.url = "./services"; + srvcs.url = "./services"; - packages.url = "./packages"; + pckgs.url = "./packages"; - programs.url = "./programs"; + prgms.url = "./programs"; }; @@ -19,9 +19,9 @@ imports = [ ./configuration/configuration.nix inputs.sddm.module - inputs.services.module - inputs.packages.module - inputs.programs.module + inputs.srvcs.module + inputs.pckgs.module + inputs.prgms.module ]; }; diff --git a/system/sddm/flake.nix b/system/sddm/flake.nix index 978be6c..54c63ab 100644 --- a/system/sddm/flake.nix +++ b/system/sddm/flake.nix @@ -17,6 +17,7 @@ services.displayManager.sddm = { enable = true; + wayland.enable = true; autoNumlock = true; theme = "${inputs.theme.theme { inherit pkgs; }}"; enableHidpi = true;