Compare commits

...

6 commits

Author SHA1 Message Date
cy
6af1fc05ab
flake update
Signed-off-by: cy <cy@cy7.sh>
2025-01-26 18:21:24 -05:00
cy
b1a1955786
make mouse cursor better again
Signed-off-by: cy <cy@cy7.sh>
2025-01-26 17:43:18 -05:00
cy
80da2cfc70
git: specify the ssh key for push to work
Signed-off-by: cy <cy@cy7.sh>
2025-01-26 17:23:35 -05:00
cy
84c2b18dfa re-enable lix
Signed-off-by: cy <cy@cy7.sh>
2025-01-26 01:32:41 -05:00
cy
7b48435796
git sign with ssh
Signed-off-by: cy <cy@cy7.sh>
2025-01-25 23:55:24 -05:00
cy
6ae187f7c6 forgejo: use forgejo package and forgejo-dark theme
Signed-off-by: cy <cy@cy7.sh>
2025-01-25 19:47:39 -05:00
4 changed files with 40 additions and 33 deletions

50
flake.lock generated
View file

@ -120,11 +120,11 @@
"rocksdb": "rocksdb" "rocksdb": "rocksdb"
}, },
"locked": { "locked": {
"lastModified": 1737830431, "lastModified": 1737915107,
"narHash": "sha256-C/tkJeSefIAK9wke33HBvxCoBF/hqa+1+oPaLriOrNE=", "narHash": "sha256-763dCTswU4PYcAzKuU41+HrkYUpU3pVwa92K0P+zzgY=",
"owner": "girlbossceo", "owner": "girlbossceo",
"repo": "conduwuit", "repo": "conduwuit",
"rev": "9514064c1c709dc7c437b1478b224bb0d711ec05", "rev": "4b3c54bbfa8340c4bab09a221f47afb0c6d04346",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -683,11 +683,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1737810081, "lastModified": 1737857294,
"narHash": "sha256-WByslFoA16T/o5Fd+ebhSwmXtbL18L3ameJbzfepbI8=", "narHash": "sha256-bzC+anLF/NlgolaMoB4uTFgSejLJlTzPcNF1Kbq/BP0=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "0ad79775b6f9800eb00a2870f01eab338befcced", "rev": "4af6b5ed9f8f2412bef5331b8e3b93f3ad305ea1",
"revCount": 16689, "revCount": 16694,
"type": "git", "type": "git",
"url": "https://git.lix.systems/lix-project/lix" "url": "https://git.lix.systems/lix-project/lix"
}, },
@ -737,11 +737,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1737840481, "lastModified": 1737924584,
"narHash": "sha256-WjW3cdrmh1sGMT3CBqCFzT9BOktTa1u9ldoWEqTj7xk=", "narHash": "sha256-8XAz2IFUdSN7IblSWgQQVjivlZ0uWn3Y5jN3G6+/jss=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "8fc9dba8df75d9d004d9369b513b81180788ec15", "rev": "d3682c753abbbc8d41578aa12e6f10508d801f4b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -770,11 +770,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1737795105, "lastModified": 1737918541,
"narHash": "sha256-zQSNUKj671I9M4DdMD4iMUnIIWN5oiaWdqDHUSVcaVE=", "narHash": "sha256-NKartmApYTAjteTg78OAIAYGvtl9QCDcKp8tPk3KCuI=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "78697d1cea20e6b53013e820999b0403c45d9f00", "rev": "baa051891237054f2d4db86d7bcfe0f17440c35f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1045,11 +1045,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1737795611, "lastModified": 1737917096,
"narHash": "sha256-0kGPO515JdDt6gPcR25QTGyNJnT1UFtH1tdkR2QdLAY=", "narHash": "sha256-wOo5jWu88VRbm0TTNl9KxE4nIkfnXVKxLvZwpTn75wk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ed45d51fb4c860e70760a042dd9ff99bd016497e", "rev": "a47cb26bbe26d63321cbb96de6d1981d790d9748",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1082,11 +1082,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737832569, "lastModified": 1737914312,
"narHash": "sha256-VkK73VRVgvSQOPw9qx9HzvbulvUM9Ae4nNd3xNP+pkI=", "narHash": "sha256-PBF4R+yQt5Sls7CsA9Miwx28XtOP/yqaqejZ3RKSes0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "d7df58321110d3b0e12a829bbd110db31ccd34b1", "rev": "8e5422bf3e76f410b97d2da640d0829e87657de9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1105,11 +1105,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737372689, "lastModified": 1737823349,
"narHash": "sha256-nH3zK2ki0fd5o5qvbGHxukE4qnOLJa1uCzoDObG5vrE=", "narHash": "sha256-LAppb+sftyvJbPdrBG1uN9GYWHz6q7bUpkpDjljcSRo=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "570cc17bbc25650eb7d69e4fcda8cfd2f1656922", "rev": "f91a0ac0f4ecf0ad1d1d88140f66520dae6ce4bd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1240,11 +1240,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737771740, "lastModified": 1737858462,
"narHash": "sha256-lWIdF4qke63TdCHnJ0QaUHfG8YvsDrBqzL4jiHYQd+Y=", "narHash": "sha256-rohhmT/b8QNaIL3nY01jFtCyZu2dGTufef5YieECWZM=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "cfaaa1dddd280af09aca84af84612fbccd986ae2", "rev": "dd236609a6c272d00ceaa042b1a81a31968e7f4d",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -172,7 +172,7 @@
./modules ./modules
inputs.lanzaboote.nixosModules.lanzaboote inputs.lanzaboote.nixosModules.lanzaboote
inputs.niri.nixosModules.niri inputs.niri.nixosModules.niri
# inputs.lix-module.nixosModules.default # broken inputs.lix-module.nixosModules.default # broken
]; ];
}; };
chunk = lib.nixosSystem { chunk = lib.nixosSystem {

View file

@ -28,10 +28,6 @@
gtk = { gtk = {
enable = true; enable = true;
cursorTheme = {
package = pkgs.bibata-cursors;
name = "Bibata-Modern";
};
theme = { theme = {
package = pkgs.adw-gtk3; package = pkgs.adw-gtk3;
name = "adw-gtk3-dark"; name = "adw-gtk3-dark";
@ -44,7 +40,8 @@
home.pointerCursor = { home.pointerCursor = {
package = pkgs.bibata-cursors; package = pkgs.bibata-cursors;
name = "Bibata-Modern"; name = "Bibata-Modern-Classic";
size = 23;
gtk.enable = true; gtk.enable = true;
x11.enable = true; x11.enable = true;
}; };
@ -149,4 +146,13 @@
enable = true; enable = true;
nix-direnv.enable = true; nix-direnv.enable = true;
}; };
programs.git.extraConfig = {
user = {
signingKey = "~/.ssh/id.key";
};
gpg.format = "ssh";
commit.gpgsign = true;
core.sshCommand = "ssh -i ~/.ssh/id.key";
};
} }

View file

@ -1,7 +1,8 @@
{ ... }: { pkgs, ... }:
{ {
services.forgejo = { services.forgejo = {
enable = true; enable = true;
package = pkgs.forgejo; # uses forgejo-lts by default
user = "git"; user = "git";
group = "git"; group = "git";
settings = { settings = {
@ -16,7 +17,7 @@
service.DISABLE_REGISTRATION = true; service.DISABLE_REGISTRATION = true;
ui = { ui = {
AMBIGUOUS_UNICODE_DETECTION = false; AMBIGUOUS_UNICODE_DETECTION = false;
DEFAULT_THEME = "gitea-dark"; DEFAULT_THEME = "forgejo-dark";
}; };
actions.ENABLED = false; actions.ENABLED = false;
repository.ENABLE_PUSH_CREATE_USER = true; repository.ENABLE_PUSH_CREATE_USER = true;