From ff7354c661dd21b68f345f1d87226f0f116c1cac Mon Sep 17 00:00:00 2001 From: cy Date: Sun, 9 Feb 2025 22:26:24 -0500 Subject: [PATCH] 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; } ) ]