cnst/cnix
1
0
Fork 0
Code Issues Pull Requests Activity

lock update, rm dead code and some uwsm

Browse Source
This commit is contained in:
cnst
2025-03-04 19:33:34 +01:00
parent 3b7515d4e7
commit f1475df6a9
4 changed files with 80 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

188
flake.lock generated
View File

@@ -123,11 +123,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1740596849, "lastModified": 1740937018,
"narHash": "sha256-8elI7d5XCz9Lv+qovIW6J1/9aGjgNJPjLeJ5OFmtgzY=", "narHash": "sha256-R4/+Vr4LpQWHwzZoM0fTyKKC1mGNF/NVHzIe6PqkJsY=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "b950948f45d8da3da0bb8dcf95dbeb421fd5fc2b", "rev": "4ab66e175e54084ca831e2eb3e24fbb048f9cff0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -139,26 +139,11 @@
}, },
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1737563566, "lastModified": 1739936662,
"narHash": "sha256-GLJvkOG29XCynQm8XWPyykMRqIhxKcBARVu7Ydrz02M=", "narHash": "sha256-x4syUjNUuRblR07nDPeLDP7DpphaBVbUaSoeZkFbGSk=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "849376434956794ebc7a6b487d31aace395392ba", "rev": "19de14aaeb869287647d9461cbd389187d8ecdb7",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"crane_2": {
"locked": {
"lastModified": 1731098351,
"narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=",
"owner": "ipetkov",
"repo": "crane",
"rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -219,11 +204,11 @@
"rust-analyzer-src": "rust-analyzer-src_2" "rust-analyzer-src": "rust-analyzer-src_2"
}, },
"locked": { "locked": {
"lastModified": 1740638187, "lastModified": 1741070164,
"narHash": "sha256-sEOdvnVsa14dQ2TTQnWfbHSMQ89wGL3insK5tAJ8iMU=", "narHash": "sha256-zgHp8rxIbJFeF2DuEMAhKqfdUnclcjaVfdhLNgX5nUM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "1cd5aefedb8f2be2c981856a71671bde9f8eb10b", "rev": "c36306dbcc4ad8128e659ea072ad35e02936b03e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -267,11 +252,11 @@
"flake-compat_3": { "flake-compat_3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1733328505,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -308,11 +293,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738453229, "lastModified": 1740872218,
"narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "rev": "3876f6b87db82f33775b1ef5ea343986105db764",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -329,11 +314,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730504689, "lastModified": 1738453229,
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "506278e768c2a08bec68eb62932193e341f55c90", "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -494,11 +479,11 @@
"zig2nix": "zig2nix" "zig2nix": "zig2nix"
}, },
"locked": { "locked": {
"lastModified": 1740667427, "lastModified": 1741102560,
"narHash": "sha256-mmfSR/Gaf5b1ufGMYm8JmHvD3Q5l0yX695W4qQraTrE=", "narHash": "sha256-ICmSAbBjPlvTTjs6QH4dO2yZ96tZOY6Zppk6vtrcIks=",
"owner": "ghostty-org", "owner": "ghostty-org",
"repo": "ghostty", "repo": "ghostty",
"rev": "a1437e55792c80985c7d5a305135df539ab5d723", "rev": "66e8d919572fddc5fd145eb563a555deeb249b35",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -585,17 +570,16 @@
}, },
"helix-flake": { "helix-flake": {
"inputs": { "inputs": {
"crane": "crane",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_5",
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1740621015, "lastModified": 1741107667,
"narHash": "sha256-19UFGKrO9ytQ85yEoXGVa5pMe1iZi4xAjm2C5OZi3hM=", "narHash": "sha256-0YzWN++/zu1tg7U5MC9H3C2VQo8vEEUbpaFpIpMlZB8=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "0efa8207d86d39f9bdd54e72117ae9c8817e2cc6", "rev": "fbc0f956b310284d609f2c00a1f4c0da6bcac165",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -611,11 +595,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1740624780, "lastModified": 1741056285,
"narHash": "sha256-8TP61AI3QBQsjzVUQFIV8NoB5nbYfJB3iHczhBikDkU=", "narHash": "sha256-/JKDMVqq8PIqcGonBVKbKq1SooV3kzGmv+cp3rKAgPA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b8869e4ead721bbd4f0d6b927e8395705d4f16e6", "rev": "70fbbf05a5594b0a72124ab211bff1d502c89e3f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -775,11 +759,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739465717, "lastModified": 1740698205,
"narHash": "sha256-8Ulwr1Z6n5YjM518DYMSHZUbPsZOG53d6QO/bwhb4SA=", "narHash": "sha256-9/X4+kKFcrldylDSC4hkyewG3UqVg1EFRYJkZazYXO0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hypridle", "repo": "hypridle",
"rev": "3e30a63b5db64a208e9394328a81048044571368", "rev": "9d97c2288316f7ed474c0d8cd248516d8fb72037",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -804,16 +788,15 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1740409549, "lastModified": 1741035361,
"narHash": "sha256-e9qtk//eEoWU3/UqY7oAZcGLxI7HToxuWoxQa07Ha9o=", "narHash": "sha256-WSfqkzWUY8FMFnaGm0n9QcoO0cgqJbYcv3ccfkFv7Qw=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland", "repo": "hyprland",
"rev": "e9c9f931ad7965de1345e5ac66437c80653a4e28", "rev": "d7e7a292613a4f20218074ff8299dff099a80098",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "hyprwm", "owner": "hyprwm",
"ref": "nix-module",
"repo": "hyprland", "repo": "hyprland",
"type": "github" "type": "github"
} }
@@ -826,11 +809,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739465511, "lastModified": 1740923452,
"narHash": "sha256-kXdVW89VJoG+W6N1u0m8hgK2VIWUAweQVzehRZwdNSo=", "narHash": "sha256-iQNkVG0368H3kiwSYSs1N6sU7GhHSmx0b9y+Z+eO1+c=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "contrib", "repo": "contrib",
"rev": "59178a657b7e09ddf82b9e79681f482b6c2f378b", "rev": "6f0d5e16c534aeda47d99b4d20bb2a22bfc60c23",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1046,11 +1029,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739122850, "lastModified": 1740765362,
"narHash": "sha256-AcxjGOlsD27INeDQqVPIgMp95bQsdOm07yr99po/960=", "narHash": "sha256-QmF+wyFzudTB3Dq2i9acY/nhc8uRiD+p7iG+V1Q5neE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprpaper", "repo": "hyprpaper",
"rev": "7e18ebc843ee4ccf2632091d55c73428b339265b", "rev": "6f4ba431638e44478417b9f524fb1771e5eda83c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1208,7 +1191,7 @@
}, },
"lanzaboote": { "lanzaboote": {
"inputs": { "inputs": {
"crane": "crane_2", "crane": "crane",
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
"flake-parts": "flake-parts_3", "flake-parts": "flake-parts_3",
"nixpkgs": "nixpkgs_7", "nixpkgs": "nixpkgs_7",
@@ -1216,11 +1199,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1740440383, "lastModified": 1741001137,
"narHash": "sha256-w8ixbqOGrVWMQZFFs4uAwZpuwuGMzFoKjocMFxTR5Ts=", "narHash": "sha256-XxWib5eI3rgMPA4VzDHOx89WT76IN/ZNb+votz5gakw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lanzaboote", "repo": "lanzaboote",
"rev": "6321bc060d757c137c1fbae2057c7e941483878f", "rev": "cc9786aa8158437facead0d8e21ac0c03be91dc8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1315,11 +1298,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1740552472, "lastModified": 1740981963,
"narHash": "sha256-KiGmSYyO9MJJqYD7nbQ0NQgsAR2VVY/wRra0Bob4KtE=", "narHash": "sha256-UVI1Nn5rHFLX5p3Bym/7u+LdZEnBr3pclprcUPkslvw=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "452fbd6a30f128dddf26c63f727cf685b5af5658", "rev": "5a240f9176826c61afc664e58e55256428a5be93",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1395,22 +1378,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1730741070,
"narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1738136902, "lastModified": 1738136902,
@@ -1477,11 +1444,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1740367490, "lastModified": 1740828860,
"narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", "narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", "rev": "303bd8071377433a2d8f76e684ec773d70c5b642",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1493,11 +1460,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1728018373, "lastModified": 1740560979,
"narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "rev": "5135c59491985879812717f4c9fea69604e7f26f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1525,11 +1492,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1731919951, "lastModified": 1740388614,
"narHash": "sha256-vOM6ETpl1yu9KLi/icTmLJIPbbdJCdAVYUXZceO/Ce4=", "narHash": "sha256-NgKqyZxckkuTRDNNjlJ3kYWUmarJ9+/VHWkGOy0oONQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "04386ac325a813047fc314d4b4d838a5b1e3c7fe", "rev": "92d410c2519dbc96f1fb5237810f19c07684aa8b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1556,11 +1523,11 @@
}, },
"nixpkgs_9": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1740560979, "lastModified": 1741010256,
"narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5135c59491985879812717f4c9fea69604e7f26f", "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1597,11 +1564,11 @@
"systems": "systems_7" "systems": "systems_7"
}, },
"locked": { "locked": {
"lastModified": 1740659022, "lastModified": 1740938036,
"narHash": "sha256-eUbuxeOQFKZln1ctHDgJDyRzvEK8XkjG6pMVkONQEBA=", "narHash": "sha256-KDc+kDDX9s8c574sx7idXVYTJM2WZElAk9qbgxrCnSo=",
"owner": "notashelf", "owner": "notashelf",
"repo": "nvf", "repo": "nvf",
"rev": "7e53fc47243448fdd01adf2a5b780831853c5dca", "rev": "f24189f1d2a7730b7fe87164bae40c2d0be8d3c9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1643,15 +1610,14 @@
"nixpkgs": [ "nixpkgs": [
"lanzaboote", "lanzaboote",
"nixpkgs" "nixpkgs"
], ]
"nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1731363552, "lastModified": 1737465171,
"narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1708,11 +1674,11 @@
"rust-analyzer-src_2": { "rust-analyzer-src_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1740583884, "lastModified": 1741011961,
"narHash": "sha256-4Ad12AK1yFlMAkr2rcsZPXgFMyrqJzVQwaMVVuT9dQg=", "narHash": "sha256-bssSxw3Z9CUNB9+f3EHAX/2urT15e12Jy6YU8tHyWkk=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "1795a85be39c74e0caded58301f3c9fb55a4e34f", "rev": "02862f5d52c30b476a5dca909a17aa4386d1fdc5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1730,11 +1696,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737599167, "lastModified": 1740623427,
"narHash": "sha256-S2rHCrQWCDVp63XxL/AQbGr1g5M8Zx14C7Jooa4oM8o=", "narHash": "sha256-3SdPQrZoa4odlScFDUHd4CUPQ/R1gtH4Mq9u8CBiK8M=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "38374302ae9edf819eac666d1f276d62c712dd06", "rev": "d342e8b5fd88421ff982f383c853f0fc78a847ab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1751,11 +1717,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731897198, "lastModified": 1740364262,
"narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", "narHash": "sha256-X5EtT29uEtXN2E4bDiDU2HGBdmFHjHf1KbP6iKP0cmg=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", "rev": "7c5892ad87b90d72668964975eebd4e174ff6204",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1993,11 +1959,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1740350337, "lastModified": 1740857660,
"narHash": "sha256-Ue+ERNL8y9l/0BTay1/fm1V2zcKFf/dX5H1DHI2TO+w=", "narHash": "sha256-fm/EVyg2soItlrRHSLyYUilcT2kCWxuj8KP7pN6SGXA=",
"owner": "wez", "owner": "wez",
"repo": "wezterm", "repo": "wezterm",
"rev": "fd532a8c2fb3b56593597cf8be1775da1feda0a3", "rev": "7d0bff0698813c9feeba91a342cd6df94aa34630",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View File

@@ -35,7 +35,7 @@
}; };
# Hyprland environment # Hyprland environment
hyprland.url = "github:hyprwm/hyprland/nix-module"; hyprland.url = "github:hyprwm/hyprland";
hyprland-contrib = { hyprland-contrib = {
url = "github:hyprwm/contrib"; url = "github:hyprwm/contrib";

1
modules/nixos/programs/hyprland/default.nix
View File

@@ -33,6 +33,7 @@ in {
programs.hyprland = { programs.hyprland = {
enable = true; enable = true;
withUWSM = true;
}; };
environment.variables.NIXOS_OZONE_WL = "1"; environment.variables.NIXOS_OZONE_WL = "1";
}; };

38
modules/nixos/services/greetd/default.nix
View File

@@ -1,12 +1,10 @@
{ {
pkgs,
config, config,
lib, lib,
... ...
}: let }: let
inherit (lib) mkIf mkEnableOption mkMerge mkOption types; inherit (lib) mkIf mkEnableOption mkOption types;
cfg = config.nixos.services.greetd; cfg = config.nixos.services.greetd;
host = config.networking.hostName;
in { in {
options = { options = {
nixos.services.greetd = { nixos.services.greetd = {
@@ -37,39 +35,5 @@ in {
initial_session = session; initial_session = session;
}; };
}; };
programs.uwsm = {
enable = true;
waylandCompositors.hyprland = {
binPath = "/run/current-system/sw/bin/Hyprland";
prettyName = "Hyprland";
comment = "Hyprland managed by UWSM";
};
};
# (mkIf (host == "cnix" || host == "cnixpad") {
# programs.uwsm = {
# enable = true;
# waylandCompositors.hyprland = {
# binPath = "/etc/profiles/per-user/cnst/bin/Hyprland";
# prettyName = "Hyprland";
# comment = "Hyprland managed by UWSM";
# };
# };
# })
# (mkIf (host == "toothpc") {
# programs.uwsm = {
# enable = true;
# waylandCompositors.hyprland = {
# binPath = "/etc/profiles/per-user/toothpick/bin/Hyprland";
# prettyName = "Hyprland";
# comment = "Hyprland managed by UWSM";
# };
# };
# })
# # Apply GnomeKeyring PAM Service based on user configuration
# # security.pam.services.greetd.enableGnomeKeyring = cfg.gnomeKeyring.enable;
# ]);
}; };
} }