Some refactoring work...
1 files changed, 108 insertions, 85 deletions
diff --git a/host/RoryNix/configuration.nix b/host/RoryNix/configuration.nix
index 97030a3..a5dbf3b 100644
--- a/host/RoryNix/configuration.nix
+++ b/host/RoryNix/configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
{
imports =
@@ -8,69 +8,79 @@
];
boot = {
- kernelPackages = pkgs.linuxPackages_latest;
- loader = {
- grub = {
- enable = true;
- version = 2;
- device = "/dev/sda"; # nodev for EFI only
-
- # EFI
- efiSupport = false;
- efiInstallAsRemovable = false;
- };
- };
- #readOnlyNixStore = false;
+ kernelPackages = pkgs.linuxPackages_latest;
+ loader = {
+ grub = {
+ enable = true;
+ device = "/dev/sda"; # nodev for EFI only
+ # EFI
+ efiSupport = false;
+ efiInstallAsRemovable = false;
+ };
+ };
+ #readOnlyNixStore = false;
};
networking = {
- hostName = "RoryNix";
- networkmanager.enable = true;
- wireless.enable = false;
-
- firewall = {
- enable = false;
- # allowedTCPPorts = [ ... ];
- # allowedUDPPorts = [ ... ];
- };
+ hostName = "RoryNix";
+ networkmanager.enable = true;
+ wireless.enable = false;
+ firewall = {
+ enable = false;
+ # allowedTCPPorts = [ ... ];
+ # allowedUDPPorts = [ ... ];
+ };
};
time.timeZone = "Europe/Brussels";
i18n.defaultLocale = "en_US.UTF-8";
services = {
- xserver = {
- enable = true;
- videoDrivers = [ "intel" ];
- desktopManager.gnome.enable = true;
- libinput.enable = true;
- layout = "us";
- modules = [ pkgs.xorg.xf86videointel ];
- };
- gnome = {
-
- core-developer-tools.enable = false;
- core-utilities.enable = false;
- tracker-miners.enable = false;
- tracker.enable = false;
- };
-
- printing.enable = false;
- openssh = {
- enable = true;
- extraConfig = ''
- MaxAuthTries 32
- '';
- #X11Forwarding = true;
- };
+ xserver = {
+ enable = true;
+ videoDrivers = [ "intel" ];
+ desktopManager.gnome.enable = true;
+ libinput.enable = true;
+ layout = "us";
+ modules = [ pkgs.xorg.xf86videointel ];
+ };
+ gnome = {
+ core-developer-tools.enable = false;
+ core-utilities.enable = false;
+ tracker-miners.enable = false;
+ tracker.enable = false;
+ sushi.enable = false;
+ rygel.enable = false;
+ gnome-user-share.enable = false;
+ gnome-remote-desktop.enable = false;
+ gnome-online-miners.enable = lib.mkForce false;
+ gnome-online-accounts.enable = false;
+ gnome-initial-setup.enable = false;
+ gnome-browser-connector.enable = false;
+ games.enable = false;
+ evolution-data-server.enable = lib.mkForce false;
+ at-spi2-core.enable = lib.mkForce false;
+ };
+ printing.enable = false;
+ openssh = {
+ enable = true;
+ extraConfig = ''
+ MaxAuthTries 32
+ '';
+ };
+ pipewire = {
+ enable = true;
+ audio.enable = true;
+ pulse.enable = true;
+ wireplumber.enable = true;
+ jack.enable = true;
+ alsa.enable = true;
+ };
};
- security.sudo.wheelNeedsPassword = false;
- nixpkgs.config.allowUnfree = true;
- nix.settings.experimental-features = [ "nix-command" "flakes" ];
sound.enable = true;
- hardware.pulseaudio.enable = true;
+ hardware.pulseaudio.enable = false;
users.users = {
Rory = {
@@ -92,24 +102,27 @@
neofetch
lnav
pciutils
- zsh
- gnome-console
- feh
git
- #lsd
- #steam
- #nerdfonts
- #element-web
- sshfs
- cinnamon.nemo
- firefox-bin
- #chromiumDev
+ lsd
+ duf
htop
+ btop
udisks
gparted
kitty.terminfo
glxinfo
+ jq
+ yq
+ pv
+ dig
+ cloud-utils
+ sshfs
+ cinnamon.nemo
+ firefox-bin
+
#epiphany
+ gnome-console
+ feh
# Various extensions...
# - Gnome
#gnomeExtensions.vitals
@@ -120,32 +133,31 @@
#gnomeExtensions.left-clock
# - Vim
vimPlugins.vim-nix
+ # - zsh
+ zsh
+ zsh-powerlevel10k
+ zsh-nix-shell
+ zsh-you-should-use
+ zsh-syntax-highlighting
+ zsh-completions
+
];
fonts.fonts = with pkgs; [
(nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
];
-# nixpkgs.overlays = [
-# (self: super: {
-# python3 = super.python3.override {
-# packageOverrides = python-self: python-super: {
-# markdown-it-py = python-super.markdown-it-py.overrideAttrs (oldAttrs: {
-# doInstallCheck = false;
-# });
-# };
-# };
-# haskellPackages = super.haskellPackages.override {
-# overrides = haskellPackages-self: haskellPackages-super: {
-# basement = haskellPackages-super.basement.overrideAttrs (oldAttrs: {
-# patches = [
-# ./patches/haskell/basement/IntWord64.patch
-# ];
-# });
-# };
-# };
-# }
-# )
-# ];
- security.polkit.enable = true;
+ nix = {
+ settings = {
+ experimental-features = [ "nix-command" "flakes" ];
+ auto-optimise-store = true;
+ };
+ };
+ nixpkgs = {
+ config.allowUnfree = true;
+ };
+ security = {
+ polkit.enable = true;
+ sudo.wheelNeedsPassword = false;
+ };
nix = {
distributedBuilds = true;
@@ -168,9 +180,20 @@
#ssh://Rory@192.168.0.3 x86_64-linux,i686-linux /home/Rory/.ssh/id_ed25519 12 1 - - -
#registry.nixpkgs.flake = pkgs;
nixPath = [ "nixpkgs=flake:nixpkgs" ];
+
+ settings.trusted-substituters = [
+ "https://nix-community.cachix.org"
+ "https://cache.garnix.io"
+ "https://numtide.cachix.org"
+ ];
+ settings.trusted-public-keys = [
+ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+ "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+ "numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE="
+ ];
+
};
system.stateVersion = "22.11"; # DO NOT EDIT!
-
}
|
