From 2de311ffc66eb15412e9dd69707e85fd07b9f3a2 Mon Sep 17 00:00:00 2001 From: Henri Dohmen Date: Wed, 16 Jul 2025 02:02:19 +0200 Subject: [PATCH] packages --- desktop/default.nix | 8 ---- desktop/software/default.nix | 14 +++++-- desktop/software/development.nix | 34 ++++++++++++++-- flake.lock | 67 +++++++++++++++----------------- flake.nix | 17 +++++++- host/solo/nvidia-gpu.nix | 2 +- 6 files changed, 90 insertions(+), 52 deletions(-) diff --git a/desktop/default.nix b/desktop/default.nix index b1735f9..946448b 100644 --- a/desktop/default.nix +++ b/desktop/default.nix @@ -47,14 +47,6 @@ in pkg: builtins.elem (lib.getName pkg) [ "nvidia-x11" - "nvidia-settings" - "vscode" - "obsidian" - "steam" - "steam-unwrapped" - "gateway" # jetbrains - "spotify" - "rust-rover" ]; programs.nix-ld.enable = true; diff --git a/desktop/software/default.nix b/desktop/software/default.nix index 56d5bf0..57cc36c 100644 --- a/desktop/software/default.nix +++ b/desktop/software/default.nix @@ -17,17 +17,19 @@ in hd.desktop.software.development.enable = true; environment.systemPackages = with pkgs; [ + # kitty + # niri + # obsidian # vesktop bitwarden calibre element-desktop + fuzzel gh - kitty nil - obsidian rclone signal-desktop - spotify + spotify-player starship stow tor-browser @@ -92,6 +94,12 @@ in programs.foot = { enable = true; server.enable = true; + settings = { + main = { + "font" = "monospace:size=11"; + "dpi-aware" = "yes"; + }; + }; }; }; diff --git a/desktop/software/development.nix b/desktop/software/development.nix index a25f3e8..4754123 100644 --- a/desktop/software/development.nix +++ b/desktop/software/development.nix @@ -15,7 +15,6 @@ in documentation.dev.enable = true; environment.systemPackages = with pkgs; [ - vscode binutils clang gcc @@ -28,8 +27,37 @@ in python313Packages.mypy rustup emacs - jetbrains.gateway - jetbrains.rust-rover + # jetbrains.gateway + # jetbrains.rust-rover ]; + + home = { + programs.vscode = { + enable = true; + package = pkgs.vscodium; + mutableExtensionsDir = true; + profiles.default = { + enableExtensionUpdateCheck = true; + enableUpdateCheck = false; + extensions = with pkgs.vscode-marketplace; [ + dnut.rewrap-revived + editorconfig.editorconfig + james-yu.latex-workshop + jnoortheen.nix-ide + ltex-plus.vscode-ltex-plus + maximedenes.vscoq + ms-python.python + ms-toolsai.jupyter + # ms-vscode-remote.remote-ssh + ]; + }; + userSettings = { + "editor.rulers" = [ 80 ]; + "editor.formatOnPaste" = false; + "editor.formatOnSave" = false; + "editor.formatOnType" = false; + }; + }; + }; }; } diff --git a/flake.lock b/flake.lock index ded27f0..2410165 100644 --- a/flake.lock +++ b/flake.lock @@ -26,9 +26,13 @@ "colmena": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils", + "flake-utils": [ + "flake-utils" + ], "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "nixpkgs" + ], "stable": "stable" }, "locked": { @@ -62,21 +66,6 @@ } }, "flake-utils": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { "inputs": { "systems": "systems_2" }, @@ -193,22 +182,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1750134718, - "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1751792365, "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", @@ -228,11 +201,12 @@ "inputs": { "agenix": "agenix", "colmena": "colmena", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "home-manager": "home-manager_2", "nixos-config-hidden": "nixos-config-hidden", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs", + "vscode-extensions": "vscode-extensions" } }, "stable": { @@ -280,6 +254,29 @@ "repo": "default", "type": "github" } + }, + "vscode-extensions": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1752545765, + "narHash": "sha256-oJR/nLIV9tS4z3zTCW9XM4eZVHDmDSVJycTIDKyeb/4=", + "owner": "nix-community", + "repo": "nix-vscode-extensions", + "rev": "a184301e65d630334701e9251b59b1673f3f2936", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-vscode-extensions", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index ce925d0..c9490f1 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,11 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - colmena.url = "github:zhaofengli/colmena"; + colmena = { + url = "github:zhaofengli/colmena"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "flake-utils"; + }; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -17,6 +21,11 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.darwin.follows = ""; }; + vscode-extensions = { + url = "github:nix-community/nix-vscode-extensions"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "flake-utils"; + }; }; outputs = @@ -29,6 +38,7 @@ nixos-config-hidden, nixos-hardware, nixpkgs, + vscode-extensions, }@inputs: let inherit (nixpkgs) lib; @@ -40,7 +50,10 @@ secrets = lib'.walk-dir ./secrets; }; overlays = _: { - nixpkgs.overlays = [ colmena.overlay ]; + nixpkgs.overlays = [ + vscode-extensions.overlays.default + colmena.overlay + ]; }; in { diff --git a/host/solo/nvidia-gpu.nix b/host/solo/nvidia-gpu.nix index 1bc6bd7..06ac48a 100644 --- a/host/solo/nvidia-gpu.nix +++ b/host/solo/nvidia-gpu.nix @@ -11,7 +11,7 @@ package = config.boot.kernelPackages.nvidiaPackages.stable; open = false; # TODO: switch to open driver if it works again - nvidiaSettings = true; + nvidiaSettings = false; powerManagement = { enable = true; finegrained = false;