From c427d6bf298fdc0b607bcb8dafed176c0326fcb3 Mon Sep 17 00:00:00 2001 From: foglar Date: Fri, 8 Nov 2024 08:40:11 +0100 Subject: [PATCH] Applications, programming code --- nixos/desktop/hyprland/hyprland.nix | 2 - nixos/packages/applications.nix | 34 ++++++++++++++++ nixos/packages/packages.nix | 46 +++------------------- nixos/packages/programming/code.nix | 3 ++ nixos/packages/programming/programming.nix | 1 - 5 files changed, 42 insertions(+), 44 deletions(-) diff --git a/nixos/desktop/hyprland/hyprland.nix b/nixos/desktop/hyprland/hyprland.nix index ce28340..d3c8d64 100644 --- a/nixos/desktop/hyprland/hyprland.nix +++ b/nixos/desktop/hyprland/hyprland.nix @@ -1,6 +1,4 @@ { - inputs, - pkgs, lib, config, ... diff --git a/nixos/packages/applications.nix b/nixos/packages/applications.nix index e69de29..5047f6b 100644 --- a/nixos/packages/applications.nix +++ b/nixos/packages/applications.nix @@ -0,0 +1,34 @@ +{ + lib, + pkgs, + config, + ... +}: { + options = { + applications.enable = lib.mkEnableOption "enable Graphical applications"; + }; + + imports = [ + ./applications/firefox.nix + ]; + + config = lib.mkIf config.applications.enable { + home.packages = with pkgs; [ + librewolf + vesktop + ferdium + + stellarium + libreoffice + localsend + plasma5Packages.kdeconnect-kde + qbittorrent + vlc + #tor-browser + openrocket + spotify + spotube + inkscape + ]; + }; +} diff --git a/nixos/packages/packages.nix b/nixos/packages/packages.nix index 05be558..9a9ddf9 100644 --- a/nixos/packages/packages.nix +++ b/nixos/packages/packages.nix @@ -7,56 +7,20 @@ ./programming/programming.nix ./games.nix ./terminal_tools.nix - ./applications/firefox.nix - #./packages/applications.nix + ./applications.nix ]; terminal_tools.enable = lib.mkDefault true; programming.enable = lib.mkDefault true; games.enable = lib.mkDefault false; firefox.enable = lib.mkDefault true; + applications.enable = lib.mkDefault true; #programs.neovim.enable = true; home.packages = with pkgs; [ - librewolf - vesktop - ferdium - - alejandra - nh - nixd - - stellarium - libreoffice - localsend - plasma5Packages.kdeconnect-kde - qbittorrent - vlc - #tor-browser - openrocket - spotify - spotube - inkscape - - #zed-editor - #gtk3 - #(python3.withPackages (subpkgs: with subpkgs; [ - #pygobject3 - #gobject-introspection - #astropy - #tomli - #tomli-w - #matplotlib - #basemap - #opencv4 - #requests - #])) - - # # It is sometimes useful to fine-tune packages, for example, by applying - # # overrides. You can do that directly here, just don't forget the - # # parentheses. Maybe you want to install Nerd Fonts with a limited number of - # # fonts? - # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; }) + alejandra + nh + nixd ]; nixpkgs.config.allowUnfreePredicate = pkg: diff --git a/nixos/packages/programming/code.nix b/nixos/packages/programming/code.nix index 64f231f..52d4e17 100644 --- a/nixos/packages/programming/code.nix +++ b/nixos/packages/programming/code.nix @@ -11,6 +11,8 @@ config = lib.mkIf config.vscode.enable { home.packages = with pkgs; [ vscode + python3 + dotnet-sdk_8 ]; programs.vscode = { @@ -41,6 +43,7 @@ "[python]" = { "editor.defaultFormatter" = "ms-python.black-formatter"; }; + "python.defaultInterpreterPath" = "${pkgs.python3}"; "nix.serverPath" = "nixd"; "nix.enableLanguageServer" = true; "nix.serverSettings" = { diff --git a/nixos/packages/programming/programming.nix b/nixos/packages/programming/programming.nix index 658d0d8..c8e2a10 100644 --- a/nixos/packages/programming/programming.nix +++ b/nixos/packages/programming/programming.nix @@ -24,7 +24,6 @@ neovim arduino-ide go - dotnet-sdk_8 jq conda ];