From d4514416bf6359167073d92e53e17b0bb7a213db Mon Sep 17 00:00:00 2001 From: tdpeuter Date: Sun, 12 Mar 2023 19:46:21 +0100 Subject: [PATCH] Add --- nixos/flake.lock | 12 ++++++------ nixos/flake.nix | 5 +++-- nixos/system/configuration.nix | 2 ++ nixos/users/tdpeuter/home.nix | 22 ++++++++++++++++------ 4 files changed, 27 insertions(+), 14 deletions(-) diff --git a/nixos/flake.lock b/nixos/flake.lock index e00a7c4..a010298 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -24,11 +24,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1678072060, - "narHash": "sha256-6a9Tbjhir5HxDx4uw0u6Z+LHUfYf7tsT9QxF9FN/32w=", + "lastModified": 1678137616, + "narHash": "sha256-T+lWTRdcYaOnZQW+Ehdlg+YldC2l9cq2GXJFPq22Nxc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "47c003416297e4d59a5e3e7a8b15cdbdf5110560", + "rev": "7edcdf7b169c33cd3eef9aba50521ce93ee666b8", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nur": { "locked": { - "lastModified": 1678221928, - "narHash": "sha256-m1pwayWF9O/pK7iiX4UQBrflvdLtmbDpjwmRMPvlniA=", + "lastModified": 1678268766, + "narHash": "sha256-DoaLc/sdJo4Lk7oXd3KEP68Qglv05AqgeyqS1tYoK9Q=", "owner": "nix-community", "repo": "NUR", - "rev": "15e2403d7288984b9e53bf9a92483574f1aafe42", + "rev": "55b25f42bdb74a819c77b6439d66e6cab2b56769", "type": "github" }, "original": { diff --git a/nixos/flake.nix b/nixos/flake.nix index bf802be..43025f8 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -8,7 +8,7 @@ nur.url = "github:nix-community/NUR"; }; - outputs = { nixpkgs, home-manager, ... }: + outputs = { self, nixpkgs, home-manager, nur, ... }: let system = "x86_64-linux"; # Use flake tools? @@ -40,8 +40,9 @@ nixosConfigurations = { Tibo-NixTest = lib.nixosSystem { # Use hostname inherit system; - modules = (builtins.attrValues) ++ [ + modules = [ ./system/configuration.nix + nur.nixosModules.nur ]; }; }; diff --git a/nixos/system/configuration.nix b/nixos/system/configuration.nix index c694d7b..e983ff6 100644 --- a/nixos/system/configuration.nix +++ b/nixos/system/configuration.nix @@ -69,6 +69,7 @@ okular plasma-browser-integration khelpcenter + kwalletmanager oxygen ]; }; @@ -104,6 +105,7 @@ environment.systemPackages = with pkgs; [ firefox git + mongodb vim wget ]; diff --git a/nixos/users/tdpeuter/home.nix b/nixos/users/tdpeuter/home.nix index 7e6051c..03fcf63 100644 --- a/nixos/users/tdpeuter/home.nix +++ b/nixos/users/tdpeuter/home.nix @@ -26,15 +26,29 @@ duf git-crypt gnupg + libreoffice-fresh-unwrapped + nextcloud-client pinentry_qt vifm + zathura zellij zenith + + # Webdevelopment jetbrains.webstorm + nodejs + nodePackages_latest.npm + + # Multimedia + jetbrains.pycharm-professional + python39 + python39Packages.pip + gcc + cmake ]; - + }; - + programs = { # Let Home Manager install and manage itself. home-manager.enable = true; @@ -58,10 +72,6 @@ pinentryFlavor = "qt"; }; - nextcloud-client = { - enable = true; - startInBackground = true; - }; }; }