From 2e45d2d61f6f9fd97424e6043c9ea34bfadec70d Mon Sep 17 00:00:00 2001 From: Nate Anderson Date: Fri, 15 Dec 2023 11:43:28 -0700 Subject: [PATCH] Added allowUnfree --- modules/home-manager/home.nix | 5 +++- nixos/sway_configuration.nix | 48 ++++++++++++++--------------------- 2 files changed, 23 insertions(+), 30 deletions(-) diff --git a/modules/home-manager/home.nix b/modules/home-manager/home.nix index 17b50b1..198bbe1 100644 --- a/modules/home-manager/home.nix +++ b/modules/home-manager/home.nix @@ -4,7 +4,7 @@ # manage. # - nixpkgs.config.allowUnfree = true; + # nixpkgs.config.allowUnfree = true; # inputs.nixpkgs-stable.config.allowUnfree = true; home.username = userName; @@ -27,6 +27,7 @@ htop kakoune keepassxc + libnotify mako networkmanagerapplet obs-studio @@ -68,6 +69,7 @@ # ''; }; + # Home Manager can also manage your environment variables through # 'home.sessionVariables'. If you don't want to manage your shell through Home # Manager then you have to manually source 'hm-session-vars.sh' located at @@ -94,6 +96,7 @@ }; }; + # kdeconnect setup services.kdeconnect = { enable = true; diff --git a/nixos/sway_configuration.nix b/nixos/sway_configuration.nix index 8fdb79b..d71fb83 100644 --- a/nixos/sway_configuration.nix +++ b/nixos/sway_configuration.nix @@ -15,7 +15,9 @@ nix.settings.experimental-features = [ "nix-command" "flakes" ]; - + + nixpkgs.config.allowUnfree = true; + # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -52,21 +54,13 @@ # Enable CUPS to print documents. # services.printing.enable = true; - # Enable sound. sound.enable = true; # hardware.pulseaudio.enable = true; # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; - # Define a user account. Don't forget to set a password with ‘passwd’. - # users.users.userName = { - # initialPassword = "password"; - # extraGroups = [ "wheel" ]; - # isNormalUser = true; - # }; - - # enable polkit for sway + # enable polkit for sway in home-manager security.polkit.enable = true; hardware.opengl = { @@ -77,19 +71,15 @@ # Setup xdg portal for screen share xdg.portal = { extraPortals = with pkgs; [ - xdg-desktop-portal-wlr - xdg-desktop-portal-kde + # xdg-desktop-portal-wlr + # xdg-desktop-portal-kde xdg-desktop-portal-gtk ]; wlr.enable = true; + enable = true; }; xdg.sounds.enable = true; - # Sets up programs in /etc/profile instead of ~/.profile - # home-manager.useUserPackages = true; - # Uses system nixpkgs instead of private, adds consistency and removes NIX_PATH dependency - # home-manager.useGlobalPkgs = true; - main_user = { enable = true; userName = userName; @@ -97,32 +87,33 @@ }; programs.zsh.enable = true; + # Corectrl from stable branch # inputs.nixpkgs-stable.lib.nixosSystem.programs.corectrl.enable = true; - # programs.corectrl.enable = true; - # List packages installed in system profile. To search, run: - # $ nix search wget environment.systemPackages = with pkgs; [ git + glib # gsettings + grim + pavucontrol + slurp + swaylock + swayidle wget + wl-clipboard + xdg-utils zsh ]; - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # }; - # Services + services.flatpak.enable = true; services.openssh.enable = true; services.dbus.enable = true; services.pipewire = { enable = true; + alsa.enable = true; + pulse.enable = true; }; # Firewall @@ -158,6 +149,5 @@ # # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . system.stateVersion = "23.11"; # Did you read the comment? - }