Remove outdated configuration

defaults/base/applications.nix

@@ -49,7 +49,6 @@
       unzip
       p7zip
       unrar
-      borgbackup
       iotop
       cabextract
       tree # p7zip

defaults/base/default.nix

@@ -25,23 +25,12 @@ let
         "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDIPF8ZV7vhpbVvLxiKq8ANVusNUHMbtii5MuvjxCbVz7vSNVPo9OOLvYyDqhbRAWMTdQeGZVAaALBufKKmprDTRFMpnA7Ut4TFrdz/5DTaR2KEjJ7P75moH+0xooR/GsbzFGsNBSQSXK3u1igndPYEC/PqCHN++32kDo2wLqTB4VLrEovU3iq8BMckn329Bu1fGbXKTgDpEvUEEwFO2brQZLMmzILGF/v4B9ImEGtinAUNgDSfEpgPN23sdWQH9rwEClGv95JmWNf05tuVomhZzOBtCFoAno3XB1nj16avjsqJ3aGFY2CCcfsNrwKzhIotmm82bcI4BJuJIVRIKbZ1 cardno:000603507108"
       ];
     };
-
-    empty0 = {
-      uid = 1003;
-      isNormalUser = true;
-      description = "Testuser empty0";
-      group = "empty0";
-      extraGroups = [ "video" ];
-      hashedPassword = "$6$mlI7Au.EzmrL9uJj$vz8ujechSkx83tsFcRA8D04vh5.3ZwPlPmE.wsf2CTKvLio48a1eXtRxUHkkDfPlLAjqyJ55bSSw2lLazH9Ip/";
-    };
   };
 in
 {
   imports = [
-    ../../modules
     ./unfree.nix
     ./applications.nix
-    ./overlays.nix
   ];
 
   boot.loader.timeout = 2;
@@ -57,7 +46,6 @@ in
   users.mutableUsers = false;
   users.groups = {
     fhauser.gid = 1000;
-    empty0.gid = 1003;
   };
   users.users = users // {
     root.openssh.authorizedKeys.keys =
@@ -87,9 +75,6 @@ in
     '';
   };
 
-  system.autoUpgrade.enable = true;
-  system.autoUpgrade.allowReboot = false;
-
   # System Services
   services.btrfs.autoScrub.enable = true;
   services.fwupd.enable = true;
@@ -106,11 +91,6 @@ in
     settings.PasswordAuthentication = false;
   };
 
-  security.acme = {
-    acceptTerms = true;
-    defaults.email = "sysadmin@qo.is";
-  };
-
   # Default Settings
   environment.etc = {
     gitconfig.source = ./etc/gitconfig;
@@ -118,7 +98,10 @@ in
   };
 
   programs.autojump.enable = true;
-  programs.vim.defaultEditor = true;
+  programs.vim = {
+    enable = true;
+    defaultEditor = true;
+  };
 
   services.dbus.implementation = "broker";
 }

defaults/base/overlays.nix

@@ -1,13 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  options,
-  ...
-}:
-
-{
-  nixpkgs.overlays = [ (import ../../overlays) ];
-  #nix.nixPath = options.nix.nixPath.default
-  #  ++ [ "nixpkgs-overlays=/etc/nixos/overlays/_nix-path/" ];
-}

defaults/base/unfree.nix

@@ -20,11 +20,8 @@
       "google-chrome"
       "spotify"
       "spotify-unwrapped"
-      "skypeforlinux"
-      "slack"
       "discord"
       "teamviewer"
-      "unity-editor"
       "todoist-electron"
       "todoist-electron-8.10.1"
 

defaults/desktop/greeter.nix

@@ -6,7 +6,7 @@
 }:
 {
 
-  services.xserver.windowManager.i3.enable = true;
+  services.xserver.windowManager.i3.enable = false;
 
   services.displayManager = {
     defaultSession = "sway";

defaults/desktop/hardware.nix

@@ -10,7 +10,6 @@
   services.blueman.enable = true;
 
   # Enable sound.
-  sound.enable = true;
   nixpkgs.config.pulseaudio = true;
 
   services.pipewire = {

defaults/hardware/apu.nix

@@ -1,37 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
-
-{
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-
-  boot.loader.grub.extraConfig = "\n    serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1\n    terminal_input serial\n    terminal_output serial\n  ";
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "ahci"
-    "ehci_pci"
-    "usbhid"
-    "usb_storage"
-    "sd_mod"
-    "sdhci_pci"
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [
-    "kvm-amd"
-    "virtio"
-    "tun"
-  ];
-  boot.extraModulePackages = [ ];
-  boot.kernelParams = [ "console=ttyS0,115200n8" ];
-
-  # CPU Configuration
-  hardware.cpu.amd.updateMicrocode = true;
-  nix.settings.max-jobs = lib.mkDefault 4;
-}

defaults/hardware/thinkpad-p14s.nix

@@ -1,41 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  hardwareModules,
-  ...
-}:
-{
-
-  imports = with hardwareModules; [
-    (modulesPath + "/installer/scan/not-detected.nix")
-    lenovo-thinkpad-t14
-    common-cpu-intel
-    common-pc-ssd
-    common-pc-laptop
-  ];
-
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "ahci"
-    "nvme"
-    "usb_storage"
-    "usbhid"
-    "sd_mod"
-    "rtsx_pci_sdmmc"
-  ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.blacklistedKernelModules = [ "nouveau" ];
-
-  # Ignore Alcor smartcard (gpg is not very smart)
-  # See https://ludovicrousseau.blogspot.com/2015/12/remove-andor-customize-pcsc-reader-names.html
-  systemd.services.pcscd.environment.PCSCLITE_FILTER_IGNORE_READER_NAMES = "Alcor";
-
-  #hardware.video.hidpi.enable = true;
-
-  # CPU Configuration
-  hardware.cpu.intel.updateMicrocode = true;
-  services.throttled.enable = true;
-  powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
-}

home/fhauser/applications/sway.nix

@@ -24,7 +24,7 @@ rec {
     sway-contrib.grimshot
     wl-clipboard
     libappindicator
-    gnome.adwaita-icon-theme
+    adwaita-icon-theme
     gnome2.gnome-icon-theme
     hicolor-icon-theme # TODO: Move these requirements?
     fuzzel # Required for rofimoji

modules/default.nix

@@ -1,5 +0,0 @@
-{ config, pkgs, ... }:
-{
-
-  imports = [ ];
-}

overlays/_nix-path/overlays.nix

@@ -1,8 +0,0 @@
-self: super:
-with super.lib;
-let
-  # Load the system wide overlays
-  overlays = (import <nixpkgs/nixos> { }).config.nixpkgs.overlays;
-in
-# Apply all overlays to the input of the current "main" overlay
-foldl' (flip extends) (_: super) overlays self

overlays/default.nix

@@ -1,3 +0,0 @@
-self: super: {
-
-}