From 671cd3a00b797ca3fdd11e913b2fbc926f5c66e1 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Sun, 7 Dec 2025 18:59:13 -0600 Subject: [PATCH] update oren to use kde plasma --- hosts/oren/configuration.nix | 2 - hosts/oren/flake.lock | 628 ++++++----------------------------- hosts/oren/flake.nix | 62 ++-- 3 files changed, 135 insertions(+), 557 deletions(-) diff --git a/hosts/oren/configuration.nix b/hosts/oren/configuration.nix index 9bcccd82..f814ff45 100644 --- a/hosts/oren/configuration.nix +++ b/hosts/oren/configuration.nix @@ -23,6 +23,4 @@ "rtlwifi" "mac80211" ]; - - services.tlp.enable = true; } diff --git a/hosts/oren/flake.lock b/hosts/oren/flake.lock index f278ed8f..e05c2541 100644 --- a/hosts/oren/flake.lock +++ b/hosts/oren/flake.lock @@ -3,13 +3,13 @@ "agenix": { "inputs": { "darwin": "darwin", - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "nixpkgs": [ "secrets", "ragenix", "nixpkgs" ], - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1761656077, @@ -25,54 +25,17 @@ "type": "github" } }, - "aquamarine": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1764370710, - "narHash": "sha256-7iZklFmziy6Vn5ZFy9mvTSuFopp3kJNuPxL5QAvtmFQ=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "561ae7fbe1ca15dfd908262ec815bf21a13eef63", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, "beszel": { "inputs": { "beszel-nixpkgs": "beszel-nixpkgs" }, "locked": { "dir": "flakes/beszel", - "lastModified": 1764743245, - "narHash": "sha256-SYH3szHJiTKjeRwECXgy4Ukj1fzNtRzC3mqJzIES07Y=", + "lastModified": 1765154566, + "narHash": "sha256-aC4YHMW0Tv0mPZP51IDpcUIucwRy7DrVZOcoLMAHFug=", "ref": "refs/heads/master", - "rev": "dd70b4ba812551c9a14055542888cc28b9b1429b", - "revCount": 840, + "rev": "770d3fb859ee5a4c5f5eeb39fe56757c065822ab", + "revCount": 855, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -101,11 +64,11 @@ "common": { "locked": { "dir": "flakes/common", - "lastModified": 1764743245, - "narHash": "sha256-SYH3szHJiTKjeRwECXgy4Ukj1fzNtRzC3mqJzIES07Y=", + "lastModified": 1765154566, + "narHash": "sha256-aC4YHMW0Tv0mPZP51IDpcUIucwRy7DrVZOcoLMAHFug=", "ref": "refs/heads/master", - "rev": "dd70b4ba812551c9a14055542888cc28b9b1429b", - "revCount": 840, + "rev": "770d3fb859ee5a4c5f5eeb39fe56757c065822ab", + "revCount": 855, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -154,25 +117,29 @@ "type": "github" } }, - "flake-compat": { - "flake": false, + "de_plasma": { + "inputs": { + "plasma-manager": "plasma-manager" + }, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", - "type": "github" + "dir": "flakes/de_plasma", + "lastModified": 1765154566, + "narHash": "sha256-aC4YHMW0Tv0mPZP51IDpcUIucwRy7DrVZOcoLMAHFug=", + "ref": "refs/heads/master", + "rev": "770d3fb859ee5a4c5f5eeb39fe56757c065822ab", + "revCount": 855, + "type": "git", + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" + "dir": "flakes/de_plasma", + "type": "git", + "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" } }, "flake-utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -194,11 +161,11 @@ }, "locked": { "dir": "flakes/flatpaks", - "lastModified": 1764743245, - "narHash": "sha256-SYH3szHJiTKjeRwECXgy4Ukj1fzNtRzC3mqJzIES07Y=", + "lastModified": 1765154566, + "narHash": "sha256-aC4YHMW0Tv0mPZP51IDpcUIucwRy7DrVZOcoLMAHFug=", "ref": "refs/heads/master", - "rev": "dd70b4ba812551c9a14055542888cc28b9b1429b", - "revCount": 840, + "rev": "770d3fb859ee5a4c5f5eeb39fe56757c065822ab", + "revCount": 855, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -208,39 +175,38 @@ "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" } }, - "gitignore": { + "home-manager": { "inputs": { "nixpkgs": [ - "hyprland", - "hyprland", - "pre-commit-hooks", + "de_plasma", + "plasma-manager", "nixpkgs" ] }, "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "lastModified": 1756579987, + "narHash": "sha256-duCce8zGsaMsrqqOmLOsuaV1PVIw/vXWnKuLKZClsGg=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "99a69bdf8a3c6bf038c4121e9c4b6e99706a187a", "type": "github" }, "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", + "owner": "nix-community", + "repo": "home-manager", "type": "github" } }, - "home-manager": { + "home-manager_2": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1764776959, - "narHash": "sha256-d+5CGloq7Lo1u2SkzhF8oiOdUc6Z5emh22nTXUB9CFA=", + "lastModified": 1764866045, + "narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=", "owner": "rycee", "repo": "home-manager", - "rev": "e1680d594a9281651cbf7d126941a8c8e2396183", + "rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab", "type": "github" }, "original": { @@ -250,7 +216,7 @@ "type": "github" } }, - "home-manager_2": { + "home-manager_3": { "inputs": { "nixpkgs": [ "secrets", @@ -273,344 +239,6 @@ "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1753964049, - "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprgraphics": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1763733840, - "narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprgraphics", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "hyprland": "hyprland_2" - }, - "locked": { - "dir": "flakes/hyprland", - "lastModified": 1764743245, - "narHash": "sha256-SYH3szHJiTKjeRwECXgy4Ukj1fzNtRzC3mqJzIES07Y=", - "ref": "refs/heads/master", - "rev": "dd70b4ba812551c9a14055542888cc28b9b1429b", - "revCount": 840, - "type": "git", - "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" - }, - "original": { - "dir": "flakes/hyprland", - "type": "git", - "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" - } - }, - "hyprland-guiutils": { - "inputs": { - "aquamarine": [ - "hyprland", - "hyprland", - "aquamarine" - ], - "hyprgraphics": [ - "hyprland", - "hyprland", - "hyprgraphics" - ], - "hyprlang": [ - "hyprland", - "hyprland", - "hyprlang" - ], - "hyprtoolkit": "hyprtoolkit", - "hyprutils": [ - "hyprland", - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1764616927, - "narHash": "sha256-wRT0MKkpPo11ijSX3KeMN+EQWnpSeUlRtyF3pFLtlRU=", - "owner": "hyprwm", - "repo": "hyprland-guiutils", - "rev": "25cedbfdc5b3ea391d8307c9a5bea315e5df3c52", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-guiutils", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1759610243, - "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland_2": { - "inputs": { - "aquamarine": "aquamarine", - "hyprcursor": "hyprcursor", - "hyprgraphics": "hyprgraphics", - "hyprland-guiutils": "hyprland-guiutils", - "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_2", - "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1764725443, - "narHash": "sha256-A2UyZwPSHSdNfvW17J5GhxIo1TS0Z0rYv+Xgdp+w5wc=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "3cf0280b11f370c11e6839275e547779a33f4a19", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1764612430, - "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "0d00dc118981531aa731150b6ea551ef037acddd", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprtoolkit": { - "inputs": { - "aquamarine": [ - "hyprland", - "hyprland", - "hyprland-guiutils", - "aquamarine" - ], - "hyprgraphics": [ - "hyprland", - "hyprland", - "hyprland-guiutils", - "hyprgraphics" - ], - "hyprlang": [ - "hyprland", - "hyprland", - "hyprland-guiutils", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprland", - "hyprland-guiutils", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprland", - "hyprland-guiutils", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "hyprland", - "hyprland-guiutils", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland", - "hyprland-guiutils", - "systems" - ] - }, - "locked": { - "lastModified": 1764592794, - "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=", - "owner": "hyprwm", - "repo": "hyprtoolkit", - "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprtoolkit", - "type": "github" - } - }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1764637132, - "narHash": "sha256-vSyiKCzSY48kA3v39GFu6qgRfigjKCU/9k1KTK475gg=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "2f2413801beee37303913fc3c964bbe92252a963", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1763640274, - "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "nix-flatpak": { "locked": { "lastModified": 1739444422, @@ -628,6 +256,38 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1756542300, + "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "f61125a668a320878494449750330ca58b78c557", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1764522689, "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", @@ -643,29 +303,13 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_3": { "locked": { - "lastModified": 1764522689, - "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", + "lastModified": 1764983851, + "narHash": "sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", + "rev": "d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454", "type": "github" }, "original": { @@ -1570,27 +1214,22 @@ "type": "github" } }, - "pre-commit-hooks": { + "plasma-manager": { "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": [ - "hyprland", - "hyprland", - "nixpkgs" - ] + "home-manager": "home-manager", + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1763988335, - "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce", + "lastModified": 1763909441, + "narHash": "sha256-56LwV51TX/FhgX+5LCG6akQ5KrOWuKgcJa+eUsRMxsc=", + "owner": "nix-community", + "repo": "plasma-manager", + "rev": "b24ed4b272256dfc1cc2291f89a9821d5f9e14b4", "type": "github" }, "original": { - "owner": "cachix", - "repo": "git-hooks.nix", + "owner": "nix-community", + "repo": "plasma-manager", "type": "github" } }, @@ -1620,10 +1259,11 @@ "inputs": { "beszel": "beszel", "common": "common", + "de_plasma": "de_plasma", "flatpaks": "flatpaks", - "home-manager": "home-manager", - "hyprland": "hyprland", + "home-manager": "home-manager_2", "nixpkgs": "nixpkgs_3", + "nixpkgs-unstable": "nixpkgs-unstable", "ros_neovim": "ros_neovim", "secrets": "secrets" } @@ -1750,11 +1390,11 @@ }, "locked": { "dir": "flakes/secrets", - "lastModified": 1764743245, - "narHash": "sha256-SYH3szHJiTKjeRwECXgy4Ukj1fzNtRzC3mqJzIES07Y=", + "lastModified": 1765154566, + "narHash": "sha256-aC4YHMW0Tv0mPZP51IDpcUIucwRy7DrVZOcoLMAHFug=", "ref": "refs/heads/master", - "rev": "dd70b4ba812551c9a14055542888cc28b9b1429b", - "revCount": 840, + "rev": "770d3fb859ee5a4c5f5eeb39fe56757c065822ab", + "revCount": 855, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" }, @@ -1766,16 +1406,16 @@ }, "systems": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1793,68 +1433,6 @@ "repo": "default", "type": "github" } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "hyprland", - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1761431178, - "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/hosts/oren/flake.nix b/hosts/oren/flake.nix index 57ee6d70..5ff78e38 100644 --- a/hosts/oren/flake.nix +++ b/hosts/oren/flake.nix @@ -3,6 +3,8 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; home-manager.url = "github:rycee/home-manager/release-25.11"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + # Use relative to get current version for testin # common.url = "path:../../flakes/common"; common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/common"; @@ -11,9 +13,11 @@ # flatpaks.url = "path:../../flakes/flatpaks"; flatpaks.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/flatpaks"; # hyprland.url = "path:../../flakes/hyprland"; - hyprland.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/hyprland"; + # hyprland.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/hyprland"; # beszel.url = "path:../../flakes/beszel"; beszel.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/beszel"; + # de_plasma.url = "path:../../flakes/de_plasma"; + de_plasma.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?dir=flakes/de_plasma"; ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim"; }; @@ -25,11 +29,11 @@ common, secrets, flatpaks, - hyprland, beszel, ros_neovim, + nixpkgs-unstable, ... - }: + }@inputs: let configuration_name = "oren"; stateVersion = "25.05"; @@ -42,19 +46,37 @@ "${configuration_name}" = ( lib.nixosSystem { modules = [ + ({ + nixpkgs.overlays = [ + (final: prev: { + unstable = import nixpkgs-unstable { + inherit (final) system config; + }; + }) + ]; + }) home-manager.nixosModules.default + inputs.de_plasma.nixosModules.default + ({ + ringofstorms.dePlasma = { + enable = true; + gpu.amd.enable = true; + # TODO once encrypted boot? + # sddm.autologinUser = "josh"; + }; + }) + secrets.nixosModules.default ros_neovim.nixosModules.default ( - { ... }: { ringofstorms-nvim.includeAllRuntimeDependencies = true; } ) flatpaks.nixosModules.default - hyprland.nixosModules.default + # hyprland.nixosModules.default common.nixosModules.essentials common.nixosModules.git @@ -70,9 +92,7 @@ common.nixosModules.zsh beszel.nixosModules.agent - ( - { ... }: - { + ({ beszelAgent = { listen = "${overlayIp}:45876"; token = "f8a54c41-486b-487a-a78d-a087385c317b"; @@ -83,7 +103,7 @@ ./configuration.nix ./hardware-configuration.nix # ./sway_customizations.nix - ./hyprland_customizations.nix + # ./hyprland_customizations.nix ( { config, pkgs, ... }: rec { @@ -102,7 +122,7 @@ common.homeManagerModules.tmux common.homeManagerModules.atuin common.homeManagerModules.direnv - common.homeManagerModules.foot + common.homeManagerModules.kitty common.homeManagerModules.git common.homeManagerModules.postgres_cli_options common.homeManagerModules.ssh @@ -144,6 +164,8 @@ nodejs_24 ttyd appimage-run + + unstable.opencode ]; services.flatpak.packages = [ @@ -168,26 +190,6 @@ ]; }; }; - - programs = { - nix-ld = { - enable = true; - libraries = with pkgs; [ - icu - gmp - glibc - openssl - stdenv.cc.cc - ]; - }; - }; - environment.shellAliases = { - "oc" = - "all_proxy='' http_proxy='' https_proxy='' /home/josh/other/opencode/node_modules/opencode-linux-x64/bin/opencode"; - "occ" = "oc -c"; - - "ollamal" = "ollama list | tail -n +2 | awk '{print $1}' | fzf --ansi --preview 'ollama show {}'"; - }; } ) ];