diff --git a/defaults/base/applications.nix b/defaults/base/applications.nix index eaa72cb..17f06c9 100644 --- a/defaults/base/applications.nix +++ b/defaults/base/applications.nix @@ -49,7 +49,6 @@ unzip p7zip unrar - borgbackup iotop cabextract tree # p7zip diff --git a/defaults/base/default.nix b/defaults/base/default.nix index 2f5e659..023f459 100644 --- a/defaults/base/default.nix +++ b/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"; } diff --git a/defaults/base/overlays.nix b/defaults/base/overlays.nix deleted file mode 100644 index 4fc3ac7..0000000 --- a/defaults/base/overlays.nix +++ /dev/null @@ -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/" ]; -} diff --git a/defaults/base/unfree.nix b/defaults/base/unfree.nix index dca9bf7..d54926b 100644 --- a/defaults/base/unfree.nix +++ b/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" diff --git a/defaults/desktop/greeter.nix b/defaults/desktop/greeter.nix index 587d64f..f1b4697 100644 --- a/defaults/desktop/greeter.nix +++ b/defaults/desktop/greeter.nix @@ -6,7 +6,7 @@ }: { - services.xserver.windowManager.i3.enable = true; + services.xserver.windowManager.i3.enable = false; services.displayManager = { defaultSession = "sway"; diff --git a/defaults/desktop/hardware.nix b/defaults/desktop/hardware.nix index f13551f..450be65 100644 --- a/defaults/desktop/hardware.nix +++ b/defaults/desktop/hardware.nix @@ -10,7 +10,6 @@ services.blueman.enable = true; # Enable sound. - sound.enable = true; nixpkgs.config.pulseaudio = true; services.pipewire = { diff --git a/defaults/hardware/apu.nix b/defaults/hardware/apu.nix deleted file mode 100644 index d7a7c64..0000000 --- a/defaults/hardware/apu.nix +++ /dev/null @@ -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; -} diff --git a/defaults/hardware/thinkpad-p14s.nix b/defaults/hardware/thinkpad-p14s.nix deleted file mode 100644 index 7f134da..0000000 --- a/defaults/hardware/thinkpad-p14s.nix +++ /dev/null @@ -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"; -} diff --git a/home/fhauser/applications/sway.nix b/home/fhauser/applications/sway.nix index f7db6b0..ef2c721 100644 --- a/home/fhauser/applications/sway.nix +++ b/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 diff --git a/modules/default.nix b/modules/default.nix deleted file mode 100644 index c339f7d..0000000 --- a/modules/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ config, pkgs, ... }: -{ - - imports = [ ]; -} diff --git a/overlays/_nix-path/overlays.nix b/overlays/_nix-path/overlays.nix deleted file mode 100644 index 293a79c..0000000 --- a/overlays/_nix-path/overlays.nix +++ /dev/null @@ -1,8 +0,0 @@ -self: super: -with super.lib; -let - # Load the system wide overlays - overlays = (import { }).config.nixpkgs.overlays; -in -# Apply all overlays to the input of the current "main" overlay -foldl' (flip extends) (_: super) overlays self diff --git a/overlays/default.nix b/overlays/default.nix deleted file mode 100644 index 478c7b6..0000000 --- a/overlays/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -self: super: { - -}