Format all the files
parent
fb78d98640
commit
04dc77e8b9
|
@ -16,7 +16,6 @@
|
|||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
lib = nixpkgs.lib;
|
||||
|
||||
|
||||
user = "spagnologasper";
|
||||
hostName = "yoga";
|
||||
|
||||
|
@ -37,7 +36,7 @@
|
|||
};
|
||||
}
|
||||
];
|
||||
specialArgs = {inherit inputs user hostName; };
|
||||
specialArgs = { inherit inputs user hostName; };
|
||||
};
|
||||
|
||||
in {
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
../../modules/nvidia/default.nix
|
||||
];
|
||||
imports = [ ../../modules/nvidia/default.nix ];
|
||||
}
|
||||
|
|
|
@ -1,9 +1,7 @@
|
|||
{ config, lib, inputs, pkgs, ...}:
|
||||
{ config, lib, inputs, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
../../modules/default.nix
|
||||
];
|
||||
imports = [ ../../modules/default.nix ];
|
||||
config.modules = {
|
||||
dunst.enable = true;
|
||||
hyprland.enable = true;
|
||||
|
|
|
@ -1,3 +1 @@
|
|||
inputs: {
|
||||
mkSystem = import ./mkSystem.nix inputs;
|
||||
}
|
||||
inputs: { mkSystem = import ./mkSystem.nix inputs; }
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
{ self, ... } @ inputs: name: system: inputs.nixpkgs.lib.nixosSystem (
|
||||
{
|
||||
{ self, ... }@inputs:
|
||||
name: system:
|
||||
inputs.nixpkgs.lib.nixosSystem ({
|
||||
inherit system;
|
||||
specialArgs = { inherit inputs self; };
|
||||
modules = [
|
||||
|
@ -7,5 +8,4 @@
|
|||
"${self}/hosts/${name}/user.nix"
|
||||
inputs.home-manager.nixosModule
|
||||
];
|
||||
}
|
||||
)
|
||||
})
|
||||
|
|
|
@ -12,4 +12,4 @@ in {
|
|||
enableZshIntegration = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
@ -6,9 +6,7 @@ let cfg = config.modules.dunst;
|
|||
in {
|
||||
options.modules.dunst = { enable = mkEnableOption "dunst"; };
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
dunst
|
||||
];
|
||||
home.packages = with pkgs; [ dunst ];
|
||||
|
||||
services.dunst = {
|
||||
enable = true;
|
||||
|
@ -25,7 +23,9 @@ in {
|
|||
idle_threshold = 120;
|
||||
font = "FiraCode Nerdfont 12";
|
||||
line_height = 0;
|
||||
format = "<b>%s</b>\n%b";
|
||||
format = ''
|
||||
<b>%s</b>
|
||||
%b'';
|
||||
alignment = "center";
|
||||
icon_position = "off";
|
||||
startup_notification = "false";
|
||||
|
|
|
@ -4,11 +4,9 @@ with lib;
|
|||
let cfg = config.modules.fuzzel;
|
||||
|
||||
in {
|
||||
options.modules.fuzzel = {enable = mkEnableOption "fuzzel"; };
|
||||
options.modules.fuzzel = { enable = mkEnableOption "fuzzel"; };
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
fuzzel clipman networkmanager_dmenu
|
||||
];
|
||||
home.packages = with pkgs; [ fuzzel clipman networkmanager_dmenu ];
|
||||
home.file.".config/fuzzel/fuzzel.ini".source = ./fuzzel.ini;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
@ -7,7 +7,9 @@ in {
|
|||
options.modules.gtk = { enable = mkEnableOption "gtk"; };
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
dconf gtk-engine-murrine gnome.gnome-themes-extra
|
||||
dconf
|
||||
gtk-engine-murrine
|
||||
gnome.gnome-themes-extra
|
||||
];
|
||||
home.sessionVariables.GTK_THEME = "Catppuccin-Macchiato-Compact-Mauve-Dark";
|
||||
gtk = {
|
||||
|
|
|
@ -7,12 +7,19 @@ in {
|
|||
options.modules.hyprland = { enable = mkEnableOption "hyprland"; };
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
hyprpaper hyprland wl-clipboard hyprland-protocols wlogout swayidle
|
||||
hyprpaper
|
||||
hyprland
|
||||
wl-clipboard
|
||||
hyprland-protocols
|
||||
wlogout
|
||||
swayidle
|
||||
];
|
||||
|
||||
home.file.".config/hypr/hyprland.conf".source = ./hyprland.conf;
|
||||
home.file.".config/hypr/hyprpaper.conf".source = ./hyprpaper.conf;
|
||||
home.file.".config/hypr/wallpaper.png".source = ../../pictures/wallpaper.png;
|
||||
home.file.".config/hypr/lock-wallpaper.png".source = ../../pictures/lock-wallpaper.png;
|
||||
home.file.".config/hypr/wallpaper.png".source =
|
||||
../../pictures/wallpaper.png;
|
||||
home.file.".config/hypr/lock-wallpaper.png".source =
|
||||
../../pictures/lock-wallpaper.png;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -6,9 +6,7 @@ let cfg = config.modules.kanshi;
|
|||
in {
|
||||
options.modules.kanshi = { enable = mkEnableOption "kanshi"; };
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
kanshi
|
||||
];
|
||||
home.packages = with pkgs; [ kanshi ];
|
||||
|
||||
services.kanshi = {
|
||||
enable = true;
|
||||
|
@ -137,7 +135,5 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
|
||||
|
||||
};
|
||||
}
|
||||
|
|
|
@ -6,10 +6,8 @@ let cfg = config.modules.kitty;
|
|||
in {
|
||||
options.modules.kitty = { enable = mkEnableOption "kitty"; };
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
kitty
|
||||
];
|
||||
home.packages = with pkgs; [ kitty ];
|
||||
|
||||
home.file.".config/kitty/kitty.conf".source = ./kitty.conf;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,9 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
{ config, pkgs, lib, ... }: {
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
vulkan-loader
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
# Remove unecessary preinstalled packages
|
||||
# Remove unecessary preinstalled packages
|
||||
environment.defaultPackages = [ ];
|
||||
|
||||
environment.sessionVariables = { GTK_USE_PORTAL = "1"; };
|
||||
|
@ -17,7 +17,7 @@
|
|||
|
||||
environment.etc.openvpn.source = "${pkgs.update-resolv-conf}/libexec/openvpn";
|
||||
|
||||
# Laptop-specific packages (the other ones are installed in `packages.nix`)
|
||||
# Laptop-specific packages (the other ones are installed in `packages.nix`)
|
||||
environment.systemPackages = with pkgs; [
|
||||
acpi
|
||||
tlp
|
||||
|
@ -32,14 +32,15 @@
|
|||
enable = true;
|
||||
settings = {
|
||||
default_session = {
|
||||
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --greeting 'Welcome to NixOS!' --cmd Hyprland";
|
||||
command =
|
||||
"${pkgs.greetd.tuigreet}/bin/tuigreet --time --greeting 'Welcome to NixOS!' --cmd Hyprland";
|
||||
user = "${user}";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
services.openssh.enable = true;
|
||||
systemd.services.sshd.wantedBy = lib.mkForce [];
|
||||
systemd.services.sshd.wantedBy = lib.mkForce [ ];
|
||||
|
||||
programs.ssh.startAgent = true;
|
||||
|
||||
|
@ -58,17 +59,14 @@
|
|||
roboto
|
||||
openmoji-color
|
||||
(nerdfonts.override { fonts = [ "FiraCode" ]; })
|
||||
(nerdfonts.override { fonts = [ "FantasqueSansMono" ];})
|
||||
(nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
|
||||
];
|
||||
|
||||
fontconfig = {
|
||||
hinting.autohint = true;
|
||||
defaultFonts = {
|
||||
emoji = [ "OpenMoji Color" ];
|
||||
defaultFonts = { emoji = [ "OpenMoji Color" ]; };
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
xdg = {
|
||||
icons.enable = true;
|
||||
|
@ -83,7 +81,6 @@
|
|||
|
||||
xdg.portal.config.common.default = "*";
|
||||
|
||||
|
||||
programs.dconf.enable = true;
|
||||
services.dbus.packages = with pkgs; [ dconf ];
|
||||
services.dbus.enable = true;
|
||||
|
@ -93,10 +90,10 @@
|
|||
package = lib.mkForce pkgs.gnome3.gvfs;
|
||||
};
|
||||
|
||||
# Firmware Updater
|
||||
# Firmware Updater
|
||||
services.fwupd.enable = true;
|
||||
|
||||
# Nix settings, auto cleanup and enable flakes
|
||||
# Nix settings, auto cleanup and enable flakes
|
||||
nix = {
|
||||
settings.auto-optimise-store = true;
|
||||
settings.allowed-users = [ "${user}" ];
|
||||
|
@ -112,7 +109,7 @@
|
|||
'';
|
||||
};
|
||||
|
||||
# Boot settings: clean /tmp/, latest kernel and enable bootloader
|
||||
# Boot settings: clean /tmp/, latest kernel and enable bootloader
|
||||
boot = {
|
||||
tmp.cleanOnBoot = true;
|
||||
loader = {
|
||||
|
@ -123,7 +120,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
# Set up locales (timezone and keyboard layout)
|
||||
# Set up locales (timezone and keyboard layout)
|
||||
time.timeZone = "Europe/Ljubljana";
|
||||
i18n.defaultLocale = "en_US.UTF-8";
|
||||
console = {
|
||||
|
@ -131,25 +128,25 @@
|
|||
keyMap = "en";
|
||||
};
|
||||
|
||||
# Set up user and enable sudo
|
||||
# Set up user and enable sudo
|
||||
users.users.${user} = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "input" "wheel" "networkmanager" "libvirtd" "wireshark" ];
|
||||
initialHashedPassword = "$6$wqCHereET3WM6UIA$XeJIgGkmO2/zAkktN2JCx5hLNS3kSj6seVQBdSWoMeJ5MOrIha6B/HiDjHI4oKDKYhYVwjgQFqGpncU6OI7Ud/"; # password: d3fault
|
||||
initialHashedPassword =
|
||||
"$6$wqCHereET3WM6UIA$XeJIgGkmO2/zAkktN2JCx5hLNS3kSj6seVQBdSWoMeJ5MOrIha6B/HiDjHI4oKDKYhYVwjgQFqGpncU6OI7Ud/"; # password: d3fault
|
||||
shell = pkgs.zsh;
|
||||
};
|
||||
|
||||
# Set up networking and secure it
|
||||
# Set up networking and secure it
|
||||
networking = {
|
||||
networkmanager.enable = true;
|
||||
hostName = "${hostName}";
|
||||
firewall.enable = false; # This one is necessary to expose ports to the netwok. Usefull for smbserver, responder, http.server, ...
|
||||
extraHosts =
|
||||
''
|
||||
''; # For adding hosts.
|
||||
firewall.enable =
|
||||
false; # This one is necessary to expose ports to the netwok. Usefull for smbserver, responder, http.server, ...
|
||||
extraHosts = ""; # For adding hosts.
|
||||
};
|
||||
|
||||
# Set environment variables
|
||||
# Set environment variables
|
||||
environment.variables = {
|
||||
NIXOS_CONFIG_DIR = "$HOME/.config/nixos/";
|
||||
NIXPKGS_ALLOW_INSECURE = "1";
|
||||
|
@ -167,15 +164,16 @@
|
|||
};
|
||||
|
||||
environment.localBinInPath = true;
|
||||
# Security
|
||||
# Security
|
||||
security = {
|
||||
sudo.enable = true;
|
||||
# Extra security
|
||||
# Extra security
|
||||
protectKernelImage = true;
|
||||
pam.services.gtklock.text = lib.readFile "${pkgs.gtklock}/etc/pam.d/gtklock";
|
||||
pam.services.gtklock.text =
|
||||
lib.readFile "${pkgs.gtklock}/etc/pam.d/gtklock";
|
||||
};
|
||||
|
||||
# Sound (PipeWire)
|
||||
# Sound (PipeWire)
|
||||
sound.enable = true;
|
||||
hardware.pulseaudio.enable = false;
|
||||
security.rtkit.enable = true;
|
||||
|
@ -194,7 +192,8 @@
|
|||
};
|
||||
};
|
||||
|
||||
virtualisation.waydroid.enable = true; # For mobile app pentesting TODO: Move to module.
|
||||
virtualisation.waydroid.enable =
|
||||
true; # For mobile app pentesting TODO: Move to module.
|
||||
programs.adb.enable = true;
|
||||
|
||||
services.blueman.enable = true;
|
||||
|
|
|
@ -6,13 +6,7 @@ let cfg = config.modules.zsh;
|
|||
in {
|
||||
options.modules.zsh = { enable = mkEnableOption "zsh"; };
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
zsh
|
||||
fzf
|
||||
lsd
|
||||
grc
|
||||
eza
|
||||
];
|
||||
home.packages = with pkgs; [ zsh fzf lsd grc eza ];
|
||||
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
|
|
Loading…
Reference in New Issue