diff --git a/.sops.yaml b/.sops.yaml index 0fd042a..e067ba9 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -112,4 +112,4 @@ creation_rules: key_groups: - age: - *yt - - *cy + - *cy \ No newline at end of file diff --git a/flake.lock b/flake.lock index b940f4e..f84748e 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1739114248, - "narHash": "sha256-Etzh7m1aZBwKfcS6sa+2zBzdOaZSR+yFn2pwwGTilb4=", + "lastModified": 1738740720, + "narHash": "sha256-rE0+UOEfFEGzjjIFdfs1Q4MR/UjVh8Dy6T137Z+ySgo=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "b6e9dc3d98704c56027219d3775336910a0136c6", + "rev": "fda8b3680986dc8e038d51b93f7d36bf5c991ef6", "type": "github" }, "original": { @@ -157,11 +157,11 @@ }, "crane_2": { "locked": { - "lastModified": 1739053031, - "narHash": "sha256-LrMDRuwAlRFD2T4MgBSRd1s2VtOE+Vl1oMCNu3RpPE0=", + "lastModified": 1738652123, + "narHash": "sha256-zdZek5FXK/k95J0vnLF0AMnYuZl4AjARq83blKuJBYY=", "owner": "ipetkov", "repo": "crane", - "rev": "112e6591b2d6313b1bd05a80a754a8ee42432a7e", + "rev": "c7e015a5fcefb070778c7d91734768680188a9cd", "type": "github" }, "original": { @@ -562,11 +562,11 @@ ] }, "locked": { - "lastModified": 1739051380, - "narHash": "sha256-p1QSLO8DJnANY+ppK7fjD8GqfCrEIDjso1CSRHsXL7Y=", + "lastModified": 1738753876, + "narHash": "sha256-yXT82kERWL4R81hfun9BuT478Q6ut0dJzdQjAxjRS38=", "owner": "nix-community", "repo": "home-manager", - "rev": "5af1b9a0f193ab6138b89a8e0af8763c21bbf491", + "rev": "f20b7a8ab527a2482f13754dc00b2deaddc34599", "type": "github" }, "original": { @@ -683,11 +683,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1739035579, - "narHash": "sha256-Zc7KAA3iC5Ak9reV/peqELKXJn6rLcSZptq1Tzcx9Nc=", + "lastModified": 1738690832, + "narHash": "sha256-gHJkxfk4ePMx5lhcF12r28lX6WdaH+a4y6GZhlaRQ1I=", "ref": "refs/heads/main", - "rev": "132d11c2d85425b7d23785ec306acb9b1d1ddba6", - "revCount": 17397, + "rev": "8553adbb414167d969ba720cae02ab0694f38bd4", + "revCount": 17359, "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": 1738770770, + "narHash": "sha256-nfapp7C4BbdvHTRA1HSRVYjD5Fk2FCKoyxQLzcL5X50=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "98e3666a9dc4143cbf93d957a15d749b5acef046", + "rev": "83abbde7c8164ee4b42a8647e4e61015c3f45816", "type": "github" }, "original": { @@ -796,11 +770,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1738911818, - "narHash": "sha256-7bhr9ldHrNP71qOmKI1Hu80uclx+Tco0RNmO+GKtC1Y=", + "lastModified": 1738768006, + "narHash": "sha256-56jDYr/vqX4fobMJO2nWLjih03i6UV5bKtxI0nR4ZZA=", "owner": "YaLTeR", "repo": "niri", - "rev": "397e704d644d1bfe7736f2fdacbfe5742c7b2f9f", + "rev": "690d6355057ebeba03cbd8ce4905145b834c72f8", "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": 1738758495, + "narHash": "sha256-CZ8T4vP3ag2hwkpSZjatxJb55ouszvmnWw09qxGW9TU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9a0b855695c31ea653181b742c65e026bada3881", + "rev": "ceaea203f3ae1787b1bd13f021f686391696fc5b", "type": "github" }, "original": { @@ -1128,11 +1102,11 @@ ] }, "locked": { - "lastModified": 1739121491, - "narHash": "sha256-BEmyAozR3Pc2qwPtC4rgUglzi3cw4nv4fXEY23NxOrQ=", + "lastModified": 1738780056, + "narHash": "sha256-YFzhEMT77o//oQoUivd+huCj6f2L/LmrSfV75+6CCq8=", "owner": "nix-community", "repo": "nixvim", - "rev": "13341a4c1238b7974e7bad9c7a6d5c51ca3cf81a", + "rev": "2061a9ad95ca320a2bca00de6a9e30dbc5f52d74", "type": "github" }, "original": { @@ -1275,11 +1249,10 @@ "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", @@ -1312,11 +1285,11 @@ ] }, "locked": { - "lastModified": 1739068147, - "narHash": "sha256-3DtLkjQFlIUOXw3TBH+iP0jglpqO6Lv2KaQc+ADg39I=", + "lastModified": 1738722444, + "narHash": "sha256-DHVyKCiIQVDqjYoVU2j7UaLNIlOnpB9sP1cPRNRpqvY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f61820fa2c3844d6940cce269a6afdec30aa2e6c", + "rev": "347fb01821c3cd8d54e563d244a599c1e27a393d", "type": "github" }, "original": { @@ -1382,11 +1355,11 @@ ] }, "locked": { - "lastModified": 1738953846, - "narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=", + "lastModified": 1738680491, + "narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4f09b473c936d41582dd744e19f34ec27592c5fd", + "rev": "64dbb922d51a42c0ced6a7668ca008dded61c483", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 549faac..cb60dbb 100644 --- a/flake.nix +++ b/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,12 +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"; - }; + + nixpkgs-garage.url = "github:cything/nixpkgs/garage-module"; # unmerged PR nvim-github-theme = { url = "github:projekt0n/github-nvim-theme"; @@ -163,7 +158,7 @@ overlays = [ inputs.niri.overlays.niri inputs.rust-overlay.overlays.default - ] ++ (import ./overlay { inherit inputs; }); + ] ++ import ./overlay; }; in { @@ -192,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") ]; }; diff --git a/home/codium.nix b/home/vscode.nix similarity index 94% rename from home/codium.nix rename to home/vscode.nix index b1b2044..2680ffe 100644 --- a/home/codium.nix +++ b/home/vscode.nix @@ -11,13 +11,14 @@ jnoortheen.nix-ide editorconfig.editorconfig github.github-vscode-theme + github.copilot rust-lang.rust-analyzer ]; 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"; diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 70f5aef..9dccbd4 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -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 @@ -115,20 +116,16 @@ sccache awscli2 lldb - (cutter.withPlugins ( - p: with p; [ - rz-ghidra - jsdec - sigdb - ] - )) + (cutter.withPlugins (p: with p; [ + rz-ghidra + jsdec + sigdb + ])) ida-free patchelf radare2 p7zip qbittorrent - # vscodium - nil ]; programs.waybar.enable = true; diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index 37b8763..270654d 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -280,10 +280,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 = { @@ -337,10 +337,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 +355,7 @@ ]; }; - services.ollama.enable = false; + services.ollama.enable = true; # wireguard setup networking.wg-quick.interfaces.wg0 = { @@ -382,9 +379,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; diff --git a/modules/roundcube.nix b/modules/roundcube.nix index 63b14c5..3f2d8cc 100644 --- a/modules/roundcube.nix +++ b/modules/roundcube.nix @@ -1,9 +1,4 @@ -{ - config, - lib, - pkgs, - ... -}: +{ config, lib, pkgs, ... }: let cfg = config.my.roundcube; fpm = config.services.phpfpm.pools.roundcube; @@ -18,14 +13,12 @@ in services.roundcube = { enable = true; configureNginx = false; - package = pkgs.roundcube.withPlugins ( - p: with p; [ - persistent_login - contextmenu - custom_from - thunderbird_labels - ] - ); + package = pkgs.roundcube.withPlugins (p: with p; [ + persistent_login + contextmenu + custom_from + thunderbird_labels + ]); plugins = [ "persistent_login" "contextmenu" diff --git a/overlay/default.nix b/overlay/default.nix index 910a5a4..5b6a9a8 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -1,4 +1,3 @@ -{ inputs }: let overlays = [ ./conduwuit @@ -8,19 +7,3 @@ let 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; - } - ) -]