Compare commits

..

No commits in common. "092579af9878e0b7d31a3ae4979203537cafccaa" and "412ce8623a783095943bb73ea81c7542c6fe469f" have entirely different histories.

56 changed files with 218 additions and 439 deletions

View File

@ -18,14 +18,7 @@
nvf.url = "github:notashelf/nvf";
};
outputs =
{
self,
nixpkgs,
nix-flatpak,
nvf,
...
}@inputs:
outputs = { self, nixpkgs, nix-flatpak, nvf, ... } @ inputs:
let
system = "x86_64-linux";
overlays = builtins.attrValues (import ./overlays);

View File

@ -1,12 +1,8 @@
{
inputs,
pkgs,
overlays,
...
}:
{ inputs, pkgs, overlays, ... }:
{
imports = [
imports =
[
inputs.home-manager.nixosModules.home-manager
../../modules/nix/default.nix
];
@ -16,10 +12,7 @@
users.users.smayzy = {
isNormalUser = true;
description = "smayzy";
extraGroups = [
"networkmanager"
"wheel"
];
extraGroups = [ "networkmanager" "wheel" ];
};
environment.systemPackages = with pkgs; [

View File

@ -1,7 +1,8 @@
{ pkgs, ... }:
{
imports = [
imports =
[
../../modules/home-manager/default.nix
];
@ -40,8 +41,8 @@
dconf.settings = {
"org/virt-manager/virt-manager/connections" = {
autoconnect = [ "qemu:///system" ];
uris = [ "qemu:///system" ];
autoconnect = ["qemu:///system"];
uris = ["qemu:///system"];
};
};

View File

@ -1,7 +1,8 @@
{ inputs, config, ... }:
{
imports = [
imports =
[
../common/common.nix
./hardware-configuration.nix
];

View File

@ -1,40 +1,24 @@
{
config,
lib,
pkgs,
modulesPath,
...
}:
{ config, lib, pkgs, modulesPath, ... }:
{
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [
"xhci_pci"
"ahci"
"nvme"
"usb_storage"
"usbhid"
"sd_mod"
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" = {
device = "/dev/disk/by-uuid/976bcf9c-3b56-4aa6-98f8-1c899af2b0f8";
fileSystems."/" =
{ device = "/dev/disk/by-uuid/976bcf9c-3b56-4aa6-98f8-1c899af2b0f8";
fsType = "ext4";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/8E7F-2417";
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/8E7F-2417";
fsType = "vfat";
options = [
"fmask=0077"
"dmask=0077"
];
options = [ "fmask=0077" "dmask=0077" ];
};
swapDevices = [ ];

View File

@ -1,7 +1,8 @@
{ ... }:
{
imports = [
imports =
[
../common/home.nix
];
}

View File

@ -1,7 +1,8 @@
{ inputs, config, ... }:
{
imports = [
imports =
[
../common/common.nix
./hardware-configuration.nix
];

View File

@ -1,45 +1,31 @@
# 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, ... }:
{
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [
"xhci_pci"
"nvme"
"usb_storage"
"sd_mod"
];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" = {
device = "/dev/disk/by-uuid/fa4f1a61-338b-4f1e-9f6c-2b2f2cd12f38";
fileSystems."/" =
{ device = "/dev/disk/by-uuid/fa4f1a61-338b-4f1e-9f6c-2b2f2cd12f38";
fsType = "ext4";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/8E15-A6E3";
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/8E15-A6E3";
fsType = "vfat";
options = [
"fmask=0077"
"dmask=0077"
];
options = [ "fmask=0077" "dmask=0077" ];
};
swapDevices = [
{ device = "/dev/disk/by-uuid/b451db56-e0a5-4799-88a1-34a31ffe3b08"; }
swapDevices =
[ { device = "/dev/disk/by-uuid/b451db56-e0a5-4799-88a1-34a31ffe3b08"; }
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking

View File

@ -1,7 +1,8 @@
{ ... }:
{
imports = [
imports =
[
../common/home.nix
];
}

View File

@ -1,9 +1,4 @@
{
pkgs,
lib,
config,
...
}:
{ pkgs, lib, config, ... }:
let
inherit (lib) mkIf mkOption types;
in
@ -14,6 +9,7 @@ in
description = "set to true if you want to use a nvidia GC";
};
config = mkIf config.smayzy.lf.enable {
xdg.configFile."lf/icons".source = ./icons;
@ -62,7 +58,8 @@ in
extraConfig =
let
previewer = pkgs.writeShellScriptBin "pv.sh" ''
previewer =
pkgs.writeShellScriptBin "pv.sh" ''
file=$1
w=$2
h=$3

View File

@ -1,9 +1,4 @@
{
lib,
pkgs,
config,
...
}:
{ lib, pkgs, config, ... }:
let
browser = lib.getExe pkgs.firefox;
inherit (lib) mkIf mkOption types;

View File

@ -1,10 +1,4 @@
{
lib,
config,
pkgs,
smayzy,
...
}:
{ lib, config, pkgs, smayzy, ... }:
let
mkIf = lib.mkIf;
in
@ -75,3 +69,4 @@ in
};
}

View File

@ -1,9 +1,4 @@
{
config,
lib,
pkgs,
...
}:
{ config, lib, pkgs, ...}:
let
inherit (lib) mkIf mkOption types;
in

View File

@ -1,4 +1,4 @@
{ config, lib, ... }:
{ config, lib, ...}:
let
inherit (lib) mkIf mkOption types;
in
@ -12,7 +12,7 @@ in
config = mkIf config.smayzy.nh.enable {
programs.nh = {
enable = true;
clean = {
clean= {
enable = true;
extraArgs = "--keep 10";
dates = "hourly";

View File

@ -1,9 +1,4 @@
{
config,
lib,
pkgs,
...
}:
{ config, lib, pkgs, ... }:
let
inherit (lib) mkIf mkOption types;
in

View File

@ -1,9 +1,4 @@
{
config,
lib,
pkgs,
...
}:
{ config, lib, pkgs, ...}:
let
inherit (lib) mkIf mkOption types;
in
@ -26,7 +21,6 @@ in
fastfetch
lf
tshark
nixfmt
];
};
}

View File

@ -1,9 +1,4 @@
{
lib,
config,
pkgs,
...
}:
{ lib, config, pkgs, ... }:
let
inherit (lib) mkIf mkOption types;
in

View File

@ -1,9 +1,4 @@
{
lib,
config,
pkgs,
...
}:
{ lib, config, pkgs, ... }:
let
inherit (lib) mkIf mkOption types;
in

View File

@ -1,9 +1,4 @@
{
lib,
config,
pkgs,
...
}:
{ lib, config, pkgs, ... }:
let
inherit (lib) mkIf mkOption types;
in

View File

@ -1,9 +1,4 @@
{
lib,
config,
pkgs,
...
}:
{ lib, config, pkgs, ... }:
let
inherit (lib) mkIf mkOption types;
in

View File

@ -1,9 +1,4 @@
{
lib,
config,
pkgs,
...
}:
{ lib, config, pkgs, ... }:
let
inherit (lib) mkIf mkOption types;
in

View File

@ -1,9 +1,4 @@
{
lib,
config,
pkgs,
...
}:
{ lib, config, pkgs, ... }:
let
inherit (lib) mkIf mkOption types;
in

View File

@ -1,9 +1,4 @@
{
lib,
config,
pkgs,
...
}:
{ lib, config, pkgs, ... }:
let
inherit (lib) mkIf mkOption types;
in

View File

@ -28,9 +28,7 @@
i18n.defaultLocale = "en_US.UTF-8";
time.timeZone = "Europe/Paris";
nixpkgs.config.allowUnfreePredicate =
pkg:
builtins.elem (lib.getName pkg) [
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"steam"
"steam-original"
"steam-unwrapped"
@ -45,10 +43,7 @@
};
console.keyMap = "fr";
nix.settings.experimental-features = [
"nix-command"
"flakes"
];
nix.settings.experimental-features = [ "nix-command" "flakes" ];
networking.networkmanager.enable = true;
}

View File

@ -1,9 +1,4 @@
{
lib,
config,
pkgs,
...
}:
{ lib, config, pkgs, ... }:
let
inherit (lib) mkIf mkOption types;
in

View File

@ -21,10 +21,10 @@ let
];
flatpaks =
(if config.smayzy.flatpak.gaming.enable then gaming else [ ])
++ (if config.smayzy.flatpak.dev.enable then dev else [ ])
++ (if config.smayzy.flatpak.utils.enable then utils else [ ])
++ (if config.smayzy.flatpak.media.enable then media else [ ]);
(if config.smayzy.flatpak.gaming.enable then gaming else [])
++ (if config.smayzy.flatpak.dev.enable then dev else [])
++ (if config.smayzy.flatpak.utils.enable then utils else [])
++ (if config.smayzy.flatpak.media.enable then media else []);
in
{
options.smayzy.flatpak = mkOption {

View File

@ -1,9 +1,4 @@
{
lib,
config,
pkgs,
...
}:
{ lib, config, pkgs, ... }:
let
inherit (lib) mkIf mkOption types;
in

View File

@ -1,9 +1,4 @@
{
lib,
config,
pkgs,
...
}:
{ lib, config, pkgs, ... }:
let
inherit (lib) mkIf mkOption types;
in

View File

@ -20,7 +20,7 @@ in
floorp.enable = true;
stylix.enable = true;
audio.enable = true;
office.enable = true;
office.enable= true;
webcord.enable = true;
element.enable = true;
sddm.enable = true;

View File

@ -1,6 +1,6 @@
{ config, lib, ... }:
with lib;
with lib;
{
options.smayzy.grub-on-lap.enable = mkOption {

View File

@ -1,15 +1,7 @@
{ config, lib, ... }:
let
inherit (lib)
mkIf
mkOption
types
mkMerge
;
validOptions = [
"desktop"
"laptop"
];
inherit (lib) mkIf mkOption types mkMerge;
validOptions = [ "desktop" "laptop" ];
in
{
options.smayzy.power = mkOption {

View File

@ -1,9 +1,4 @@
{
lib,
config,
pkgs,
...
}:
{ lib, config, pkgs, ... }:
let
inherit (lib) mkIf mkOption types;
in

View File

@ -1,9 +1,4 @@
{
lib,
config,
pkgs,
...
}:
{ lib, config, pkgs, ... }:
let
inherit (lib) mkIf mkOption types;
in

View File

@ -1,9 +1,4 @@
{
lib,
config,
pkgs,
...
}:
{ lib, config, pkgs, ... }:
let
inherit (lib) mkIf mkOption types;
in

View File

@ -1,9 +1,4 @@
{
lib,
config,
pkgs,
...
}:
{ lib, config, pkgs, ... }:
let
inherit (lib) mkIf mkOption types;
in

View File

@ -1,9 +1,4 @@
{
lib,
config,
pkgs,
...
}:
{ lib, config, pkgs, ... }:
let
inherit (lib) mkIf mkOption types;
in

View File

@ -1,9 +1,4 @@
{
lib,
config,
pkgs,
...
}:
{ lib, config, pkgs, ... }:
let
inherit (lib) mkIf mkOption types;
in

View File

@ -1,9 +1,4 @@
{
lib,
config,
pkgs,
...
}:
{ lib, config, pkgs, ... }:
let
inherit (lib) mkIf mkOption types;
in

View File

@ -1,9 +1,4 @@
{
lib,
config,
pkgs,
...
}:
{ lib, config, pkgs, ... }:
let
inherit (lib) mkIf mkOption types;
in

View File

@ -1,9 +1,4 @@
{
lib,
config,
pkgs,
...
}:
{ lib, config, pkgs, ... }:
let
inherit (lib) mkIf mkOption types;
in

View File

@ -1,9 +1,4 @@
{
lib,
config,
pkgs,
...
}:
{ lib, config, pkgs, ... }:
let
inherit (lib) mkIf mkOption types;
in

View File

@ -1,9 +1,4 @@
{
config,
lib,
pkgs,
...
}:
{ config, lib, pkgs, ... }:
let
inherit (lib) mkIf mkOption types;
in

View File

@ -1,9 +1,4 @@
{
lib,
config,
pkgs,
...
}:
{ lib, config, pkgs, ... }:
let
inherit (lib) mkIf mkOption types;
in

View File

@ -1,9 +1,4 @@
{
lib,
config,
pkgs,
...
}:
{ lib, config, pkgs, ... }:
let
inherit (lib) mkIf mkOption types;
in

View File

@ -1,9 +1,4 @@
{
config,
lib,
pkgs,
...
}:
{ config, lib, pkgs, ... }:
let
inherit (lib) mkIf mkOption types;
in
@ -16,7 +11,7 @@ in
config = mkIf config.smayzy.virt.enable {
programs.virt-manager.enable = true;
users.groups.libvirtd.members = [ "smayzy" ];
users.groups.libvirtd.members = ["smayzy"];
virtualisation.libvirtd.enable = true;
virtualisation.libvirtd.qemu.runAsRoot = false;
virtualisation.libvirtd.qemu.ovmf.enable = true;

View File

@ -1,9 +1,4 @@
{
lib,
config,
pkgs,
...
}:
{ lib, config, pkgs, ... }:
let
inherit (lib) mkIf mkOption types;
in

View File

@ -1,9 +1,4 @@
{
lib,
config,
pkgs,
...
}:
{ lib, config, pkgs, ... }:
let
inherit (lib) mkIf mkOption types;
in

View File

@ -1,9 +1,4 @@
{
lib,
config,
pkgs,
...
}:
{ lib, config, pkgs, ... }:
let
inherit (lib) mkIf mkOption types;
in

View File

@ -1,9 +1,4 @@
{
lib,
config,
pkgs,
...
}:
{ lib, config, pkgs, ... }:
let
inherit (lib) mkIf mkOption types;
in