diff --git a/oscar/configuration.nix b/oscar/configuration.nix index fc035c8..47b7d01 100644 --- a/oscar/configuration.nix +++ b/oscar/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, lib, ... }: +{ config, pkgs, ... }: { imports = @@ -12,14 +12,6 @@ ]; - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "factorio-alpha" - "steam" - "steam-original" - "steam-run" - "discord" - ]; - # https://discourse.nixos.org/t/github-strategies-for-configuration-nix/1983/14 nix.nixPath = [ "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos" @@ -31,16 +23,6 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - boot.plymouth.enable = true; - boot.plymouth.theme = "breeze"; - - boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; - boot.binfmt.registrations.aarch64-linux = { - interpreter = "${pkgs.pkgsStatic.qemu-user.override { hostCpuTargets = ["aarch64-linux-user"]; }}/bin/qemu-aarch64"; - wrapInterpreterInShell = false; - fixBinary = true; - }; - boot.initrd.luks.devices."luks-ca2fdf0b-d385-498c-9f7d-f58368a65fd4".device = "/dev/disk/by-uuid/ca2fdf0b-d385-498c-9f7d-f58368a65fd4"; networking.hostName = "oscar"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. @@ -86,8 +68,6 @@ # Enable CUPS to print documents. services.printing.enable = true; - services.atd.enable = true; - services.hardware.bolt.enable = true; virtualisation.docker.enable = true; @@ -95,6 +75,7 @@ hardware.bluetooth.enable = true; # Enable sound with pipewire. + sound.enable = true; hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { @@ -113,14 +94,13 @@ # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; - environment.sessionVariables.NIXOS_OZONE_WL = "1"; - # Define a user account. Don't forget to set a password with ‘passwd’. users.users.chandler.isNormalUser = true; users.users.chandler.description = "Chandler Swift"; - users.users.chandler.extraGroups = [ "networkmanager" "wheel" "dialout" "cdrom" ]; + users.users.chandler.extraGroups = [ "networkmanager" "wheel" "dialout" ]; home-manager.users.chandler = { pkgs, ... }: { home.packages = with pkgs; [ + firefox kate prismlauncher libreoffice-qt @@ -157,8 +137,6 @@ url."ssh://aur@aur.archlinux.org/".pushInsteadOf = "aur:"; url."ssh://git@github.com/ChandlerSwift/".insteadOf = "gh:"; push.autoSetupRemote = true; - rebase.autosquash = true; - fetch.parallel = 0; # "some reasonable default" }; ignores = [ "*.kate-swp" @@ -174,18 +152,6 @@ signing.key = null; # "let GnuPG decide what signing key to use depending on commit's author" }; - programs.firefox = { - enable = true; -# profiles = { -# default = { -# id = 0; -# name = "default"; -# isDefault = true; -# search.default = "DuckDuckGo"; -# }; -# }; - }; - home.stateVersion = "23.11"; }; @@ -194,8 +160,6 @@ 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 - discord - factorio ]; # Some programs need SUID wrappers, can be configured further or are @@ -208,8 +172,6 @@ programs.ssh.startAgent = true; - programs.steam.enable = true; - # List services that you want to enable: services.fprintd.enable = true;