From b2c421ef543b8bb004e403f7898b6d6eff812fad Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Thu, 20 Nov 2025 10:50:53 -0600 Subject: [PATCH] idk --- flake.lock | 542 ++++++++++++++++++++++-------- flake.nix | 16 +- home/home.nix | 4 +- home/modules/hyprland.nix | 8 +- home/modules/niri.nix | 6 +- modules/gaming.nix | 20 +- pkgs/desktop-packages.nix | 4 +- systems/kaladin/configuration.nix | 4 +- 8 files changed, 428 insertions(+), 176 deletions(-) diff --git a/flake.lock b/flake.lock index f5db0fb..ed56f50 100644 --- a/flake.lock +++ b/flake.lock @@ -1,8 +1,34 @@ { "nodes": { + "affinity-nix": { + "inputs": { + "elemental-wine-source": "elemental-wine-source", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "git-hooks": "git-hooks", + "nixpkgs": "nixpkgs_2", + "nixpkgs-wine": "nixpkgs-wine", + "on-linux": "on-linux", + "plugin-loader": "plugin-loader", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1763155533, + "narHash": "sha256-/oz0XxqBTOe9Bk7MsPYs73+Ajto051/WneYbyg/+5nU=", + "owner": "mrshmllow", + "repo": "affinity-nix", + "rev": "fe613cf7ee29d5344dfdead3fc779b45fb578015", + "type": "github" + }, + "original": { + "owner": "mrshmllow", + "repo": "affinity-nix", + "type": "github" + } + }, "anipy-cli": { "inputs": { - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_4", "poetry2nix": "poetry2nix" }, "locked": { @@ -105,14 +131,14 @@ }, "darkly": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1761698061, - "narHash": "sha256-iyvYHJn9K+cnW2+icxGA3qm69W8RpCz1v8+rb2U/KzQ=", + "lastModified": 1763015923, + "narHash": "sha256-IJGWKVxztJT/NsonaRjWm5OaW07Rg+kBr6NMhfQiJzM=", "owner": "Bali10050", "repo": "Darkly", - "rev": "b9260d390fb8c673a37500f567b11e3b297216cc", + "rev": "5a323b775695f889b495d9f499eceb38ed538b42", "type": "github" }, "original": { @@ -121,6 +147,25 @@ "type": "github" } }, + "elemental-wine-source": { + "flake": false, + "locked": { + "host": "gitlab.winehq.org", + "lastModified": 1722747031, + "narHash": "sha256-XVhz9p2kgFBoJ376vg8OaFXxcMEjAe9AK1hk0I1rb1Q=", + "owner": "ElementalWarrior", + "repo": "wine", + "rev": "a7c9b19e1a26cf49c63a7c19189a3e2bbe2c6ac2", + "type": "gitlab" + }, + "original": { + "host": "gitlab.winehq.org", + "owner": "ElementalWarrior", + "ref": "affinity-photo3-wine9.13-part3", + "repo": "wine", + "type": "gitlab" + } + }, "emacs": { "inputs": { "nixpkgs": [ @@ -186,6 +231,35 @@ } }, "flake-compat": { + "locked": { + "lastModified": 1751685974, + "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=", + "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/flake-compat/archive/549f2762aebeff29a2e5ece7a7dc0f955281a1d1.tar.gz?rev=549f2762aebeff29a2e5ece7a7dc0f955281a1d1" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/flake-compat/archive/main.tar.gz" + } + }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -206,11 +280,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1762040540, - "narHash": "sha256-z5PlZ47j50VNF3R+IMS9LmzI5fYRGY/Z5O5tol1c9I4=", + "lastModified": 1760948891, + "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "0010412d62a25d959151790968765a70c436598b", + "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "type": "github" }, "original": { @@ -220,6 +294,24 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "locked": { + "lastModified": 1762980239, + "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -306,23 +398,67 @@ "type": "github" } }, - "gnome-shell": { - "flake": false, + "git-hooks": { + "inputs": { + "flake-compat": "flake-compat_2", + "gitignore": "gitignore", + "nixpkgs": "nixpkgs" + }, "locked": { - "lastModified": 1748186689, - "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=", - "owner": "GNOME", - "repo": "gnome-shell", - "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0", + "lastModified": 1760663237, + "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", "type": "github" }, "original": { - "owner": "GNOME", - "ref": "48.2", - "repo": "gnome-shell", + "owner": "cachix", + "repo": "git-hooks.nix", "type": "github" } }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "affinity-nix", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gnome-shell": { + "flake": false, + "locked": { + "host": "gitlab.gnome.org", + "lastModified": 1762869044, + "narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=", + "owner": "GNOME", + "repo": "gnome-shell", + "rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad", + "type": "gitlab" + }, + "original": { + "host": "gitlab.gnome.org", + "owner": "GNOME", + "ref": "gnome-49", + "repo": "gnome-shell", + "type": "gitlab" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -330,11 +466,11 @@ ] }, "locked": { - "lastModified": 1762367206, - "narHash": "sha256-c/164YOPkV09BH8KIUdvVvJs3VF2LNIbE2piKGgXPxk=", + "lastModified": 1763416652, + "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=", "owner": "nix-community", "repo": "home-manager", - "rev": "af119feb17cb242398e0fb97f92b867d25882522", + "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312", "type": "github" }, "original": { @@ -356,11 +492,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1762341801, - "narHash": "sha256-zx7UxreMz646qikxw+So7eGRQeWccKFZxuMvJowJuFs=", + "lastModified": 1763482445, + "narHash": "sha256-UTfApBU4zEQD/vnmAMvr7T2/ysLaeXXCkXqEcr9OTG4=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "20aadad64b8b8cbebc71371713c141d91d7f8172", + "rev": "ea4e51d3476a54253458855a0aae7f9a0fbda89d", "type": "github" }, "original": { @@ -389,11 +525,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1762146685, - "narHash": "sha256-anRlNG6t7esBbF1+ALDeathVBSclA0PEL52Vo0WnN5g=", + "lastModified": 1763477637, + "narHash": "sha256-2Povv/mrawCMr2v57P4eC12wAzocQkKXnnk1ThEhpn0=", "owner": "YaLTeR", "repo": "niri", - "rev": "a2ca2b3c866bc781b12c334a9f949b3db6d7c943", + "rev": "d7ce12a5409a53247356f831fb4b4a39f625ad49", "type": "github" }, "original": { @@ -406,7 +542,7 @@ "inputs": { "extra-container": "extra-container", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_7", "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { @@ -448,11 +584,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1762371679, - "narHash": "sha256-VjZLHnj9tqFRigpD6SJtTKmQsys77jCX5YcnmMnUqH8=", + "lastModified": 1762847253, + "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e4c6ee69e710805a15a3da905214a25618271609", + "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", "type": "github" }, "original": { @@ -464,11 +600,11 @@ }, "nixos-unstable-small": { "locked": { - "lastModified": 1762328495, - "narHash": "sha256-IUZvw5kvLiExApP9+SK/styzEKSqfe0NPclu9/z85OQ=", + "lastModified": 1763469780, + "narHash": "sha256-IW67Db/wBNQwJ5e0fF9Yk4SmdivMcecrUVDs7QJoC/s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4c621660e393922cf68cdbfc40eb5a2d54d3989a", + "rev": "a70b03ca5dc9d46294740f165abdef9f9bea5632", "type": "github" }, "original": { @@ -480,16 +616,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716509168, - "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", - "owner": "nixos", + "lastModified": 1759070547, + "narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "bfb7a882678e518398ce9a31a881538679f6f092", + "rev": "647e5c14cbd5067f44ac86b74f014962df460840", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -510,6 +646,21 @@ } }, "nixpkgs-lib": { + "locked": { + "lastModified": 1754788789, + "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-lib_2": { "locked": { "lastModified": 1761765539, "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", @@ -542,11 +693,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1762233356, - "narHash": "sha256-cGS3lLTYusbEP/IJIWGgnkzIl+FA5xDvtiHyjalGr4k=", + "lastModified": 1763334038, + "narHash": "sha256-LBVOyaH6NFzQ3X/c6vfMZ9k4SV2ofhpxeL9YnhHNJQQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ca534a76c4afb2bdc07b681dbc11b453bab21af8", + "rev": "4c8cdd5b1a630e8f72c9dd9bf582b1afb3127d2c", "type": "github" }, "original": { @@ -558,11 +709,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1762233356, - "narHash": "sha256-cGS3lLTYusbEP/IJIWGgnkzIl+FA5xDvtiHyjalGr4k=", + "lastModified": 1763334038, + "narHash": "sha256-LBVOyaH6NFzQ3X/c6vfMZ9k4SV2ofhpxeL9YnhHNJQQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ca534a76c4afb2bdc07b681dbc11b453bab21af8", + "rev": "4c8cdd5b1a630e8f72c9dd9bf582b1afb3127d2c", "type": "github" }, "original": { @@ -588,87 +739,23 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs-wine": { "locked": { - "lastModified": 1714463564, - "narHash": "sha256-8+w/34w9azAHZA9TwvzdT2z7VFFEey7tXsan5q5bR1M=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9b03589f4d174bfd6ea9a9de6fb85333fd190f8b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1743095683, - "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1761016216, - "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "481cf557888e05d3128a76f14c76397b7d7cc869", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1762111121, - "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", "repo": "nixpkgs", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" } }, - "nixpkgs_6": { - "locked": { - "lastModified": 1761907660, - "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { + "nixpkgs_10": { "locked": { "lastModified": 1744536153, "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", @@ -684,7 +771,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_11": { "locked": { "lastModified": 1735264675, "narHash": "sha256-MgdXpeX2GuJbtlBrH9EdsUeWl/yXEubyvxM1G+yO4Ak=", @@ -698,7 +785,7 @@ "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A.tar.gz" } }, - "nixpkgs_9": { + "nixpkgs_12": { "locked": { "lastModified": 1732014248, "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", @@ -713,6 +800,134 @@ "type": "indirect" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1761672384, + "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1761236834, + "narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d5faa84122bc0a1fd5d378492efce4e289f8eac1", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1716509168, + "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "bfb7a882678e518398ce9a31a881538679f6f092", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1714463564, + "narHash": "sha256-8+w/34w9azAHZA9TwvzdT2z7VFFEey7tXsan5q5bR1M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9b03589f4d174bfd6ea9a9de6fb85333fd190f8b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1743095683, + "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1761016216, + "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "481cf557888e05d3128a76f14c76397b7d7cc869", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1763283776, + "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { + "locked": { + "lastModified": 1762977756, + "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "inputs": { "flake-parts": [ @@ -740,17 +955,17 @@ }, "octotype": { "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_6", + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_9", "rust-overlay": "rust-overlay", "systems": "systems_4" }, "locked": { - "lastModified": 1762205632, - "narHash": "sha256-W4WuVK7dKOYzlN9wfYuWSN//yTPSiCq1CS0iyHmjFBQ=", + "lastModified": 1763253369, + "narHash": "sha256-aK+xskfzTybRlZ7e/1ieN2ZUp2Y/k2qzmqwDOdn59dM=", "owner": "mahlquistj", "repo": "octotype", - "rev": "4c4ca7aae73f41194f600c48c19163a47e5abc6b", + "rev": "49825e13184f473669793b4ff867e68c2b1971a2", "type": "github" }, "original": { @@ -760,13 +975,41 @@ "type": "github" } }, + "on-linux": { + "flake": false, + "locked": { + "lastModified": 1761925232, + "narHash": "sha256-OaSqV9bTTpui4QtmiFszOaInJEyAmL469VQL6lU0lwA=", + "owner": "seapear", + "repo": "AffinityOnLinux", + "rev": "3cb7cdf8bfc56b630d91355e416616ba3835453c", + "type": "github" + }, + "original": { + "owner": "seapear", + "repo": "AffinityOnLinux", + "type": "github" + } + }, + "plugin-loader": { + "flake": false, + "locked": { + "narHash": "sha256-CCqT6TQHG7HqvxsnP/EC9Mg6A3KfNg5i/vGXW0exTxU=", + "type": "file", + "url": "https://github.com/noahc3/AffinityPluginLoader/releases/latest/download/affinitypluginloader-plus-winefix.tar.xz" + }, + "original": { + "type": "file", + "url": "https://github.com/noahc3/AffinityPluginLoader/releases/latest/download/affinitypluginloader-plus-winefix.tar.xz" + } + }, "poetry2nix": { "inputs": { "flake-utils": "flake-utils", "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_5", "systems": "systems_2", - "treefmt-nix": "treefmt-nix" + "treefmt-nix": "treefmt-nix_2" }, "locked": { "lastModified": 1716724736, @@ -785,7 +1028,7 @@ "quickemu": { "inputs": { "flake-schemas": "flake-schemas", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1735561406, @@ -802,6 +1045,7 @@ }, "root": { "inputs": { + "affinity-nix": "affinity-nix", "anipy-cli": "anipy-cli", "darkly": "darkly", "emacs": "emacs", @@ -810,7 +1054,7 @@ "nix-bitcoin": "nix-bitcoin", "nixos-hardware": "nixos-hardware", "nixos-unstable-small": "nixos-unstable-small", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_8", "nixpkgs-stable": "nixpkgs-stable_3", "octotype": "octotype", "quickemu": "quickemu", @@ -820,14 +1064,14 @@ }, "rust-overlay": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1761964689, - "narHash": "sha256-Zo3LQQDz+64EQ9zor/WmeNTFLoZkjmhp0UY3G0D3seE=", + "lastModified": 1763174172, + "narHash": "sha256-u6dcvXk2K6eYVYhmfiN3xmhIf3yUo5KPwm79UOD37Jo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "63d22578600f70d293aede6bc737efef60ebd97f", + "rev": "89af6762b01409edbb595888a69311e8e5954110", "type": "github" }, "original": { @@ -839,8 +1083,8 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs_9", + "flake-compat": "flake-compat_3", + "nixpkgs": "nixpkgs_12", "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { @@ -865,7 +1109,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" @@ -879,11 +1123,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1762264356, - "narHash": "sha256-QVfC53Ri+8n3e7Ujx9kq6all3+TLBRRPRnc6No5qY5w=", + "lastModified": 1763478675, + "narHash": "sha256-L0nJnK2iZ47x/iu0qpZO/5n2X1pf9ExmFrOdqvgMfUs=", "owner": "danth", "repo": "stylix", - "rev": "647bb8dd96a206a1b79c4fd714affc88b409e10b", + "rev": "2877806a5e2e4832871e31169f15c5090bf42d9a", "type": "github" }, "original": { @@ -1049,6 +1293,24 @@ } }, "treefmt-nix": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1761311587, + "narHash": "sha256-Msq86cR5SjozQGCnC6H8C+0cD4rnx91BPltZ9KK613Y=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "2eddae033e4e74bf581c2d1dfa101f9033dbd2dc", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { "inputs": { "nixpkgs": [ "anipy-cli", @@ -1090,11 +1352,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1762302024, - "narHash": "sha256-F+4W0J5r7fbEl+VmATFqAA5+4dFSNAmLJB7tAtrTIkY=", + "lastModified": 1762747449, + "narHash": "sha256-Z1TKiux8K09a93w4PFDFsj8HFugXNy3iCC3Z8MpR5Rk=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "53b6072bd995b5b4017999cf247f9eb6660c72a2", + "rev": "6338574bc5c036487486acde264f38f39ea15fad", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7e8ff13..2c4500f 100644 --- a/flake.nix +++ b/flake.nix @@ -22,19 +22,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; octotype.url = "github:mahlquistj/octotype/main"; - # radicle = { - # type = "git"; - # url = "https://seed.radicle.garden/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; - # eww = { - # url = "github:elkowar/eww"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; - # ags = { - # url = "github:Aylur/ags"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; + affinity-nix.url = "github:mrshmllow/affinity-nix"; emacs = { url = "github:nix-community/emacs-overlay/dd38645351b6f14cda47c81456131c86b11386db"; @@ -57,7 +45,7 @@ outputs = inputs@{ nixpkgs, nixpkgs-stable, home-manager, quickemu, nixos-hardware, emacs, nix-bitcoin, octotype, simple-nixos-mailserver, anipy-cli, darkly, niri, - stylix, self, ... }: + stylix, self, affinity-nix, ... }: let system = "x86_64-linux"; username = "chris"; diff --git a/home/home.nix b/home/home.nix index 1d968e0..ed558aa 100644 --- a/home/home.nix +++ b/home/home.nix @@ -693,7 +693,7 @@ in { enable = true; package = pkgs.librewolf.override { nativeMessagingHosts = - [ pkgs.kdePackages.plasma-browser-integration pkgs.tridactyl-native ]; + [ pkgs.tridactyl-native ]; }; profiles.chris = { name = "default"; @@ -721,7 +721,7 @@ in { modules-left = [ "hyprland/workspaces" "hyprland/window" "niri/window" ]; modules-center = [ "clock" ]; modules-right = - [ "cpu" "memory" "pulseaudio" "backlight" "battery" "tray" ]; + [ "cpu" "memory" "gpu" "pulseaudio" "backlight" "battery" "tray" ]; margin-top = if laptop then -5 else 5; margin-bottom = if laptop then 4 else 0; margin-left = 6; diff --git a/home/modules/hyprland.nix b/home/modules/hyprland.nix index f778bcb..3b36712 100644 --- a/home/modules/hyprland.nix +++ b/home/modules/hyprland.nix @@ -145,10 +145,10 @@ in inactive_timeout = 3; }; - gestures = { - workspace_swipe = true; - workspace_swipe_fingers = 3; - }; + # gestures = { + # workspace_swipe = true; + # workspace_swipe_fingers = 3; + # }; decoration = { rounding = 18; diff --git a/home/modules/niri.nix b/home/modules/niri.nix index 84cee38..9f62968 100644 --- a/home/modules/niri.nix +++ b/home/modules/niri.nix @@ -325,13 +325,13 @@ in "desktop-center" = { enable = true; name = "DP-1"; - scale = 1.5; + # scale = 1.5; position.x = 1080; position.y = 0; focus-at-startup = true; mode = { - height = 2160; - width = 3640; + height = 1920; + width = 1080; refresh = 60.0; }; }; diff --git a/modules/gaming.nix b/modules/gaming.nix index 7930909..5e18c2d 100644 --- a/modules/gaming.nix +++ b/modules/gaming.nix @@ -7,13 +7,13 @@ let lib, }: let - version = "0.1.6.6"; + version = "0.1.7.1"; pname = "Jackify"; id = "com.jackify.app"; src = fetchurl { url = "https://github.com/Omni-guides/Jackify/releases/download/v${version}/${pname}.AppImage"; - hash = "sha256-4BLqhmZC/ltom0rTzJpYUvHdn6WzUwS4UYo9TZAhFBI="; + hash = "sha256-HMo3Im+5Z5CrFAeNGqzUt+Jkrd2c0i7BnThqknYQ4vU="; }; appimageContents = appimageTools.extract { inherit pname version src; }; @@ -26,7 +26,7 @@ let (with pkgs; [ icu zstd - protontricks + # protontricks ]); extraInstallCommands = '' @@ -93,11 +93,11 @@ with lib; }; # Warning: GPU optimisations have the potential to damage hardware - gpu = { - apply_gpu_optimisations = "accept-responsibility"; - gpu_device = 1; - amd_performance_level = "high"; - }; + # gpu = { + # apply_gpu_optimisations = "accept-responsibility"; + # gpu_device = 1; + # amd_performance_level = "high"; + # }; custom = { start = "${pkgs.libnotify}/bin/notify-send 'GameMode started'"; @@ -111,8 +111,8 @@ with lib; heroic protonup-qt winePackages.waylandFull - winetricks - protontricks + # winetricks + # protontricks zstd (pkgs.callPackage jackify {}) # gamescope diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix index 9756cb9..8d8a221 100644 --- a/pkgs/desktop-packages.nix +++ b/pkgs/desktop-packages.nix @@ -15,7 +15,6 @@ mumble niri bluetui - impala # pantalaimon ifuse dash @@ -34,6 +33,7 @@ kdePackages.ffmpegthumbs kdePackages.kdegraphics-thumbnailers kdePackages.kdesdk-thumbnailers + inputs.affinity-nix.packages.x86_64-linux.v3 # xfce.thunar # xfce.tumbler # xfce.thunar-media-tags-plugin @@ -141,7 +141,7 @@ # davinci-resolve mediainfo libmediainfo - pqiv + # pqiv discord # digikam rubberband diff --git a/systems/kaladin/configuration.nix b/systems/kaladin/configuration.nix index 72842b7..abd3a56 100644 --- a/systems/kaladin/configuration.nix +++ b/systems/kaladin/configuration.nix @@ -27,6 +27,7 @@ }; graphics = { enable = true; + enable32Bit = true; extraPackages = with pkgs; [ mesa vulkan-extension-layer @@ -40,7 +41,8 @@ # powerManagement.enable = true; # }; }; - services.xserver.videoDrivers = [ "amdgpu" ]; + services.xserver.videoDrivers = [ "modesetting" ]; + services.lact.enable = true; # services.xserver.screenSection = '' # Option "metamodes" "nvidia-auto-select +0+0 {ForceFullCompositionPipeline=On}"