Skip to content

Commit

Permalink
packages moved configuration.nix -> system/packages.nix
Browse files Browse the repository at this point in the history
  • Loading branch information
JosiahABrown committed Aug 30, 2023
1 parent 87f0594 commit 727345d
Show file tree
Hide file tree
Showing 3 changed files with 96 additions and 128 deletions.
107 changes: 9 additions & 98 deletions configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
[ # Include the results of the hardware scan.
/etc/nixos/hardware-configuration.nix
/etc/nixos/system/networking.nix
/etc/nixos/system/packages.nix
<home-manager/nixos>
];

Expand Down Expand Up @@ -74,9 +75,6 @@
packages = with pkgs; [];
};
environment.shells = with pkgs; [ zsh ];

# Allow unfree packages
nixpkgs.config.allowUnfree = true;

# Window manager
programs.hyprland = {
Expand All @@ -100,7 +98,7 @@
};

# Enable sound with pipewire
sound.enable = true;
# sound.enable = true;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
Expand All @@ -112,77 +110,6 @@
# Enable Docker
virtualisation.docker.enable = true;

# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
bat
brave
busybox
cmake
dmidecode
dunst
docker
ffmpeg_6-full
gcc
git
go
gphoto2
grim
hyprland
imv
jq
killall
kitty
libnotify
meson
mpv
ncdu
neofetch
neovim
networkmanagerapplet
ninja
obsidian
pavucontrol
pipewire
playerctl
python311Full
ripgrep
rofi-wayland
scdoc
signal-desktop
slurp
spotify
stow
swww
v4l-utils
vimiv-qt
waybar
wayland-protocols
wayland-utils
webcord
wl-clipboard
wlroots
xdg-desktop-portal-gtk
xdg-desktop-portal-hyprland
xdg-utils
xwayland
];

# Fonts
fonts.fonts = with pkgs; [
# Nerd fonts
nerdfonts
meslo-lgs-nf
];

# 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;
# };

# Automatic Garbage Collection
nix.gc = {
automatic = true;
Expand All @@ -196,22 +123,6 @@
# Enable touchpad
services.xserver.libinput.enable = true;

# List of Programs that you want to enable:
# Neovim
programs.neovim = {
enable = true;
defaultEditor = true;
};

# zsh
programs.zsh.enable = true;

# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
# networking.firewall.enable = false;

# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave
Expand All @@ -220,11 +131,11 @@
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "23.05"; # Did you read the comment?

nixpkgs.overlays = [
(self: super: {
waybar = super.waybar.overrideAttrs (oldAttrs: {
mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
});
})
];
# nixpkgs.overlays = [
# (self: super: {
# waybar = super.waybar.overrideAttrs (oldAttrs: {
# mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
# });
# })
# ];
}
30 changes: 0 additions & 30 deletions modules/zsh.nix

This file was deleted.

87 changes: 87 additions & 0 deletions system/packages.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
{ config, pkgs, ... }:

{

programs = {
neovim = {
enable = true;
defaultEditor = true;
};
zsh = {
enable = true;
};
};
# Allow unfree packages
nixpkgs.config.allowUnfree = true;

# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
bat
brave
busybox
cmake
dmidecode
dunst
docker
ffmpeg_6-full
gcc
git
go
gphoto2
grim
hyprland
imv
jq
killall
kitty
libnotify
meson
mpv
ncdu
neofetch
neovim
networkmanagerapplet
ninja
obsidian
pavucontrol
pipewire
playerctl
python311Full
ripgrep
rofi-wayland
scdoc
signal-desktop
slurp
spotify
stow
swww
v4l-utils
vimiv-qt
waybar
wayland-protocols
wayland-utils
webcord
wl-clipboard
wlroots
xdg-desktop-portal-gtk
xdg-desktop-portal-hyprland
xdg-utils
xwayland
];

# Fonts
fonts.fonts = with pkgs; [
# Nerd fonts
nerdfonts
meslo-lgs-nf
];

nixpkgs.overlays = [
(self: super: {
waybar = super.waybar.overrideAttrs (oldAttrs: {
mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
});
})
];
}

0 comments on commit 727345d

Please sign in to comment.