moved more out of common config

This commit is contained in:
Leyla Becker 2024-11-24 13:07:15 -06:00
parent aa7c2a2a15
commit fa3cb19c0b
7 changed files with 60 additions and 174 deletions

View file

@ -7,55 +7,7 @@
../common
];
nix = {
nixPath = ["nixpkgs=${inputs.nixpkgs}"];
};
services = {
# Enable CUPS to print documents.
printing.enable = true;
xserver = {
# Enable the X11 windowing system.
enable = true;
# Enable the GNOME Desktop Environment.
displayManager.gdm.enable = true;
desktopManager = {
gnome.enable = true;
xterm.enable = false;
};
# Get rid of xTerm
excludePackages = [pkgs.xterm];
# Configure keymap in X11
xkb = {
layout = "us,it,de";
variant = "";
};
};
pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
# If you want to use JACK applications, uncomment this
#jack.enable = true;
# use the example session manager (no others are packaged yet so this is enabled by default,
# no need to redefine it in your config for now)
#media-session.enable = true;
};
# tailscale = {
# enable = true;
# };
};
# Enable sound with pipewire.
hardware.pulseaudio.enable = false;
hardware.flipperzero.enable = true;
security.rtkit.enable = true;
@ -63,9 +15,6 @@
# helvetica font
aileron
# nix langauge server
nixd
cachefilesd
gnomeExtensions.dash-to-dock

View file

@ -58,6 +58,8 @@
};
};
keyboard.layout = "us,it,de";
# 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
@ -101,129 +103,6 @@
};
};
bash.enable = true;
# firefox = {
# enable = true;
# profiles.leyla = {
# settings = {
# "browser.search.defaultenginename" = "Searx";
# "browser.search.order.1" = "Searx";
# };
# search = {
# force = true;
# default = "Searx";
# engines = {
# "Nix Packages" = {
# urls = [{
# template = "https://search.nixos.org/packages";
# params = [
# { name = "type"; value = "packages"; }
# { name = "query"; value = "{searchTerms}"; }
# ];
# }];
# icon = "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
# definedAliases = [ "@np" ];
# };
# "NixOS Wiki" = {
# urls = [{ template = "https://nixos.wiki/index.php?search={searchTerms}"; }];
# iconUpdateURL = "https://nixos.wiki/favicon.png";
# updateInterval = 24 * 60 * 60 * 1000; # every day
# definedAliases = [ "@nw" ];
# };
# "Searx" = {
# urls = [{ template = "https://search.jan-leila.com/?q={searchTerms}"; }];
# iconUpdateURL = "https://nixos.wiki/favicon.png";
# updateInterval = 24 * 60 * 60 * 1000; # every day
# definedAliases = [ "@searx" ];
# };
# };
# };
# extentions = with pkgs.nur.repos.rycee.firefox-addons; [
# ublock-origin
# bitwarden
# ];
# bookmarks = [
# {
# name = "Media";
# url = "https://jellyfin.jan-leila.com/";
# keyword = "";
# tags = [""];
# }
# {
# name = "Drive";
# url = "https://drive.jan-leila.com/";
# keyword = "";
# tags = [""];
# }
# {
# name = "Git";
# url = "https://git.jan-leila.com/";
# keyword = "";
# tags = [""];
# }
# {
# name = "Home Automation";
# url = "https://home-assistant.jan-leila.com/";
# keyword = "";
# tags = [""];
# }
# {
# name = "Mail";
# url = "https://mail.protonmail.com";
# keyword = "";
# tags = [""];
# }
# {
# name = "Open Street Map";
# url = "https://www.openstreetmap.org/";
# keyword = "";
# tags = [""];
# }
# {
# name = "Password Manager";
# url = "https://vault.bitwarden.com/";
# keyword = "";
# tags = [""];
# }
# {
# name = "Mastodon";
# url = "https://tech.lgbt";
# keyword = "";
# tags = [""];
# }
# {
# name = "Linked In";
# url = "https://www.linkedin.com/";
# keyword = "";
# tags = [""];
# }
# {
# name = "Job Search";
# url = "https://www.jobsinnetwork.com/?state=cleaned_history&language%5B%5D=en&query=react&locations.countryCode%5B%5D=IT&locations.countryCode%5B%5D=DE&locations.countryCode%5B%5D=NL&experience%5B%5D=medior&experience%5B%5D=junior&page=1";
# keyword = "";
# tags = [""];
# }
# {
# name = "React Docs";
# url = "https://react.dev/";
# keyword = "";
# tags = [""];
# }
# # Template
# # {
# # name = "";
# # url = "";
# # keyword = "";
# # tags = [""];
# # }
# ];
# };
# }
};
dconf = {

View file

@ -10,6 +10,8 @@
../../modules/hardware.nix
../../modules/users.nix
../../modules/desktop.nix
../../modules/nix-development.nix
];
nixpkgs.config.allowUnfree = true;

View file

@ -5,6 +5,8 @@
../../enviroments/client
../../modules/hardware.nix
../../modules/users.nix
../../modules/desktop.nix
../../modules/nix-development.nix
];
nixpkgs.config.allowUnfree = true;

View file

@ -4,6 +4,8 @@
../../modules/hardware.nix
../../modules/users.nix
../../modules/desktop.nix
../../modules/nix-development.nix
];
nixpkgs.config.allowUnfree = true;

38
modules/desktop.nix Normal file
View file

@ -0,0 +1,38 @@
{pkgs, ...}: {
services = {
# Enable CUPS to print documents.
printing.enable = true;
xserver = {
# Enable the X11 windowing system.
enable = true;
# Enable the GNOME Desktop Environment.
displayManager.gdm.enable = true;
desktopManager = {
gnome.enable = true;
};
# Get rid of xTerm
desktopManager.xterm.enable = false;
excludePackages = [pkgs.xterm];
};
pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
# If you want to use JACK applications, uncomment this
#jack.enable = true;
# use the example session manager (no others are packaged yet so this is enabled by default,
# no need to redefine it in your config for now)
#media-session.enable = true;
};
};
# Enable sound with pipewire.
hardware.pulseaudio.enable = false;
}

View file

@ -0,0 +1,14 @@
{
inputs,
pkgs,
...
}: {
nix = {
nixPath = ["nixpkgs=${inputs.nixpkgs}"];
};
environment.systemPackages = with pkgs; [
# nix langauge server
nixd
];
}