more sanely split things

This commit is contained in:
stitchy 2023-08-06 04:03:24 +00:00
parent 11c9608a9b
commit b25ad66439
7 changed files with 118 additions and 97 deletions

View file

@ -8,7 +8,8 @@
{ {
imports = imports =
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
./hardware-configuration.nix ./packages/default.nix
./hosts/lappy/default.nix
]; ];
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
@ -26,27 +27,6 @@
]; ];
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];
nix = {
package = pkgs.nixFlakes;
extraOptions = ''
experimental-features = nix-command flakes
'';
};
system.nixos.tags = [ "Nya_Beginnings" ];
networking.hostName = "stitchynyan"; # Define your hostname.
# Pick only one of the below networking options.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
# Set your time zone.
time.timeZone = "America/Lost_Angeles";
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Select internationalisation properties. # Select internationalisation properties.
# i18n.defaultLocale = "en_US.UTF-8"; # i18n.defaultLocale = "en_US.UTF-8";
@ -59,67 +39,12 @@
# Enable the X11 windowing system. # Enable the X11 windowing system.
services.xserver.enable = false; services.xserver.enable = false;
# Configure keymap in X11
# services.xserver.layout = "us";
# services.xserver.xkbOptions = "eurosign:e,caps:escape";
# Enable CUPS to print documents. # Enable CUPS to print documents.
services.printing.enable = true; services.printing.enable = true;
# Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true;
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
wget
librewolf
kitty
exa
hyprland
git
zoxide
nheko
gnupg
hyprpaper
xdg-desktop-portal-hyprland
dunst
pavucontrol
slurp
grim
wofi
brightnessctl
imv
qt5ct
qt6ct
neofetch
wl-clipboard
glib
dracula-theme
btop
swaylock-effects
vimPlugins.nvim-lspconfig
vimPlugins.nvim-cmp
vimPlugins.cmp-nvim-lsp
vimPlugins.luasnip
vimPlugins.cmp_luasnip
vimPlugins.tokyonight-nvim
];
fonts.packages= with pkgs; [
noto-fonts
noto-fonts-emoji
liberation_ttf
nerdfonts
];
programs.waybar.enable = true; programs.waybar.enable = true;
# Swaylock allow to unlock
security.pam.services.swaylock = {}; security.pam.services.swaylock = {};
security.rtkit.enable = true; security.rtkit.enable = true;
services.gnome.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
@ -191,12 +116,6 @@
# Or disable the firewall altogether. # Or disable the firewall altogether.
networking.firewall.enable = true; networking.firewall.enable = true;
# Copy the NixOS configuration file and link it from the resulting system
# (/run/current-system/configuration.nix). This is useful in case you
# accidentally delete configuration.nix.
# system.copySystemConfiguration = true;
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions # settings for stateful data, like file locations and database versions
# on your system were taken. It's perfectly fine and recommended to leave # on your system were taken. It's perfectly fine and recommended to leave

View file

@ -3,17 +3,32 @@
inputs = { inputs = {
nixpkgs = { nixpkgs = {
url = "github:NixOS/nixpkgs/nixos-unstable" url = "github:NixOS/nixpkgs/nixos-unstable";
};
}; };
outputs = { self, nixpkgs }: { home-manager-unstable = {
url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
hyprland.url = "github:hyprwm/Hyprland";
};
outputs = {
self,
nixpkgs,
home-manager-unstable,
hyprland
}: {
nixosConfigurations = { nixosConfigurations = {
stitchynyan = nixpkgs.lib.nixosSystem { stitchynyan = nixpkgs.lib.nixosSystem {
system = "x86_64-linux" system = "x86_64-linux";
modules = [ modules = [
./configuration.nix ./configuration.nix
home-manager-unstable.nixosModules.home-manager
hyprland.homeManagerModules.default
{wayland.windowManager.hyprland.enable = true;}
]; ];
}; };
}; };

9
hosts/default.nix Normal file
View file

@ -0,0 +1,9 @@
{config, pkg, home-manager, ...}:
{
}

22
hosts/lappy/default.nix Normal file
View file

@ -0,0 +1,22 @@
{ config, pkgs, ... }:
{
imports = [
./hardware-configuration.nix
];
system.nixos.tags = [ "Nya_Beginnings" ];
networking.hostName = "stitchynyan";
networking.networkmanager.enable = true;
time.timeZone = "America/Lost_Angeles";
}

View file

@ -1,6 +1,3 @@
# 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, ... }: { config, lib, pkgs, modulesPath, ... }:
{ {
@ -23,13 +20,6 @@
swapDevices = [ ]; swapDevices = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp166s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

15
packages/art.nix Normal file
View file

@ -0,0 +1,15 @@
{ pkgs }: {
environment.systemPackages = with pkgs; [
blender
krita
#armorpaint
gimp
inkscape
#prusa slicker
];
}

51
packages/default.nix Normal file
View file

@ -0,0 +1,51 @@
{pkgs}: {
import = [
./art.nix
./tools.nix
];
environment.systemPackages = with pkgs; [
wget
librewolf
kitty
exa
hyprland
git
zoxide
nheko
gnupg
hyprpaper
xdg-desktop-portal-hyprland
dunst
pavucontrol
slurp
grim
wofi
brightnessctl
imv
qt5ct
qt6ct
neofetch
wl-clipboard
glib
dracula-theme
btop
swaylock-effects
vimPlugins.nvim-lspconfig
vimPlugins.nvim-cmp
vimPlugins.cmp-nvim-lsp
vimPlugins.luasnip
vimPlugins.cmp_luasnip
vimPlugins.tokyonight-nvim
];
fonts.packages= with pkgs; [
noto-fonts
noto-fonts-emoji
liberation_ttf
nerdfonts
];
}