5 Commits

3 changed files with 20 additions and 41 deletions

24
flake.lock generated
View File

@@ -81,11 +81,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1781989573, "lastModified": 1770491427,
"narHash": "sha256-npfH7Zv7t1akX/ArqCNro4zU4ViPlghLaPnbEfHbCxk=", "narHash": "sha256-8b+0vixdqGnIIcgsPhjdX7EGPdzcVQqYxF+ujjex654=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "78e7d8b13ecd7f5256a5c11ce216876164099d9f", "rev": "cbd8a72e5fe6af19d40e2741dc440d9227836860",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -158,11 +158,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1781577229, "lastModified": 1770197578,
"narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -182,11 +182,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775856943, "lastModified": 1769956244,
"narHash": "sha256-b7Mp7P+q2Md5AGt4rjHfMcBykzMumFTen10ST++AuTU=", "narHash": "sha256-12RCFLyAedyMOdenUi7cN3ioJPEGjA/ZG1BLjugfUVs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "plasma-manager", "repo": "plasma-manager",
"rev": "a524a6160e6df89f7673ba293cf7d78b559eb1a5", "rev": "fe54ea85c6e4413fba03b84d50f2b431d2f7c831",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -259,11 +259,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1781802448, "lastModified": 1763929380,
"narHash": "sha256-fquZY1SFToXU+M5jBAiNGoMBUfXbDB036lS4K7M81FA=", "narHash": "sha256-Yc7gZME/lcHoJH6bMPCG7CyjKWhOLJPqLI8MXtyKPHo=",
"owner": "Platonic-Systems", "owner": "Platonic-Systems",
"repo": "secrix", "repo": "secrix",
"rev": "f79faf63b260e27c3a1a2ba047ac72963d5b0066", "rev": "c6e3ca7af47c329dcf442a3d017ae171eee5612f",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -8,6 +8,7 @@
]; ];
boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_18; boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_18;
boot.zfs.package = pkgs.zfs_2_4;
boot.loader = { boot.loader = {
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
timeout = 3; timeout = 3;
@@ -38,7 +39,8 @@
services.xserver.enable = false; services.xserver.enable = false;
# Enable the KDE Plasma Desktop Environment. # Enable the KDE Plasma Desktop Environment.
services.displayManager.plasma-login-manager.enable = true; services.displayManager.sddm.enable = true;
services.displayManager.sddm.wayland.enable = true;
services.desktopManager.plasma6.enable = true; services.desktopManager.plasma6.enable = true;
# Enable CUPS to print documents. # Enable CUPS to print documents.
@@ -77,6 +79,7 @@
# https://nixos.wiki/wiki/Docker # https://nixos.wiki/wiki/Docker
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
virtualisation.docker.enableOnBoot = false; virtualisation.docker.enableOnBoot = false;
virtualisation.docker.package = pkgs.docker_28;
# https://github.com/flatpak/flatpak/issues/2861 # https://github.com/flatpak/flatpak/issues/2861
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
@@ -92,11 +95,6 @@
jetbrains-mono jetbrains-mono
]; ];
# remove after bitwarden update
nixpkgs.config.permittedInsecurePackages = [
"electron-39.8.10"
];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
dust dust
eza eza
@@ -122,10 +120,10 @@
powertop powertop
rbw rbw
restic restic
resticprofile
rclone rclone
ripgrep-all ripgrep-all
rustscan rustscan
unrar
whois whois
wireguard-tools wireguard-tools
yt-dlp yt-dlp
@@ -145,11 +143,10 @@
]; ];
}) })
nextcloud-client nextcloud-client
# lutris lutris
lxqt.pavucontrol-qt lxqt.pavucontrol-qt
pinentry-all pinentry-all
tela-circle-icon-theme tela-circle-icon-theme
typst
virt-viewer virt-viewer
waypipe waypipe
] ++ [ ] ++ [
@@ -163,13 +160,7 @@
rustup rustup
zed-editor zed-editor
package-version-server # for zed package-version-server # for zed
antigravity-cli
antigravity-fhs antigravity-fhs
codex
# codex-acp
github-copilot-cli
opencode
opencode-desktop
] ++ [ ] ++ [
# C # C
gcc gcc
@@ -180,9 +171,6 @@
poetry poetry
# Haskell # Haskell
cabal-install
haskell-language-server
# haskellPackages.hls-cabal-plugin
haskellPackages.ghc haskellPackages.ghc
haskellPackages.stack haskellPackages.stack
@@ -198,21 +186,12 @@
# Gleam # Gleam
gleam gleam
beamMinimal28Packages.erlang beamMinimal26Packages.erlang
# Racket # Racket
racket racket
# Ruby # Ruby
ruby ruby
# Java
zulu
] ++ [
jujutsu
lazyjj
jjui
# jj-fzf
gg-jj
]; ];
} }

View File

@@ -58,7 +58,7 @@ in
enable = true; enable = true;
package = pkgs.caddy.withPlugins { package = pkgs.caddy.withPlugins {
plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ]; plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];
hash = "sha256-Zls+5kWd/JSQsmZC4SRQ/WS+pUcRolNaaI7UQoPzJA0="; hash = "sha256-Dvifm7rRwFfgXfcYvXcPDNlMaoxKd5h4mHEK6kJ+T4A=";
}; };
virtualHosts."*.${domain}".extraConfig = '' virtualHosts."*.${domain}".extraConfig = ''
encode encode