Compare commits
11 commits
78117b3bb4
...
0177d29d29
| Author | SHA1 | Date | |
|---|---|---|---|
0177d29d29
|
|||
|
70f39d017b
|
|||
|
bdbf7b4117
|
|||
|
ea06324acd
|
|||
|
4e1f78f7f2
|
|||
|
e69c0feab9
|
|||
|
2cedd8b507
|
|||
|
dc6ac4b23c
|
|||
|
d0c4c6da05
|
|||
|
ea922eb16d
|
|||
|
587708328d
|
15 changed files with 501 additions and 269 deletions
454
flake.lock
454
flake.lock
|
|
@ -4,9 +4,7 @@
|
|||
"inputs": {
|
||||
"darwin": "darwin",
|
||||
"home-manager": "home-manager",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs": ["nixpkgs"],
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -25,15 +23,15 @@
|
|||
},
|
||||
"ags": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs",
|
||||
"systems": "systems_2"
|
||||
"astal": "astal",
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728326430,
|
||||
"narHash": "sha256-tV1ABHuA1HItMdCTuNdA8fMB+qw7LpjvI945VwMSABI=",
|
||||
"lastModified": 1731689198,
|
||||
"narHash": "sha256-XMFaDht3RHtlwZ7NQKbz2Cd0e4oDMB7syyOd9ifbn98=",
|
||||
"owner": "Aylur",
|
||||
"repo": "ags",
|
||||
"rev": "60180a184cfb32b61a1d871c058b31a3b9b0743d",
|
||||
"rev": "3e270c8172ae7b61c5e5f24aea69985f792aa000",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -42,6 +40,24 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"astal": {
|
||||
"inputs": {
|
||||
"nixpkgs": ["ags", "nixpkgs"]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533099,
|
||||
"narHash": "sha256-q0JcigMAoz3bJqCJwms5mR2de5J1Cw5NgjCev+2ylDA=",
|
||||
"owner": "aylur",
|
||||
"repo": "astal",
|
||||
"rev": "f7cfc8eb77a395373bf40f83b0d779ece34a6108",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "aylur",
|
||||
"repo": "astal",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"basix": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
|
|
@ -49,11 +65,11 @@
|
|||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1727493962,
|
||||
"narHash": "sha256-9eYh6s5ChKmm2uqsZijk6PCGoyZyEgZ0BJqt+ESDrqU=",
|
||||
"lastModified": 1731727882,
|
||||
"narHash": "sha256-GLHrsoW8nrEGU7Oarwkyhtks5YqPvtcTqWl0+dtFqjM=",
|
||||
"owner": "notashelf",
|
||||
"repo": "basix",
|
||||
"rev": "742cefc42e7fa7bb77f5bd1c3191ff8c8fa8d610",
|
||||
"rev": "5cdb4c25956c93a192c37572236d0a12b068d7f8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -63,11 +79,23 @@
|
|||
}
|
||||
},
|
||||
"crane": {
|
||||
"locked": {
|
||||
"lastModified": 1730060262,
|
||||
"narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "498d9f122c413ee1154e8131ace5a35a80d8fa76",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"crane_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"lanzaboote",
|
||||
"nixpkgs"
|
||||
]
|
||||
"nixpkgs": ["lanzaboote", "nixpkgs"]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1717535930,
|
||||
|
|
@ -85,10 +113,7 @@
|
|||
},
|
||||
"darwin": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"agenix",
|
||||
"nixpkgs"
|
||||
]
|
||||
"nixpkgs": ["agenix", "nixpkgs"]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1700795494,
|
||||
|
|
@ -128,17 +153,15 @@
|
|||
"firefox-addons": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
"nixpkgs": ["nixpkgs"]
|
||||
},
|
||||
"locked": {
|
||||
"dir": "pkgs/firefox-addons",
|
||||
"lastModified": 1731297786,
|
||||
"narHash": "sha256-YC+FPREQqPF2HNSu1PkvVps5mBzexxvCV6NXfTf/kQI=",
|
||||
"lastModified": 1731788701,
|
||||
"narHash": "sha256-M3AwY7SeSjFZh1XA7zL8roVXiEAvb9BVaGoJZ+1rZM8=",
|
||||
"owner": "rycee",
|
||||
"repo": "nur-expressions",
|
||||
"rev": "85c8db7e7e901f656072b01f89c8fffcab26bfa6",
|
||||
"rev": "9da3f74ac2cba8d812aef5fe16686afa25033b21",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -216,10 +239,7 @@
|
|||
},
|
||||
"flake-parts_2": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"lanzaboote",
|
||||
"nixpkgs"
|
||||
]
|
||||
"nixpkgs-lib": ["lanzaboote", "nixpkgs"]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1717285511,
|
||||
|
|
@ -270,7 +290,7 @@
|
|||
},
|
||||
"flake-utils_2": {
|
||||
"inputs": {
|
||||
"systems": "systems_4"
|
||||
"systems": "systems_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710146030,
|
||||
|
|
@ -288,7 +308,7 @@
|
|||
},
|
||||
"flake-utils_3": {
|
||||
"inputs": {
|
||||
"systems": "systems_5"
|
||||
"systems": "systems_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710146030,
|
||||
|
|
@ -306,7 +326,7 @@
|
|||
},
|
||||
"flake-utils_4": {
|
||||
"inputs": {
|
||||
"systems": "systems_8"
|
||||
"systems": "systems_7"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726560853,
|
||||
|
|
@ -341,11 +361,7 @@
|
|||
},
|
||||
"gitignore": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"lanzaboote",
|
||||
"pre-commit-hooks-nix",
|
||||
"nixpkgs"
|
||||
]
|
||||
"nixpkgs": ["lanzaboote", "pre-commit-hooks-nix", "nixpkgs"]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709087332,
|
||||
|
|
@ -380,10 +396,7 @@
|
|||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"agenix",
|
||||
"nixpkgs"
|
||||
]
|
||||
"nixpkgs": ["agenix", "nixpkgs"]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1703113217,
|
||||
|
|
@ -401,16 +414,14 @@
|
|||
},
|
||||
"home-manager_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
"nixpkgs": ["nixpkgs"]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731235328,
|
||||
"narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=",
|
||||
"lastModified": 1731786860,
|
||||
"narHash": "sha256-130gQ5k8kZlxjBEeLpE+SvWFgSOFgQFeZlqIik7KgtQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "60bb110917844d354f3c18e05450606a435d2d10",
|
||||
"rev": "1bd5616e33c0c54d7a5b37db94160635a9b27aeb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -419,17 +430,36 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"lanzaboote": {
|
||||
"ironbar": {
|
||||
"inputs": {
|
||||
"crane": "crane",
|
||||
"naersk": "naersk",
|
||||
"nixpkgs": ["nixpkgs"],
|
||||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731790092,
|
||||
"narHash": "sha256-qO4282Y6iw5z37LuQQ8P5LVy7ZOZFFE7Ch/tP8Y/mWw=",
|
||||
"owner": "JakeStanger",
|
||||
"repo": "ironbar",
|
||||
"rev": "42e25f5ef2ce9886d8fafb42aff9ced7ef183726",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "JakeStanger",
|
||||
"repo": "ironbar",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"lanzaboote": {
|
||||
"inputs": {
|
||||
"crane": "crane_2",
|
||||
"flake-compat": "flake-compat_3",
|
||||
"flake-parts": "flake-parts_2",
|
||||
"flake-utils": "flake-utils_2",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs": ["nixpkgs"],
|
||||
"pre-commit-hooks-nix": "pre-commit-hooks-nix",
|
||||
"rust-overlay": "rust-overlay"
|
||||
"rust-overlay": "rust-overlay_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1718178907,
|
||||
|
|
@ -480,11 +510,25 @@
|
|||
},
|
||||
"naersk": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nvf",
|
||||
"rnix-lsp",
|
||||
"nixpkgs"
|
||||
]
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721727458,
|
||||
"narHash": "sha256-r/xppY958gmZ4oTfLiHN0ZGuQ+RSTijDblVgVLFi1mw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "naersk",
|
||||
"rev": "3fb418eaf352498f6b6c30592e3beb63df42ef11",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "naersk",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"naersk_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": ["nvf", "rnix-lsp", "nixpkgs"]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1655042882,
|
||||
|
|
@ -502,15 +546,9 @@
|
|||
},
|
||||
"nil": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"nvf",
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nvf",
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-overlay": "rust-overlay_2"
|
||||
"flake-utils": ["nvf", "flake-utils"],
|
||||
"nixpkgs": ["nvf", "nixpkgs"],
|
||||
"rust-overlay": "rust-overlay_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1714571717,
|
||||
|
|
@ -530,17 +568,17 @@
|
|||
"inputs": {
|
||||
"niri-stable": "niri-stable",
|
||||
"niri-unstable": "niri-unstable",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"nixpkgs-stable": "nixpkgs-stable_2",
|
||||
"xwayland-satellite-stable": "xwayland-satellite-stable",
|
||||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731340075,
|
||||
"narHash": "sha256-Ompgm7Rrdcp8MwDNRyq5U8lF9VC4fBBYt0pS7H0l0V0=",
|
||||
"lastModified": 1731786605,
|
||||
"narHash": "sha256-Ceq6Vn9cvDh+kXDvLf/U30xUKfV047D/l7G0TvOaink=",
|
||||
"owner": "sodiboo",
|
||||
"repo": "niri-flake",
|
||||
"rev": "a810c547fd00e98b302b52d9ac35c3bee037e4fd",
|
||||
"rev": "b312712206428678b4602f1255c68df2d3e4534f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -569,11 +607,11 @@
|
|||
"niri-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1731337661,
|
||||
"narHash": "sha256-9QXxi0H0+lPUwa82knlj6Yxy79LsYkwxSOBToNxh/xY=",
|
||||
"lastModified": 1731575130,
|
||||
"narHash": "sha256-V+bIsYXshtdMv7Ycw1Y/xVfKdWVywXuqHHII7FgV6dg=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "17861e0003c122dec9ad8cca1177c750ca6390c8",
|
||||
"rev": "1a0612cbfd0abee0796efa86470226686ae78f21",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -584,16 +622,14 @@
|
|||
},
|
||||
"nix-index-db": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
"nixpkgs": ["nixpkgs"]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731209121,
|
||||
"narHash": "sha256-BF7FBh1hIYPDihdUlImHGsQzaJZVLLfYqfDx41wjuF0=",
|
||||
"lastModified": 1731593150,
|
||||
"narHash": "sha256-FvksinoI2Y6kuwH+cKBu1oDA8uPGfoRqgtQV6O8GDc4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "896019f04b22ce5db4c0ee4f89978694f44345c3",
|
||||
"rev": "40d882b55e89add1ded379cc99edaab24983d6d9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -604,11 +640,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1731332224,
|
||||
"narHash": "sha256-0ctfVp27ingWtY7dbP5+QpSQ98HaOZleU0teyHQUAw0=",
|
||||
"lastModified": 1731797098,
|
||||
"narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "184687ae1a3139faa4746168baf071f60d0310c8",
|
||||
"rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -619,15 +655,15 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1725634671,
|
||||
"narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
|
||||
"owner": "NixOS",
|
||||
"lastModified": 1731139594,
|
||||
"narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
|
||||
"rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
|
|
@ -675,11 +711,11 @@
|
|||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1731239293,
|
||||
"narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=",
|
||||
"lastModified": 1731652201,
|
||||
"narHash": "sha256-XUO0JKP1hlww0d7mm3kpmIr4hhtR4zicg5Wwes9cPMg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9256f7c71a195ebe7a218043d9f93390d49e6884",
|
||||
"rev": "c21b77913ea840f8bcf9adf4c41cecc2abffd38d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -689,6 +725,22 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_10": {
|
||||
"locked": {
|
||||
"lastModified": 1726871744,
|
||||
"narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1715266358,
|
||||
|
|
@ -723,31 +775,29 @@
|
|||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1731139594,
|
||||
"narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
|
||||
"lastModified": 1730272153,
|
||||
"narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
|
||||
"rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
"id": "nixpkgs",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1731139594,
|
||||
"narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
|
||||
"lastModified": 1731676054,
|
||||
"narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
|
||||
"rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
|
|
@ -755,21 +805,37 @@
|
|||
},
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1726871744,
|
||||
"narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=",
|
||||
"owner": "nixos",
|
||||
"lastModified": 1731319897,
|
||||
"narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2",
|
||||
"rev": "dc460ec76cbff0e66e269457d7b728432263166c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "dc460ec76cbff0e66e269457d7b728432263166c",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1726871744,
|
||||
"narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_8": {
|
||||
"locked": {
|
||||
"lastModified": 1656753965,
|
||||
"narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=",
|
||||
|
|
@ -785,33 +851,17 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_8": {
|
||||
"locked": {
|
||||
"lastModified": 1711404521,
|
||||
"narHash": "sha256-cYhDZ3RYLiXAi4LQDGuQjjDDbtP00Wd/Vjal/jWyTuA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "07518c851b0f12351d7709274bbbd4ecc1f089c7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "07518c851b0f12351d7709274bbbd4ecc1f089c7",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_9": {
|
||||
"locked": {
|
||||
"lastModified": 1726871744,
|
||||
"narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=",
|
||||
"owner": "nixos",
|
||||
"lastModified": 1731531548,
|
||||
"narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2",
|
||||
"rev": "24f0d4acd634792badd6470134c387a3b039dace",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
|
|
@ -839,7 +889,7 @@
|
|||
"flake-utils": "flake-utils_3",
|
||||
"mnw": "mnw",
|
||||
"nil": "nil",
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"nixpkgs": "nixpkgs_7",
|
||||
"nmd": "nmd",
|
||||
"plugin-alpha-nvim": "plugin-alpha-nvim",
|
||||
"plugin-bufdelete-nvim": "plugin-bufdelete-nvim",
|
||||
|
|
@ -944,7 +994,7 @@
|
|||
"plugin-vim-vsnip": "plugin-vim-vsnip",
|
||||
"plugin-which-key": "plugin-which-key",
|
||||
"rnix-lsp": "rnix-lsp",
|
||||
"systems": "systems_6"
|
||||
"systems": "systems_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731058322,
|
||||
|
|
@ -962,12 +1012,8 @@
|
|||
},
|
||||
"plasma-manager": {
|
||||
"inputs": {
|
||||
"home-manager": [
|
||||
"home-manager"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
"home-manager": ["home-manager"],
|
||||
"nixpkgs": ["nixpkgs"]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731193165,
|
||||
|
|
@ -2618,14 +2664,15 @@
|
|||
},
|
||||
"portfolio": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_8"
|
||||
"nixpkgs": "nixpkgs_9",
|
||||
"sam-zola": "sam-zola"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730891412,
|
||||
"narHash": "sha256-EEXp1jQMoA7off1ioqB5aJM1a5ZfGS6KQVsYSZ/ub78=",
|
||||
"lastModified": 1731578190,
|
||||
"narHash": "sha256-9T5+xa1Qz4iJn31oq3q4T5JLr4bx3KHolwtPx1EBvlk=",
|
||||
"owner": "nezia1",
|
||||
"repo": "portfolio",
|
||||
"rev": "082cc68c67deead967bf177d048995c6a27ef84e",
|
||||
"rev": "34130f9c530d0f009865a443bef40531ef9b3dbe",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -2636,15 +2683,9 @@
|
|||
},
|
||||
"pre-commit-hooks-nix": {
|
||||
"inputs": {
|
||||
"flake-compat": [
|
||||
"lanzaboote",
|
||||
"flake-compat"
|
||||
],
|
||||
"flake-compat": ["lanzaboote", "flake-compat"],
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": [
|
||||
"lanzaboote",
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs": ["lanzaboote", "nixpkgs"],
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -2663,8 +2704,8 @@
|
|||
},
|
||||
"rnix-lsp": {
|
||||
"inputs": {
|
||||
"naersk": "naersk",
|
||||
"nixpkgs": "nixpkgs_7",
|
||||
"naersk": "naersk_2",
|
||||
"nixpkgs": "nixpkgs_8",
|
||||
"utils": "utils_2"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -2689,29 +2730,42 @@
|
|||
"deploy-rs": "deploy-rs",
|
||||
"firefox-addons": "firefox-addons",
|
||||
"home-manager": "home-manager_2",
|
||||
"ironbar": "ironbar",
|
||||
"lanzaboote": "lanzaboote",
|
||||
"niri": "niri",
|
||||
"nix-index-db": "nix-index-db",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"nvf": "nvf",
|
||||
"plasma-manager": "plasma-manager",
|
||||
"portfolio": "portfolio",
|
||||
"systems": "systems_7",
|
||||
"systems": "systems_6",
|
||||
"treefmt-nix": "treefmt-nix",
|
||||
"wezterm": "wezterm"
|
||||
}
|
||||
},
|
||||
"rust-overlay": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"lanzaboote",
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"lanzaboote",
|
||||
"nixpkgs"
|
||||
]
|
||||
"nixpkgs": ["ironbar", "nixpkgs"]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730341826,
|
||||
"narHash": "sha256-RFaeY7EWzXOmAL2IQEACbnrEza3TgD5UQApHR4hGHhY=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "815d1b3ee71716fc91a7bd149801e1f04d45fbc5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"rust-overlay_2": {
|
||||
"inputs": {
|
||||
"flake-utils": ["lanzaboote", "flake-utils"],
|
||||
"nixpkgs": ["lanzaboote", "nixpkgs"]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1717813066,
|
||||
|
|
@ -2727,18 +2781,10 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"rust-overlay_2": {
|
||||
"rust-overlay_3": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"nvf",
|
||||
"nil",
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nvf",
|
||||
"nil",
|
||||
"nixpkgs"
|
||||
]
|
||||
"flake-utils": ["nvf", "nil", "flake-utils"],
|
||||
"nixpkgs": ["nvf", "nil", "nixpkgs"]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1714529851,
|
||||
|
|
@ -2754,12 +2800,9 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"rust-overlay_3": {
|
||||
"rust-overlay_4": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"wezterm",
|
||||
"nixpkgs"
|
||||
]
|
||||
"nixpkgs": ["wezterm", "nixpkgs"]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729477859,
|
||||
|
|
@ -2775,6 +2818,22 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"sam-zola": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1612976548,
|
||||
"narHash": "sha256-ut1NiSM0GooRrHFikvuTCLU2XhpplhFQejFSbTa9ZdU=",
|
||||
"owner": "janbaudisch",
|
||||
"repo": "zola-sam",
|
||||
"rev": "890b51b4105fd2e63f5e417e5cb63b8e25d5721f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "janbaudisch",
|
||||
"repo": "zola-sam",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
|
|
@ -2792,16 +2851,16 @@
|
|||
},
|
||||
"systems_2": {
|
||||
"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"
|
||||
}
|
||||
},
|
||||
|
|
@ -2851,21 +2910,6 @@
|
|||
}
|
||||
},
|
||||
"systems_6": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_7": {
|
||||
"locked": {
|
||||
"lastModified": 1689347949,
|
||||
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
||||
|
|
@ -2880,7 +2924,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_8": {
|
||||
"systems_7": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
|
|
@ -2897,7 +2941,7 @@
|
|||
},
|
||||
"treefmt-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_9"
|
||||
"nixpkgs": "nixpkgs_10"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730321837,
|
||||
|
|
@ -2915,7 +2959,7 @@
|
|||
},
|
||||
"utils": {
|
||||
"inputs": {
|
||||
"systems": "systems_3"
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1701680307,
|
||||
|
|
@ -2952,19 +2996,17 @@
|
|||
"freetype2": "freetype2",
|
||||
"harfbuzz": "harfbuzz",
|
||||
"libpng": "libpng",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-overlay": "rust-overlay_3",
|
||||
"nixpkgs": ["nixpkgs"],
|
||||
"rust-overlay": "rust-overlay_4",
|
||||
"zlib": "zlib"
|
||||
},
|
||||
"locked": {
|
||||
"dir": "nix",
|
||||
"lastModified": 1730734444,
|
||||
"narHash": "sha256-lNgCAphrq3/bYGjgDxEl2rVcer6GnmfWXDhxc+kdYOk=",
|
||||
"lastModified": 1731625276,
|
||||
"narHash": "sha256-NbgX4nfGJYFflQauJZMTJrpgTD5oY3hgs+KNE3JJgSc=",
|
||||
"owner": "wez",
|
||||
"repo": "wezterm",
|
||||
"rev": "51c794ac500a2033b9dc570c71810518bfa667a9",
|
||||
"rev": "979df7826965348345a3305ed889a4b9aef838e1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
13
flake.nix
13
flake.nix
|
|
@ -13,6 +13,7 @@
|
|||
eachSystem = f: nixpkgs.lib.genAttrs (import systems) (system: f nixpkgs.legacyPackages.${system});
|
||||
treefmtEval = eachSystem (pkgs: treefmt-nix.lib.evalModule pkgs ./treefmt.nix);
|
||||
in {
|
||||
imports = [./modules];
|
||||
devShells = eachSystem (pkgs: {
|
||||
default = pkgs.mkShell {
|
||||
packages = [
|
||||
|
|
@ -24,17 +25,17 @@
|
|||
};
|
||||
});
|
||||
formatter = eachSystem (pkgs: treefmtEval.${pkgs.system}.config.build.wrapper);
|
||||
nixosModules = import ./modules;
|
||||
nixosConfigurations = let
|
||||
lib' = import ./lib {inherit inputs lib';};
|
||||
in
|
||||
import ./hosts {inherit inputs lib';};
|
||||
packages = eachSystem (pkgs: import ./pkgs {inherit inputs pkgs;});
|
||||
deploy.nodes = import ./nodes {inherit self inputs;};
|
||||
deploy.nodes = import ./nodes {inherit inputs;};
|
||||
checks = builtins.mapAttrs (_: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
|
||||
};
|
||||
inputs = {
|
||||
# nix related
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/dc460ec76cbff0e66e269457d7b728432263166c"; # TODO: remove when 24.11 is out
|
||||
systems.url = "github:nix-systems/default-linux";
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
||||
lanzaboote = {
|
||||
|
|
@ -58,15 +59,17 @@
|
|||
ags.url = "github:Aylur/ags";
|
||||
basix.url = "github:notashelf/basix";
|
||||
deploy-rs.url = "github:serokell/deploy-rs";
|
||||
ironbar = {
|
||||
url = "github:JakeStanger/ironbar";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
firefox-addons = {
|
||||
url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
niri.url = "github:sodiboo/niri-flake";
|
||||
nvf.url = "github:notashelf/nvf";
|
||||
|
||||
portfolio.url = "github:nezia1/portfolio";
|
||||
|
||||
plasma-manager = {
|
||||
url = "github:nix-community/plasma-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
|
|||
150
home/programs/ironbar/default.nix
Normal file
150
home/programs/ironbar/default.nix
Normal file
|
|
@ -0,0 +1,150 @@
|
|||
{
|
||||
lib,
|
||||
inputs,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkForce;
|
||||
icon_size = 28;
|
||||
swayncStyle = pkgs.fetchurl {
|
||||
url = "https://github.com/catppuccin/swaync/releases/download/v0.2.3/macchiato.css";
|
||||
sha256 = "sha256-LMm6nWn1JPPgj5YpppwFG3lXTtXem5atlIvqrDxd0bM=";
|
||||
};
|
||||
in {
|
||||
imports = [inputs.ironbar.homeManagerModules.default];
|
||||
home.packages = [pkgs.procps];
|
||||
services.swaync = {
|
||||
enable = true;
|
||||
style = swayncStyle;
|
||||
settings = {
|
||||
positionX = "right";
|
||||
positionY = "top";
|
||||
layer = "overlay";
|
||||
control-center-layer = "top";
|
||||
layer-shell = true;
|
||||
cssPriority = "application";
|
||||
control-center-margin-top = 0;
|
||||
control-center-margin-bottom = 0;
|
||||
control-center-margin-right = 0;
|
||||
control-center-margin-left = 0;
|
||||
notification-2fa-action = true;
|
||||
notification-inline-replies = false;
|
||||
notification-icon-size = 64;
|
||||
notification-body-image-height = 100;
|
||||
notification-body-image-width = 200;
|
||||
};
|
||||
};
|
||||
|
||||
systemd.user.services.swaync = {
|
||||
Install.WantedBy = mkForce ["graphical-session.target"];
|
||||
Unit.ConditionEnvironment = mkForce "";
|
||||
Unit.PartOf = lib.mkForce ["graphical-session.target"];
|
||||
};
|
||||
|
||||
programs.ironbar = {
|
||||
enable = true;
|
||||
systemd = true;
|
||||
config = {
|
||||
position = "top";
|
||||
anchor_to_edges = true;
|
||||
start = [
|
||||
{
|
||||
bar = [
|
||||
{
|
||||
label = "";
|
||||
name = "power-btn";
|
||||
on_click = "popup:toggle";
|
||||
type = "button";
|
||||
}
|
||||
];
|
||||
class = "power-menu";
|
||||
popup = [
|
||||
{
|
||||
orientation = "vertical";
|
||||
type = "box";
|
||||
widgets = [
|
||||
{
|
||||
label = "Power menu";
|
||||
name = "header";
|
||||
type = "label";
|
||||
}
|
||||
{
|
||||
type = "box";
|
||||
widgets = [
|
||||
{
|
||||
class = "power-btn";
|
||||
label = "<span font-size='40pt'></span>";
|
||||
on_click = "!shutdown now";
|
||||
type = "button";
|
||||
}
|
||||
{
|
||||
class = "power-btn";
|
||||
label = "<span font-size='40pt'></span>";
|
||||
on_click = "!reboot";
|
||||
type = "button";
|
||||
}
|
||||
];
|
||||
}
|
||||
{
|
||||
label = "Uptime: {{30000:uptime -p | cut -d ' ' -f2-}}";
|
||||
name = "uptime";
|
||||
type = "label";
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
tooltip = "Up: {{30000:uptime -p | cut -d ' ' -f2-}}";
|
||||
type = "custom";
|
||||
}
|
||||
];
|
||||
center = [
|
||||
{
|
||||
inherit icon_size;
|
||||
type = "focused";
|
||||
show_icon = true;
|
||||
show_title = true;
|
||||
truncate = "end";
|
||||
}
|
||||
];
|
||||
end = [
|
||||
{
|
||||
type = "upower";
|
||||
format = "{percentage}%";
|
||||
}
|
||||
{
|
||||
type = "volume";
|
||||
format = "{icon} {percentage}%";
|
||||
max_volume = 100;
|
||||
icons = {
|
||||
volume_high = "";
|
||||
volume_medium = "";
|
||||
volume_low = "";
|
||||
muted = "";
|
||||
};
|
||||
}
|
||||
{type = "clock";}
|
||||
{
|
||||
type = "tray";
|
||||
inherit icon_size;
|
||||
}
|
||||
{
|
||||
type = "notifications";
|
||||
"show_count" = true;
|
||||
icons = {
|
||||
"closed_none" = "";
|
||||
"closed_some" = "";
|
||||
"closed_dnd" = "";
|
||||
"open_none" = "";
|
||||
"open_some" = "";
|
||||
"open_dnd" = "";
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
style = ''
|
||||
.tray .item {
|
||||
min-width: 40px;
|
||||
}
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
@ -6,7 +6,8 @@
|
|||
osConfig,
|
||||
...
|
||||
}: let
|
||||
colors = inputs.basix.schemeData.base16.${osConfig.theme.scheme}.palette;
|
||||
inherit (inputs.basix.schemeData.base16.${osConfig.theme.scheme}) palette;
|
||||
inherit (lib) getExe mkIf;
|
||||
in {
|
||||
imports = [./binds.nix];
|
||||
|
||||
|
|
@ -36,7 +37,7 @@ in {
|
|||
layout = {
|
||||
focus-ring = {
|
||||
enable = true;
|
||||
active.color = "#${colors.base0E}";
|
||||
active.color = palette.base0E;
|
||||
};
|
||||
always-center-single-column = true;
|
||||
};
|
||||
|
|
@ -91,6 +92,10 @@ in {
|
|||
"DISPLAY" = ":0";
|
||||
"_JAVA_AWT_WM_NONREPARENTING" = "1"; # https://wiki.archlinux.org/title/Sway#Java_applications
|
||||
};
|
||||
|
||||
spawn-at-startup = [
|
||||
(mkIf config.programs.ironbar.enable {command = [(getExe inputs.ironbar.packages.${pkgs.system}.default)];})
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -14,28 +14,31 @@
|
|||
shell = "${lib.getExe config.programs.fish.package}";
|
||||
};
|
||||
colors = let
|
||||
schemeData = inputs.basix.schemeData.base16.${osConfig.theme.scheme};
|
||||
inherit (lib) mapAttrs;
|
||||
inherit (lib.strings) removePrefix;
|
||||
# because someone thought this was a great idea: https://github.com/tinted-theming/schemes/commit/61058a8d2e2bd4482b53d57a68feb56cdb991f0b
|
||||
palette = mapAttrs (_: color: removePrefix "#" color) inputs.basix.schemeData.base16.${osConfig.theme.scheme}.palette;
|
||||
in {
|
||||
background = schemeData.palette.base00;
|
||||
foreground = schemeData.palette.base05;
|
||||
background = palette.base00;
|
||||
foreground = palette.base05;
|
||||
|
||||
regular0 = schemeData.palette.base01;
|
||||
regular1 = schemeData.palette.base08;
|
||||
regular2 = schemeData.palette.base0B;
|
||||
regular3 = schemeData.palette.base0A;
|
||||
regular4 = schemeData.palette.base0D;
|
||||
regular5 = schemeData.palette.base0E;
|
||||
regular6 = schemeData.palette.base0C;
|
||||
regular7 = schemeData.palette.base06;
|
||||
regular0 = palette.base01;
|
||||
regular1 = palette.base08;
|
||||
regular2 = palette.base0B;
|
||||
regular3 = palette.base0A;
|
||||
regular4 = palette.base0D;
|
||||
regular5 = palette.base0E;
|
||||
regular6 = palette.base0C;
|
||||
regular7 = palette.base06;
|
||||
|
||||
bright0 = schemeData.palette.base02;
|
||||
bright1 = schemeData.palette.base08;
|
||||
bright2 = schemeData.palette.base0B;
|
||||
bright3 = schemeData.palette.base0A;
|
||||
bright4 = schemeData.palette.base0D;
|
||||
bright5 = schemeData.palette.base0E;
|
||||
bright6 = schemeData.palette.base0C;
|
||||
bright7 = schemeData.palette.base07;
|
||||
bright0 = palette.base02;
|
||||
bright1 = palette.base08;
|
||||
bright2 = palette.base0B;
|
||||
bright3 = palette.base0A;
|
||||
bright4 = palette.base0D;
|
||||
bright5 = palette.base0E;
|
||||
bright6 = palette.base0C;
|
||||
bright7 = palette.base07;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,9 +1,5 @@
|
|||
{
|
||||
self,
|
||||
inputs,
|
||||
...
|
||||
}: let
|
||||
mod = "${self}/system";
|
||||
{inputs, ...}: let
|
||||
system = "${inputs.self}/system";
|
||||
in {
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
|
|
@ -11,9 +7,9 @@ in {
|
|||
|
||||
inputs.agenix.nixosModules.default
|
||||
|
||||
"${mod}/services/forgejo.nix"
|
||||
"${mod}/services/searx.nix"
|
||||
"${mod}/services/portfolio.nix"
|
||||
"${system}/services/forgejo.nix"
|
||||
"${system}/services/searx.nix"
|
||||
"${system}/services/portfolio.nix"
|
||||
];
|
||||
|
||||
boot.tmp.cleanOnBoot = true;
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ in {
|
|||
system = "x86_64-linux";
|
||||
modules = [
|
||||
./vamos
|
||||
inputs.self.nixosModules.theme
|
||||
../modules
|
||||
inputs.nixos-hardware.nixosModules.framework-13-7040-amd
|
||||
];
|
||||
};
|
||||
|
|
@ -18,7 +18,7 @@ in {
|
|||
system = "x86_64-linux";
|
||||
modules = [
|
||||
./solaire
|
||||
inputs.self.nixosModules.theme
|
||||
../modules
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
{specialArgs, ...}: let
|
||||
system = ../../system;
|
||||
home = ../../home;
|
||||
{
|
||||
inputs,
|
||||
specialArgs,
|
||||
...
|
||||
}: let
|
||||
system = "${inputs.self}/system";
|
||||
home = "${inputs.self}/home";
|
||||
in {
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
{specialArgs, ...}: let
|
||||
system = ../../system;
|
||||
home = ../../home;
|
||||
{
|
||||
inputs,
|
||||
specialArgs,
|
||||
...
|
||||
}: let
|
||||
system = "${inputs.self}/system";
|
||||
home = "${inputs.self}/home";
|
||||
in {
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
|
|
@ -28,7 +32,7 @@ in {
|
|||
"${home}/services/udiskie.nix"
|
||||
|
||||
"${home}/programs/niri"
|
||||
"${home}/programs/ags"
|
||||
"${home}/programs/ironbar"
|
||||
"${home}/programs/fuzzel.nix"
|
||||
"${home}/programs/swaybg.nix"
|
||||
"${home}/programs/swaylock.nix"
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
{
|
||||
theme = import ./theme;
|
||||
imports = [./theme];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,10 @@
|
|||
{
|
||||
self,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
{inputs, ...}: {
|
||||
anastacia = {
|
||||
hostname = "2a01:4f8:1c1c:8495::1";
|
||||
profiles.system = {
|
||||
sshUser = "root";
|
||||
user = "root";
|
||||
path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.anastacia;
|
||||
path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.anastacia;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
16
pkgs/apple-emoji-color.nix
Normal file
16
pkgs/apple-emoji-color.nix
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
{pkgs, ...}: let
|
||||
version = "v17.4";
|
||||
in
|
||||
pkgs.stdenv.mkDerivation {
|
||||
inherit version;
|
||||
name = "apple-color-emoji";
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://github.com/samuelngs/apple-emoji-linux/releases/download/${version}/AppleColorEmoji.ttf";
|
||||
sha256 = "sha256-SG3JQLybhY/fMX+XqmB/BKhQSBB0N1VRqa+H6laVUPE=";
|
||||
};
|
||||
phases = ["installPhase"];
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/fonts/truetype/apple-color-emoji
|
||||
cp $src $out/share/fonts/truetype/apple-color-emoji/AppleColorEmoji.ttf
|
||||
'';
|
||||
}
|
||||
|
|
@ -12,4 +12,5 @@
|
|||
})
|
||||
.callPackage
|
||||
./bolt-launcher.nix {};
|
||||
apple-emoji-color = pkgs.callPackage ./apple-emoji-color.nix {};
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,19 +1,31 @@
|
|||
{pkgs, ...}: {
|
||||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
fonts = {
|
||||
packages = with pkgs; [
|
||||
noto-fonts
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts-emoji
|
||||
noto-fonts-extra
|
||||
(nerdfonts.override {fonts = ["IntelOneMono"];})
|
||||
fontDir = {
|
||||
enable = true;
|
||||
decompressFonts = true;
|
||||
};
|
||||
packages = [
|
||||
pkgs.noto-fonts
|
||||
pkgs.noto-fonts-cjk-sans
|
||||
pkgs.noto-fonts-extra
|
||||
pkgs.intel-one-mono
|
||||
inputs.self.packages.${pkgs.system}.apple-emoji-color
|
||||
(pkgs.nerdfonts.override {fonts = ["IntelOneMono" "NerdFontsSymbolsOnly"];})
|
||||
];
|
||||
enableDefaultPackages = false;
|
||||
|
||||
fontconfig.defaultFonts = {
|
||||
fontconfig = {
|
||||
enable = true;
|
||||
defaultFonts = {
|
||||
serif = ["Noto Serif"];
|
||||
sansSerif = ["Inter"];
|
||||
sansSerif = ["Inter" "Symbols Nerd Font"];
|
||||
monospace = ["IntoneMono NF"];
|
||||
emoji = ["Noto Color Emoji"];
|
||||
emoji = ["Apple Color Emoji"];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue