Compare commits
No commits in common. "main" and "downgrade-kernel" have entirely different histories.
main
...
downgrade-
13 changed files with 90 additions and 249 deletions
170
flake.lock
generated
170
flake.lock
generated
|
|
@ -120,11 +120,11 @@
|
|||
"rocksdb": "rocksdb"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739114248,
|
||||
"narHash": "sha256-Etzh7m1aZBwKfcS6sa+2zBzdOaZSR+yFn2pwwGTilb4=",
|
||||
"lastModified": 1738132650,
|
||||
"narHash": "sha256-ryebu2VoopIpr5+DuHIs2/x60u+3EzRJexYRWVJn2AE=",
|
||||
"owner": "girlbossceo",
|
||||
"repo": "conduwuit",
|
||||
"rev": "b6e9dc3d98704c56027219d3775336910a0136c6",
|
||||
"rev": "eb7d893c8675f955fa770c8ae6f1c32a2394284c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -157,11 +157,11 @@
|
|||
},
|
||||
"crane_2": {
|
||||
"locked": {
|
||||
"lastModified": 1739053031,
|
||||
"narHash": "sha256-LrMDRuwAlRFD2T4MgBSRd1s2VtOE+Vl1oMCNu3RpPE0=",
|
||||
"lastModified": 1737689766,
|
||||
"narHash": "sha256-ivVXYaYlShxYoKfSo5+y5930qMKKJ8CLcAoIBPQfJ6s=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "112e6591b2d6313b1bd05a80a754a8ee42432a7e",
|
||||
"rev": "6fe74265bbb6d016d663b1091f015e2976c4a527",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -562,11 +562,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739051380,
|
||||
"narHash": "sha256-p1QSLO8DJnANY+ppK7fjD8GqfCrEIDjso1CSRHsXL7Y=",
|
||||
"lastModified": 1738448366,
|
||||
"narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "5af1b9a0f193ab6138b89a8e0af8763c21bbf491",
|
||||
"rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -683,11 +683,11 @@
|
|||
"pre-commit-hooks": "pre-commit-hooks"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739035579,
|
||||
"narHash": "sha256-Zc7KAA3iC5Ak9reV/peqELKXJn6rLcSZptq1Tzcx9Nc=",
|
||||
"lastModified": 1738446528,
|
||||
"narHash": "sha256-NYL/r7EXSyYP7nXuYGvGYMI9QtztGjVaKKofBt/pCv8=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "132d11c2d85425b7d23785ec306acb9b1d1ddba6",
|
||||
"revCount": 17397,
|
||||
"rev": "a51380645f61b33d37a536b596d16c481f7b84a6",
|
||||
"revCount": 17342,
|
||||
"type": "git",
|
||||
"url": "https://git.lix.systems/lix-project/lix"
|
||||
},
|
||||
|
|
@ -723,32 +723,6 @@
|
|||
"url": "https://git.lix.systems/lix-project/nixos-module"
|
||||
}
|
||||
},
|
||||
"nil": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-overlay": [
|
||||
"rust-overlay"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732053863,
|
||||
"narHash": "sha256-DCIVdlb81Fct2uwzbtnawLBC/U03U2hqx8trqTJB7WA=",
|
||||
"owner": "oxalica",
|
||||
"repo": "nil",
|
||||
"rev": "2e24c9834e3bb5aa2a3701d3713b43a6fb106362",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "oxalica",
|
||||
"repo": "nil",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"niri": {
|
||||
"inputs": {
|
||||
"niri-stable": "niri-stable",
|
||||
|
|
@ -763,11 +737,11 @@
|
|||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739042449,
|
||||
"narHash": "sha256-9zLFUpEebwhjCgtznsI61gTzefI3+fuXATHUOFzJi5w=",
|
||||
"lastModified": 1738502867,
|
||||
"narHash": "sha256-92cVHcxV7j00BquLo5I4G8EwKzrq2AlHuD3AQV9r+T8=",
|
||||
"owner": "sodiboo",
|
||||
"repo": "niri-flake",
|
||||
"rev": "98e3666a9dc4143cbf93d957a15d749b5acef046",
|
||||
"rev": "cf0be7affb15e21727d137c029146fe7df2bc6d0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -796,11 +770,11 @@
|
|||
"niri-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1738911818,
|
||||
"narHash": "sha256-7bhr9ldHrNP71qOmKI1Hu80uclx+Tco0RNmO+GKtC1Y=",
|
||||
"lastModified": 1738479340,
|
||||
"narHash": "sha256-sutel7RKfu9eIJsjswSzptCIvKELbXQCSldt0PtwSd0=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "397e704d644d1bfe7736f2fdacbfe5742c7b2f9f",
|
||||
"rev": "d5592743cb04cef3fe50c987b7ba9349c5090dbd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -858,11 +832,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1738743987,
|
||||
"narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=",
|
||||
"lastModified": 1738277753,
|
||||
"narHash": "sha256-iyFcCOk0mmDiv4ut9mBEuMxMZIym3++0qN1rQBg8FW0=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "ae406c04577ff9a64087018c79b4fdc02468c87c",
|
||||
"rev": "49b807fa7c37568d7fbe2aeaafb9255c185412f9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -916,11 +890,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1738573732,
|
||||
"narHash": "sha256-cyUaLyn9oQp/ArxVnpyajKXFQhe+xxGCEvscAOt2Kco=",
|
||||
"lastModified": 1737361468,
|
||||
"narHash": "sha256-+CtIrQZ22MOAOHcpg1zbhX/fVkmEc8A8lYVpXAbXElQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-ld",
|
||||
"rev": "8fed868d17954b09421d2456afccc2e7afdee96f",
|
||||
"rev": "7f15f8622b63b907fef137689f4528a9447d9377",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -961,6 +935,22 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-garage": {
|
||||
"locked": {
|
||||
"lastModified": 1736921030,
|
||||
"narHash": "sha256-A7knAvBOwoM5X7oNdIOKvuXYtXJpuR4O8iKHIk8EwOI=",
|
||||
"owner": "cything",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "97f27249297bf5fbc563014ae9d4884dee27f1e0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "cything",
|
||||
"ref": "garage-module",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-regression": {
|
||||
"locked": {
|
||||
"lastModified": 1643052045,
|
||||
|
|
@ -1025,22 +1015,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable_4": {
|
||||
"locked": {
|
||||
"lastModified": 1738843498,
|
||||
"narHash": "sha256-7x+Q4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i+jBHE=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f5a32fa27df91dfc4b762671a0e0a859a8a0058f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-24.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1730531603,
|
||||
|
|
@ -1091,11 +1065,11 @@
|
|||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1739097848,
|
||||
"narHash": "sha256-bbdQB0Y4mB2msqbyQ9QC+YPDZGt1evUK53AwQSyShHM=",
|
||||
"lastModified": 1738487426,
|
||||
"narHash": "sha256-hnB0V0R/aKASnTBeTthFvW60uydv1xswWD4weqSuSfg=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9a0b855695c31ea653181b742c65e026bada3881",
|
||||
"rev": "8ed1fafea6a613d962f6a84c1153d34dc8b06d83",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1128,11 +1102,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739121491,
|
||||
"narHash": "sha256-BEmyAozR3Pc2qwPtC4rgUglzi3cw4nv4fXEY23NxOrQ=",
|
||||
"lastModified": 1738517265,
|
||||
"narHash": "sha256-ZzulGUIHZhvcSHx+1ucCJkIcn27r9H+cSzCCpKxJcls=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "13341a4c1238b7974e7bad9c7a6d5c51ca3cf81a",
|
||||
"rev": "56d0c4579e022b44a3e324f722fa23a6f4295798",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1151,11 +1125,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1738508923,
|
||||
"narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=",
|
||||
"lastModified": 1738445998,
|
||||
"narHash": "sha256-wF2ZcRKF37re161jrXtNyjGMBDsIFtPeDvmIVfp8f7w=",
|
||||
"owner": "NuschtOS",
|
||||
"repo": "search",
|
||||
"rev": "86e2038290859006e05ca7201425ea5b5de4aecb",
|
||||
"rev": "381d84a7422a4dbfef6a9c7703dbaf42036ae1c3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1275,18 +1249,16 @@
|
|||
"lanzaboote": "lanzaboote",
|
||||
"lix": "lix",
|
||||
"lix-module": "lix-module",
|
||||
"nil": "nil",
|
||||
"niri": "niri",
|
||||
"nix-ld": "nix-ld",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"nixpkgs-stable": "nixpkgs-stable_4",
|
||||
"nixpkgs-garage": "nixpkgs-garage",
|
||||
"nixvim": "nixvim",
|
||||
"nvim-github-theme": "nvim-github-theme",
|
||||
"plasma-manager": "plasma-manager",
|
||||
"rust-overlay": "rust-overlay",
|
||||
"sops-nix": "sops-nix",
|
||||
"treefmt": "treefmt",
|
||||
"vscode-extensions": "vscode-extensions"
|
||||
"treefmt": "treefmt"
|
||||
}
|
||||
},
|
||||
"rust-analyzer-src": {
|
||||
|
|
@ -1313,11 +1285,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739068147,
|
||||
"narHash": "sha256-3DtLkjQFlIUOXw3TBH+iP0jglpqO6Lv2KaQc+ADg39I=",
|
||||
"lastModified": 1738463259,
|
||||
"narHash": "sha256-+5QJpiRpkh1ALvKcMEpPyGwkPZfaynsYF4SFdNW5UfQ=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "f61820fa2c3844d6940cce269a6afdec30aa2e6c",
|
||||
"rev": "e2bb8c205a069514535f083742c7da8dfb6e02b9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1383,11 +1355,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1738953846,
|
||||
"narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=",
|
||||
"lastModified": 1738070913,
|
||||
"narHash": "sha256-j6jC12vCFsTGDmY2u1H12lMr62fnclNjuCtAdF1a4Nk=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "4f09b473c936d41582dd744e19f34ec27592c5fd",
|
||||
"rev": "bebf27d00f7d10ba75332a0541ac43676985dea3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1396,32 +1368,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"vscode-extensions": {
|
||||
"inputs": {
|
||||
"flake-compat": [
|
||||
"flake-compat"
|
||||
],
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739152168,
|
||||
"narHash": "sha256-Zv6eGe+c5f9Chyw6O3ePJ4hbscetuzZxYShwjn3ACEs=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-vscode-extensions",
|
||||
"rev": "bd6b70f681b2561f53c9522be64330c7ff9d08d8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-vscode-extensions",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"xwayland-satellite-stable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
|
|||
22
flake.nix
22
flake.nix
|
|
@ -3,7 +3,6 @@
|
|||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small";
|
||||
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
|
||||
sops-nix = {
|
||||
url = "github:Mic92/sops-nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -78,18 +77,8 @@
|
|||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.home-manager.follows = "home-manager";
|
||||
};
|
||||
nil = {
|
||||
url = "github:oxalica/nil";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.rust-overlay.follows = "rust-overlay";
|
||||
inputs.flake-utils.follows = "flake-utils";
|
||||
};
|
||||
vscode-extensions = {
|
||||
url = "github:nix-community/nix-vscode-extensions";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.flake-utils.follows = "flake-utils";
|
||||
inputs.flake-compat.follows = "flake-compat";
|
||||
};
|
||||
|
||||
nixpkgs-garage.url = "github:cything/nixpkgs/garage-module"; # unmerged PR
|
||||
|
||||
nvim-github-theme = {
|
||||
url = "github:projekt0n/github-nvim-theme";
|
||||
|
|
@ -169,8 +158,7 @@
|
|||
overlays = [
|
||||
inputs.niri.overlays.niri
|
||||
inputs.rust-overlay.overlays.default
|
||||
inputs.vscode-extensions.overlays.default
|
||||
] ++ (import ./overlay { inherit inputs; });
|
||||
] ++ import ./overlay;
|
||||
};
|
||||
in
|
||||
{
|
||||
|
|
@ -199,10 +187,14 @@
|
|||
modules = [
|
||||
{
|
||||
nixpkgs = { inherit pkgs; };
|
||||
disabledModules = [
|
||||
"services/web-servers/garage.nix"
|
||||
];
|
||||
}
|
||||
./hosts/chunk
|
||||
inputs.sops-nix.nixosModules.sops
|
||||
./modules
|
||||
(inputs.nixpkgs-garage + "/nixos/modules/services/web-servers/garage.nix")
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -35,12 +35,7 @@
|
|||
"launch-browser" = {
|
||||
name = "launch browser";
|
||||
key = "Meta+B";
|
||||
command = "chromium";
|
||||
};
|
||||
"launch-fuzzel" = {
|
||||
name = "launch-fuzzel";
|
||||
key = "Meta+d";
|
||||
command = "fuzzel";
|
||||
command = "librewolf";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -6,21 +6,19 @@
|
|||
enableUpdateCheck = false;
|
||||
enableExtensionUpdateCheck = false;
|
||||
mutableExtensionsDir = false;
|
||||
extensions = (with pkgs.open-vsx; [
|
||||
extensions = with pkgs.vscode-extensions; [
|
||||
vscodevim.vim
|
||||
jnoortheen.nix-ide
|
||||
editorconfig.editorconfig
|
||||
github.github-vscode-theme
|
||||
github.copilot
|
||||
rust-lang.rust-analyzer
|
||||
]) ++
|
||||
(with pkgs.vscode-marketplace; [
|
||||
github.codespaces
|
||||
]);
|
||||
];
|
||||
userSettings = {
|
||||
"workbench.colorTheme" = "GitHub Dark Default";
|
||||
"files.autoSave" = "afterDelay";
|
||||
"nix.enableLanguageServer" = true;
|
||||
"nix.serverPath" = "nil";
|
||||
"nix.serverPath" = "nixd";
|
||||
"editor.fontFamily" = "IBM Plex Mono";
|
||||
"editor.fontSize" = 16;
|
||||
"editor.wordWrap" = "on";
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
../niri
|
||||
../irssi.nix
|
||||
../kitty.nix
|
||||
../codium.nix
|
||||
../vscode.nix
|
||||
../plasma.nix
|
||||
];
|
||||
home = {
|
||||
|
|
@ -66,6 +66,7 @@
|
|||
mpv
|
||||
yt-dlp
|
||||
signal-desktop
|
||||
azure-cli
|
||||
pavucontrol
|
||||
btop
|
||||
grim
|
||||
|
|
@ -110,25 +111,20 @@
|
|||
nixpkgs-review
|
||||
just
|
||||
hugo
|
||||
ghidra
|
||||
ghidra-bin
|
||||
sequoia
|
||||
sccache
|
||||
awscli2
|
||||
lldb
|
||||
(cutter.withPlugins (
|
||||
p: with p; [
|
||||
(cutter.withPlugins (p: with p; [
|
||||
rz-ghidra
|
||||
jsdec
|
||||
sigdb
|
||||
]
|
||||
))
|
||||
]))
|
||||
ida-free
|
||||
patchelf
|
||||
radare2
|
||||
p7zip
|
||||
qbittorrent
|
||||
# vscodium
|
||||
nil
|
||||
];
|
||||
|
||||
programs.waybar.enable = true;
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@
|
|||
./forgejo.nix
|
||||
./garage.nix
|
||||
./tailscale.nix
|
||||
./tor.nix
|
||||
];
|
||||
|
||||
sops.age.keyFile = "/root/.config/sops/age/keys.txt";
|
||||
|
|
@ -205,6 +204,4 @@
|
|||
};
|
||||
virtualisation.oci-containers.backend = "podman";
|
||||
environment.enableAllTerminfo = true;
|
||||
|
||||
my.roundcube.enable = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
http_port = 8088;
|
||||
enforce_domain = true;
|
||||
enable_gzip = true;
|
||||
domain = "grafana.cy7.sh";
|
||||
domain = "grafana.cything.io";
|
||||
};
|
||||
settings.analytics.reporting_enabled = false;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -177,7 +177,6 @@
|
|||
sbctl # secure boot
|
||||
wine-wayland
|
||||
wine64
|
||||
solaar
|
||||
];
|
||||
|
||||
environment.sessionVariables = {
|
||||
|
|
@ -280,10 +279,10 @@
|
|||
services.tumbler.enable = true;
|
||||
|
||||
virtualisation = {
|
||||
libvirtd.enable = false;
|
||||
docker.enable = false;
|
||||
libvirtd.enable = true;
|
||||
docker.enable = true;
|
||||
};
|
||||
programs.virt-manager.enable = false;
|
||||
programs.virt-manager.enable = true;
|
||||
|
||||
services.usbmuxd.enable = true;
|
||||
programs.nix-ld.dev = {
|
||||
|
|
@ -307,10 +306,8 @@
|
|||
libplist
|
||||
p11-kit
|
||||
kdePackages.qtwayland
|
||||
qt6.full
|
||||
qt6.qtwayland
|
||||
qt5.full
|
||||
qt5.qtwayland
|
||||
libsForQt5.qt5.qtwayland
|
||||
xorg.libX11
|
||||
xorg.libxcb
|
||||
xorg.xcbutilwm
|
||||
|
|
@ -337,10 +334,7 @@
|
|||
enable = true;
|
||||
wlr.enable = true;
|
||||
xdgOpenUsePortal = true;
|
||||
extraPortals = with pkgs; [
|
||||
xdg-desktop-portal-gtk
|
||||
xdg-desktop-portal-gnome
|
||||
];
|
||||
extraPortals = with pkgs; [ xdg-desktop-portal-gtk xdg-desktop-portal-gnome ];
|
||||
};
|
||||
|
||||
programs.obs-studio = {
|
||||
|
|
@ -358,7 +352,7 @@
|
|||
];
|
||||
};
|
||||
|
||||
services.ollama.enable = false;
|
||||
services.ollama.enable = true;
|
||||
|
||||
# wireguard setup
|
||||
networking.wg-quick.interfaces.wg0 = {
|
||||
|
|
@ -382,9 +376,9 @@
|
|||
];
|
||||
};
|
||||
|
||||
services.trezord.enable = false;
|
||||
services.trezord.enable = true;
|
||||
|
||||
programs.niri.enable = false;
|
||||
programs.niri.enable = true;
|
||||
programs.niri.package = pkgs.niri-unstable;
|
||||
programs.xwayland.enable = true;
|
||||
|
||||
|
|
|
|||
6
justfile
6
justfile
|
|
@ -11,12 +11,8 @@ upgrade:
|
|||
git switch update
|
||||
sudo nixos-rebuild switch -L --flake . --use-substitutes
|
||||
nixos-rebuild switch -L --flake .#chunk --target-host root@2a0f:85c1:840:2bfb::1 --use-substitutes
|
||||
nixos-rebuild switch -L --flake .#titan --target-host root@www.cything.io --use-substitutes
|
||||
home-manager -L switch --flake .
|
||||
git switch main
|
||||
git merge update
|
||||
git branch -d update
|
||||
|
||||
switch:
|
||||
sudo nixos-rebuild switch -L --flake . --use-substitutes
|
||||
nixos-rebuild switch -L --flake .#chunk --target-host root@2a0f:85c1:840:2bfb::1 --use-substitutes
|
||||
home-manager -L switch --flake .
|
||||
|
|
|
|||
|
|
@ -3,6 +3,5 @@
|
|||
imports = [
|
||||
./backup.nix
|
||||
./caddy.nix
|
||||
./roundcube.nix
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,56 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.my.roundcube;
|
||||
fpm = config.services.phpfpm.pools.roundcube;
|
||||
roundcube = config.services.roundcube;
|
||||
in
|
||||
{
|
||||
options.my.roundcube = {
|
||||
enable = lib.mkEnableOption "roundcube webmail";
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
services.roundcube = {
|
||||
enable = true;
|
||||
configureNginx = false;
|
||||
package = pkgs.roundcube.withPlugins (
|
||||
p: with p; [
|
||||
persistent_login
|
||||
contextmenu
|
||||
custom_from
|
||||
thunderbird_labels
|
||||
]
|
||||
);
|
||||
plugins = [
|
||||
"persistent_login"
|
||||
"contextmenu"
|
||||
"custom_from"
|
||||
"thunderbird_labels"
|
||||
];
|
||||
dicts = with pkgs.aspellDicts; [ en ];
|
||||
extraConfig = ''
|
||||
$config['imap_host'] = "ssl://imap.migadu.com:993";
|
||||
$config['smtp_host'] = "ssl://smtp.migadu.com:465";
|
||||
$config['smtp_user'] = "%u";
|
||||
$config['smtp_pass'] = "%p";
|
||||
'';
|
||||
};
|
||||
|
||||
services.phpfpm.pools.roundcube.settings = lib.mapAttrs (name: lib.mkForce) {
|
||||
"listen.owner" = "caddy";
|
||||
"listen.group" = "caddy";
|
||||
};
|
||||
|
||||
services.caddy.virtualHosts."mail.cy7.sh".extraConfig = ''
|
||||
import common
|
||||
root ${roundcube.package}
|
||||
php_fastcgi unix/${fpm.socket}
|
||||
file_server
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
@ -1,25 +1,9 @@
|
|||
{ inputs }:
|
||||
let
|
||||
overlays = [
|
||||
./conduwuit
|
||||
./attic
|
||||
./vscode.nix
|
||||
];
|
||||
importedOverlays = map (m: import m) overlays;
|
||||
in
|
||||
importedOverlays
|
||||
++ [
|
||||
(
|
||||
final: prev:
|
||||
let
|
||||
pkgFrom = flake: pkg: flake.legacyPackages.${prev.system}.${pkg};
|
||||
stable = inputs.nixpkgs-stable;
|
||||
in
|
||||
{
|
||||
bitwarden-cli = pkgFrom stable "bitwarden-cli";
|
||||
roundcube = pkgFrom stable "roundcube";
|
||||
lldb = pkgFrom stable "lldb";
|
||||
calibre = pkgFrom stable "calibre";
|
||||
nil = inputs.nil.packages.${prev.system}.nil;
|
||||
}
|
||||
)
|
||||
]
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue