From 03d33d6306308997ebae8c7d4de25affadc3c2b9 Mon Sep 17 00:00:00 2001
From: Kopatz <7265381+Kropatz@users.noreply.github.com>
Date: Mon, 27 Nov 2023 12:26:45 +0100
Subject: [PATCH] laptop

---
 flake.nix                    |  7 +++
 laptop/main.nix              | 83 ------------------------------------
 modules/graphical/shared.nix | 11 ++---
 3 files changed, 10 insertions(+), 91 deletions(-)

diff --git a/flake.nix b/flake.nix
index 073d510..6214ed2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -128,8 +128,10 @@
         };
         modules = [
           ./users/kopatz.nix
+          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
           # Todo: refactor file layout
           ./modules/graphical/gnome.nix
+          ./modules/graphical/shared.nix
           ./laptop/configuration.nix
           ./modules/virt-manager.nix
           ./modules/ssh.nix
@@ -139,6 +141,7 @@
           ./modules/thunderbolt.nix
           ./modules/rdp.nix
           ./modules/tmpfs.nix
+          ./modules/nix/settings.nix
           nixos-hardware.nixosModules.dell-xps-15-7590-nvidia
           agenix.nixosModules.default
           home-manager.nixosModules.home-manager
@@ -153,13 +156,17 @@
         };
         modules = [
           ./users/kopatz.nix
+          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
           ./laptop/configuration.nix
+          ./modules/graphical/gnome.nix
+          ./modules/graphical/shared.nix
           ./modules/virt-manager.nix
           ./modules/ssh.nix
           ./modules/wake-on-lan.nix
           ./modules/static-ip.nix
           ./modules/no-sleep-lid-closed.nix
           ./modules/thunderbolt.nix
+          ./modules/nix/settings.nix
           nixos-hardware.nixosModules.dell-xps-15-7590
           agenix.nixosModules.default
           home-manager.nixosModules.home-manager
diff --git a/laptop/main.nix b/laptop/main.nix
index 8185c87..9ba6e02 100644
--- a/laptop/main.nix
+++ b/laptop/main.nix
@@ -3,16 +3,6 @@
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
 { config, pkgs, inputs, ... }:
-
-let
-  keepassWithPlugins = pkgs.keepass.override {
-    plugins = [
-      pkgs.keepass-keepassrpc
-    ];
-  };
-
-in
-
 {
   imports =
     [ # Include the results of the hardware scan.
@@ -24,9 +14,6 @@ in
 	#<home-manager/nixos>
     ];
 
-  # storage optimization
-  nix.optimise.automatic = true;
-
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -83,76 +70,6 @@ in
   # Enable touchpad support (enabled default in most desktopManager).
   services.xserver.libinput.enable = true;
 
-  programs.steam = {
-    enable = true;
-    remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
-    dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
-  };
-
-  programs.kdeconnect.enable = true;
-
-  fonts.fontDir.enable = true;
-  fonts.fonts = with pkgs; [
-    nerdfonts
-    #font-awesome
-  ];
-
-  networking.firewall = {
-    enable = true;
-    allowedTCPPortRanges = [
-      { from = 1714; to = 1764; } # KDE Connect
-    ];
-    allowedUDPPortRanges = [
-      { from = 1714; to = 1764; } # KDE Connect
-    ];
-  };
-
-  # Allow unfree packages
-  nixpkgs.config.allowUnfree = true;
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [
-  #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-  #  wget
-    wget
-    nixos-option
-    kate
-    keepassWithPlugins
-    jetbrains.idea-ultimate
-    jetbrains.rider
-    dotnet-sdk_7
-    dotnet-runtime_7
-    neovim
-    htop
-    btop
-    git
-    xfce.thunar
-    killall
-    xclip
-    usbutils
-    bun
-    inputs.agenix.packages."x86_64-linux".default
-    insomnia
-    remmina
-    nextcloud-client
-    #podman-compose
-    #arion # docker
-    neofetch
-    thunderbird
-    rofi
-    pdfgrep
-    taisei
-    ncdu
-    localsend
-    element-desktop
-  ];
-
-  environment.sessionVariables = {
-    DOTNET_ROOT = "${pkgs.dotnet-sdk_7}";
-  };
-
   ### docker
   virtualisation.docker.enable = true;
 
diff --git a/modules/graphical/shared.nix b/modules/graphical/shared.nix
index 68b5bbd..949a4e3 100644
--- a/modules/graphical/shared.nix
+++ b/modules/graphical/shared.nix
@@ -36,7 +36,6 @@ in
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
@@ -49,17 +48,13 @@ in
     keepassWithPlugins
     jetbrains.idea-ultimate
     jetbrains.rider
-    dotnet-sdk_7
-    dotnet-runtime_7
     neovim
-    htop
     btop
     git
     xfce.thunar
     killall
     xclip
     usbutils
-    bun
     inputs.agenix.packages."x86_64-linux".default
     insomnia
     remmina
@@ -83,9 +78,9 @@ in
     vulkan-tools
   ];
 
-  environment.sessionVariables = {
-    DOTNET_ROOT = "${pkgs.dotnet-sdk_7}";
-  };
+  #environment.sessionVariables = {
+  #  DOTNET_ROOT = "${pkgs.dotnet-sdk_7}";
+  #};
 
   ### docker
   virtualisation.docker.enable = true;