macronova/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Abort jj

Browse source
This commit is contained in:
Sicheng Pan 2025-12-14 13:54:53 -08:00
parent 16c57c5967
commit 4f2b849e10
Signed by: macronova
GPG key ID: CE969670FB4B4A56
8 changed files with 45 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/constants.nix
View file

@ -31,10 +31,6 @@ with lib; {
default = { default = {
aria2 = 30206; aria2 = 30206;
conduit = 29800; conduit = 29800;
coturn = 12616;
coturn-tls = 38313;
coturn-relay-udp-min = 17105;
coturn-relay-udp-max = 17184;
forgejo = 47674; forgejo = 47674;
headscale = 27327; headscale = 27327;
http = 80; http = 80;

24
common/users.nix
View file

@ -44,7 +44,6 @@ in {
alejandra alejandra
dua dua
fd fd
jjui
nil nil
rclone rclone
sops sops
@ -64,6 +63,10 @@ in {
programs = { programs = {
bat.enable = true; bat.enable = true;
bottom.enable = true; bottom.enable = true;
delta = {
enable = true;
enableGitIntegration = true;
};
direnv = { direnv = {
enable = true; enable = true;
nix-direnv.enable = true; nix-direnv.enable = true;
@ -103,25 +106,6 @@ in {
}; };
themeFile = "tokyo_night_moon"; themeFile = "tokyo_night_moon";
}; };
jujutsu = {
enable = true;
settings = {
git.sign-on-push = true;
signing = {
behaviour = "own";
backend = "gpg";
};
ui = {
default-command = "status";
editor = "hx";
paginate = "never";
};
user = {
email = postMaster;
name = userName;
};
};
};
plasma = { plasma = {
enable = osConfig.services.desktopManager.plasma6.enable; enable = osConfig.services.desktopManager.plasma6.enable;
configFile = { configFile = {

91
flake.lock generated
View file

@ -39,11 +39,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1760701190, "lastModified": 1765688338,
"narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=", "narHash": "sha256-MjrytR2kiHYUnzX11cXaD31tS7kKdhM1KFaac0+KAig=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5", "rev": "be1a6b8a05afdd5d5fa69fcaf3c4ead7014c9fd8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -55,11 +55,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1747046372, "lastModified": 1761588595,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -71,11 +71,11 @@
"flake-compat_2": { "flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1747046372, "lastModified": 1761588595,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -133,11 +133,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758108966, "lastModified": 1763988335,
"narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -191,11 +191,11 @@
}, },
"hardware": { "hardware": {
"locked": { "locked": {
"lastModified": 1761759700, "lastModified": 1764440730,
"narHash": "sha256-zuiwvKAPwtMmwf44tb7Q7Y5d7JkBeuaF89PISUnkWA8=", "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "2379bc40992ec29feb1933bb4acd224fa055f3f8", "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -211,11 +211,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761770832, "lastModified": 1765682243,
"narHash": "sha256-IQIWG6kHxnUpx5KEb9r0BROL3/R6UQ/30aO2oHncBA8=", "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "124b99dbd1594dbebdd575ac7142752ee96a98a0", "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -253,11 +253,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761748321, "lastModified": 1765526639,
"narHash": "sha256-hD5mVzmUeyVppjArdy2uVdQe/CQUR9i3WgZB05onE7A=", "narHash": "sha256-4U8crbUT3PDQdqhaMLnVaxnciBlcnDAw8XAJaXiS0pA=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "533db5857c9e00ca352558a928417116ee08a824", "rev": "457a55ed77a105088a47cb55b9eccf7768559451",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -273,15 +273,14 @@
"git-hooks": "git-hooks", "git-hooks": "git-hooks",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ]
"nixpkgs-25_05": "nixpkgs-25_05"
}, },
"locked": { "locked": {
"lastModified": 1759489698, "lastModified": 1764763336,
"narHash": "sha256-2lT2i5ha23I2vrolEaBaAS/63ChgZPh181Awt6q1bDY=", "narHash": "sha256-007DlZGjQ3ziQ5UMjt3GdjBAbgAtHgMwOxMY2v7/b7c=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "6005d88bed7a5418f9772b4058a73cd0fd1e69a1", "rev": "1ccd57f177539ed8c207b893c3f9798d88f87d2e",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -342,11 +341,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1761672384, "lastModified": 1765472234,
"narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -356,22 +355,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-25_05": {
"locked": {
"lastModified": 1759143472,
"narHash": "sha256-TvODmeR2W7yX/JmOCmP+lAFNkTT7hAxYcF3Kz8SZV3w=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5ed4e25ab58fd4c028b59d5611e14ea64de51d23",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
},
"plasma-manager": { "plasma-manager": {
"inputs": { "inputs": {
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
@ -380,11 +363,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761078382, "lastModified": 1763909441,
"narHash": "sha256-JNJesbe9MMN1Brq41BHEpuH+Z+Zg74y/nI5AFZX84Vw=", "narHash": "sha256-56LwV51TX/FhgX+5LCG6akQ5KrOWuKgcJa+eUsRMxsc=",
"owner": "pjones", "owner": "pjones",
"repo": "plasma-manager", "repo": "plasma-manager",
"rev": "27dfa61b64d0cdb8e4ba6f3aaa4d4e067d64cb5c", "rev": "b24ed4b272256dfc1cc2291f89a9821d5f9e14b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -402,11 +385,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1760663237, "lastModified": 1765464257,
"narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", "narHash": "sha256-dixPWKiHzh80PtD0aLuxYNQ0xP+843dfXG/yM3OzaYQ=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", "rev": "09e45f2598e1a8499c3594fe11ec2943f34fe509",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -437,11 +420,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1760998189, "lastModified": 1765684837,
"narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=", "narHash": "sha256-fJCnsYcpQxxy/wit9EBOK33c0Z9U4D3Tvo3gf2mvHos=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3", "rev": "94d8af61d8a603d33d1ed3500a33fcf35ae7d3bc",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
linux/nebula/configuration.nix
View file

@ -1,10 +1,9 @@
# Edit this configuration file to define what should be installed on # Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running `nixos-help`). # and in the NixOS manual (accessible by running `nixos-help`).
{pkgs, ...}: { {...}: {
# Configure boot loader # Configure boot loader
boot = { boot = {
kernelPackages = pkgs.linuxPackages_latest;
loader = { loader = {
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
systemd-boot.enable = true; systemd-boot.enable = true;

7
linux/nebula/zfs.nix
View file

@ -1,8 +1,5 @@
{pkgs, ...}: { {...}: {
boot = { boot.loader.grub.zfsSupport = true;
loader.grub.zfsSupport = true;
zfs.package = pkgs.zfs_unstable;
};
services.zfs = { services.zfs = {
autoScrub.enable = true; autoScrub.enable = true;

1
linux/quasar/configuration.nix
View file

@ -4,7 +4,6 @@
{pkgs, ...}: { {pkgs, ...}: {
# Configure boot # Configure boot
boot = { boot = {
kernelPackages = pkgs.linuxPackages_latest;
initrd.systemd.enable = true; initrd.systemd.enable = true;
loader = { loader = {
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;

2
linux/quasar/zfs.nix
View file

@ -1,7 +1,6 @@
{ {
config, config,
lib, lib,
pkgs,
... ...
}: { }: {
boot = { boot = {
@ -9,7 +8,6 @@
zfs = { zfs = {
extraPools = ["zarchive"]; extraPools = ["zarchive"];
requestEncryptionCredentials = ["zactive/main"]; requestEncryptionCredentials = ["zactive/main"];
package = pkgs.zfs_unstable;
}; };
}; };

3
linux/singularity/configuration.nix
View file

@ -1,6 +1,5 @@
{pkgs, ...}: { {...}: {
boot = { boot = {
kernelPackages = pkgs.linuxPackages_latest;
loader.grub.device = "/dev/sda"; loader.grub.device = "/dev/sda";
tmp.cleanOnBoot = true; tmp.cleanOnBoot = true;
}; };