From 5e877bd3d04abcfcddf24d03e7f9002847fae24d Mon Sep 17 00:00:00 2001 From: cy Date: Sun, 9 Feb 2025 14:32:46 -0500 Subject: [PATCH 1/4] don't overlay garage and add some stable packages --- flake.lock | 34 +++++++++++++++++----------------- flake.nix | 9 ++------- home/yt/ytnix.nix | 1 - overlay/default.nix | 17 ++++++++++++++++- 4 files changed, 35 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index f84748e..7b66a87 100644 --- a/flake.lock +++ b/flake.lock @@ -935,22 +935,6 @@ "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, @@ -1015,6 +999,22 @@ "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, @@ -1252,7 +1252,7 @@ "niri": "niri", "nix-ld": "nix-ld", "nixpkgs": "nixpkgs_5", - "nixpkgs-garage": "nixpkgs-garage", + "nixpkgs-stable": "nixpkgs-stable_4", "nixvim": "nixvim", "nvim-github-theme": "nvim-github-theme", "plasma-manager": "plasma-manager", diff --git a/flake.nix b/flake.nix index cb60dbb..fabc87b 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ 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,8 +79,6 @@ inputs.home-manager.follows = "home-manager"; }; - nixpkgs-garage.url = "github:cything/nixpkgs/garage-module"; # unmerged PR - nvim-github-theme = { url = "github:projekt0n/github-nvim-theme"; flake = false; @@ -158,7 +157,7 @@ overlays = [ inputs.niri.overlays.niri inputs.rust-overlay.overlays.default - ] ++ import ./overlay; + ] ++ (import ./overlay { inherit inputs; }); }; in { @@ -187,14 +186,10 @@ 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/yt/ytnix.nix b/home/yt/ytnix.nix index 9dccbd4..72a0bab 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -66,7 +66,6 @@ mpv yt-dlp signal-desktop - azure-cli pavucontrol btop grim diff --git a/overlay/default.nix b/overlay/default.nix index 5b6a9a8..896258b 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -1,4 +1,4 @@ -let +{ inputs }: let overlays = [ ./conduwuit ./attic @@ -7,3 +7,18 @@ 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"; + } + ) +] From ee2baa3f1901bdfc0efb9cec2d1d97b2e68f3b50 Mon Sep 17 00:00:00 2001 From: cy Date: Sun, 9 Feb 2025 14:40:12 -0500 Subject: [PATCH 2/4] nix fmt --- .sops.yaml | 2 +- home/yt/ytnix.nix | 12 +++++++----- hosts/ytnix/default.nix | 5 ++++- modules/roundcube.nix | 21 ++++++++++++++------- overlay/default.nix | 9 +++++---- 5 files changed, 31 insertions(+), 18 deletions(-) diff --git a/.sops.yaml b/.sops.yaml index e067ba9..0fd042a 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -112,4 +112,4 @@ creation_rules: key_groups: - age: - *yt - - *cy \ No newline at end of file + - *cy diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 72a0bab..06cd741 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -115,11 +115,13 @@ 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 diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index 270654d..a0f9d74 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -337,7 +337,10 @@ 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 = { diff --git a/modules/roundcube.nix b/modules/roundcube.nix index 3f2d8cc..63b14c5 100644 --- a/modules/roundcube.nix +++ b/modules/roundcube.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.my.roundcube; fpm = config.services.phpfpm.pools.roundcube; @@ -13,12 +18,14 @@ 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 896258b..d498f88 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -1,4 +1,5 @@ -{ inputs }: let +{ inputs }: +let overlays = [ ./conduwuit ./attic @@ -7,9 +8,9 @@ importedOverlays = map (m: import m) overlays; in importedOverlays -++ -[ - (final: prev: +++ [ + ( + final: prev: let pkgFrom = flake: pkg: flake.legacyPackages.${prev.system}.${pkg}; stable = inputs.nixpkgs-stable; From 1ca80eb95d028b3113a3f9d9fb0d2c41fc1b90fb Mon Sep 17 00:00:00 2001 From: cy Date: Sun, 9 Feb 2025 16:03:52 -0500 Subject: [PATCH 3/4] flake update Signed-off-by: cy --- flake.lock | 62 +++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index 7b66a87..c5c7e8d 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1738740720, - "narHash": "sha256-rE0+UOEfFEGzjjIFdfs1Q4MR/UjVh8Dy6T137Z+ySgo=", + "lastModified": 1739114248, + "narHash": "sha256-Etzh7m1aZBwKfcS6sa+2zBzdOaZSR+yFn2pwwGTilb4=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "fda8b3680986dc8e038d51b93f7d36bf5c991ef6", + "rev": "b6e9dc3d98704c56027219d3775336910a0136c6", "type": "github" }, "original": { @@ -157,11 +157,11 @@ }, "crane_2": { "locked": { - "lastModified": 1738652123, - "narHash": "sha256-zdZek5FXK/k95J0vnLF0AMnYuZl4AjARq83blKuJBYY=", + "lastModified": 1739053031, + "narHash": "sha256-LrMDRuwAlRFD2T4MgBSRd1s2VtOE+Vl1oMCNu3RpPE0=", "owner": "ipetkov", "repo": "crane", - "rev": "c7e015a5fcefb070778c7d91734768680188a9cd", + "rev": "112e6591b2d6313b1bd05a80a754a8ee42432a7e", "type": "github" }, "original": { @@ -562,11 +562,11 @@ ] }, "locked": { - "lastModified": 1738753876, - "narHash": "sha256-yXT82kERWL4R81hfun9BuT478Q6ut0dJzdQjAxjRS38=", + "lastModified": 1739051380, + "narHash": "sha256-p1QSLO8DJnANY+ppK7fjD8GqfCrEIDjso1CSRHsXL7Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "f20b7a8ab527a2482f13754dc00b2deaddc34599", + "rev": "5af1b9a0f193ab6138b89a8e0af8763c21bbf491", "type": "github" }, "original": { @@ -683,11 +683,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1738690832, - "narHash": "sha256-gHJkxfk4ePMx5lhcF12r28lX6WdaH+a4y6GZhlaRQ1I=", + "lastModified": 1739035579, + "narHash": "sha256-Zc7KAA3iC5Ak9reV/peqELKXJn6rLcSZptq1Tzcx9Nc=", "ref": "refs/heads/main", - "rev": "8553adbb414167d969ba720cae02ab0694f38bd4", - "revCount": 17359, + "rev": "132d11c2d85425b7d23785ec306acb9b1d1ddba6", + "revCount": 17397, "type": "git", "url": "https://git.lix.systems/lix-project/lix" }, @@ -737,11 +737,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1738770770, - "narHash": "sha256-nfapp7C4BbdvHTRA1HSRVYjD5Fk2FCKoyxQLzcL5X50=", + "lastModified": 1739042449, + "narHash": "sha256-9zLFUpEebwhjCgtznsI61gTzefI3+fuXATHUOFzJi5w=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "83abbde7c8164ee4b42a8647e4e61015c3f45816", + "rev": "98e3666a9dc4143cbf93d957a15d749b5acef046", "type": "github" }, "original": { @@ -770,11 +770,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1738768006, - "narHash": "sha256-56jDYr/vqX4fobMJO2nWLjih03i6UV5bKtxI0nR4ZZA=", + "lastModified": 1738911818, + "narHash": "sha256-7bhr9ldHrNP71qOmKI1Hu80uclx+Tco0RNmO+GKtC1Y=", "owner": "YaLTeR", "repo": "niri", - "rev": "690d6355057ebeba03cbd8ce4905145b834c72f8", + "rev": "397e704d644d1bfe7736f2fdacbfe5742c7b2f9f", "type": "github" }, "original": { @@ -1065,11 +1065,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1738758495, - "narHash": "sha256-CZ8T4vP3ag2hwkpSZjatxJb55ouszvmnWw09qxGW9TU=", + "lastModified": 1739097848, + "narHash": "sha256-bbdQB0Y4mB2msqbyQ9QC+YPDZGt1evUK53AwQSyShHM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ceaea203f3ae1787b1bd13f021f686391696fc5b", + "rev": "9a0b855695c31ea653181b742c65e026bada3881", "type": "github" }, "original": { @@ -1102,11 +1102,11 @@ ] }, "locked": { - "lastModified": 1738780056, - "narHash": "sha256-YFzhEMT77o//oQoUivd+huCj6f2L/LmrSfV75+6CCq8=", + "lastModified": 1739121491, + "narHash": "sha256-BEmyAozR3Pc2qwPtC4rgUglzi3cw4nv4fXEY23NxOrQ=", "owner": "nix-community", "repo": "nixvim", - "rev": "2061a9ad95ca320a2bca00de6a9e30dbc5f52d74", + "rev": "13341a4c1238b7974e7bad9c7a6d5c51ca3cf81a", "type": "github" }, "original": { @@ -1285,11 +1285,11 @@ ] }, "locked": { - "lastModified": 1738722444, - "narHash": "sha256-DHVyKCiIQVDqjYoVU2j7UaLNIlOnpB9sP1cPRNRpqvY=", + "lastModified": 1739068147, + "narHash": "sha256-3DtLkjQFlIUOXw3TBH+iP0jglpqO6Lv2KaQc+ADg39I=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "347fb01821c3cd8d54e563d244a599c1e27a393d", + "rev": "f61820fa2c3844d6940cce269a6afdec30aa2e6c", "type": "github" }, "original": { @@ -1355,11 +1355,11 @@ ] }, "locked": { - "lastModified": 1738680491, - "narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=", + "lastModified": 1738953846, + "narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "64dbb922d51a42c0ced6a7668ca008dded61c483", + "rev": "4f09b473c936d41582dd744e19f34ec27592c5fd", "type": "github" }, "original": { From ff7354c661dd21b68f345f1d87226f0f116c1cac Mon Sep 17 00:00:00 2001 From: cy Date: Sun, 9 Feb 2025 22:26:24 -0500 Subject: [PATCH 4/4] make codium nicer, disable some stuff --- flake.lock | 27 +++++++++++++++++++++++++++ flake.nix | 6 ++++++ home/{vscode.nix => codium.nix} | 3 +-- home/yt/ytnix.nix | 4 +++- hosts/ytnix/default.nix | 12 ++++++------ overlay/default.nix | 1 + 6 files changed, 44 insertions(+), 9 deletions(-) rename home/{vscode.nix => codium.nix} (94%) diff --git a/flake.lock b/flake.lock index c5c7e8d..b940f4e 100644 --- a/flake.lock +++ b/flake.lock @@ -723,6 +723,32 @@ "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", @@ -1249,6 +1275,7 @@ "lanzaboote": "lanzaboote", "lix": "lix", "lix-module": "lix-module", + "nil": "nil", "niri": "niri", "nix-ld": "nix-ld", "nixpkgs": "nixpkgs_5", diff --git a/flake.nix b/flake.nix index fabc87b..549faac 100644 --- a/flake.nix +++ b/flake.nix @@ -78,6 +78,12 @@ 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"; + }; nvim-github-theme = { url = "github:projekt0n/github-nvim-theme"; diff --git a/home/vscode.nix b/home/codium.nix similarity index 94% rename from home/vscode.nix rename to home/codium.nix index 2680ffe..b1b2044 100644 --- a/home/vscode.nix +++ b/home/codium.nix @@ -11,14 +11,13 @@ 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" = "nixd"; + "nix.serverPath" = "nil"; "editor.fontFamily" = "IBM Plex Mono"; "editor.fontSize" = 16; "editor.wordWrap" = "on"; diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 06cd741..70f5aef 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -10,7 +10,7 @@ ../niri ../irssi.nix ../kitty.nix - ../vscode.nix + ../codium.nix ../plasma.nix ]; home = { @@ -127,6 +127,8 @@ radare2 p7zip qbittorrent + # vscodium + nil ]; programs.waybar.enable = true; diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index a0f9d74..37b8763 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -280,10 +280,10 @@ services.tumbler.enable = true; virtualisation = { - libvirtd.enable = true; - docker.enable = true; + libvirtd.enable = false; + docker.enable = false; }; - programs.virt-manager.enable = true; + programs.virt-manager.enable = false; services.usbmuxd.enable = true; programs.nix-ld.dev = { @@ -358,7 +358,7 @@ ]; }; - services.ollama.enable = true; + services.ollama.enable = false; # wireguard setup networking.wg-quick.interfaces.wg0 = { @@ -382,9 +382,9 @@ ]; }; - services.trezord.enable = true; + services.trezord.enable = false; - programs.niri.enable = true; + programs.niri.enable = false; programs.niri.package = pkgs.niri-unstable; programs.xwayland.enable = true; diff --git a/overlay/default.nix b/overlay/default.nix index d498f88..910a5a4 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -20,6 +20,7 @@ importedOverlays roundcube = pkgFrom stable "roundcube"; lldb = pkgFrom stable "lldb"; calibre = pkgFrom stable "calibre"; + nil = inputs.nil.packages.${prev.system}.nil; } ) ]