marty/config.nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hoe manager

Browse source
This commit is contained in:
martyTF 2025-12-17 15:51:20 +01:00
parent bfbc64b611
commit f266f8a8ee
14 changed files with 154 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored Normal file
View file

@ -0,0 +1 @@
hardware-configuration.nix

1
configuration.nix
View file

@ -16,7 +16,6 @@
];
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
./imports.nix
];
# This value determines the NixOS release from which the default

14
flake.nix
View file

@ -1,5 +1,5 @@
{
description = "MartyTF's NixOS flake";
description = "MartyTF's NixOS Configuration";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
@ -8,7 +8,7 @@
};
outputs =
{
inputs@{
self,
nixpkgs,
home-manager,
@ -24,24 +24,24 @@
modules = [
./marty-pc.nix
./configuration.nix
./user/marty.nix
home-manager.nixosModules.default
];
};
marty-server = nixpkgs.lib.nixosSystem {
system = "x86_64";
system = "x86_64-linux";
modules = [
./marty-server.nix
./configuration.nix
./user/marty.nix
home-manager.nixosModules.default
];
};
marty-latitude = nixpkgs.lib.nixosSystem {
system = "x86_64";
system = "x86_64-linux";
modules = [
./marty-latitude.nix
./configuration.nix
./user/marty.nix
home-manager.nixosModules.default
];
};

1
imports.nix
View file

@ -2,6 +2,7 @@
config,
lib,
pkgs,
inputs,
...
}:

52
marty-latitude.nix
View file

@ -3,6 +3,7 @@
lib,
pkgs,
modulesPath,
home-manager,
...
}:
@ -11,30 +12,47 @@
hostName = "marty-latitude";
};
# PREVIOUSLY HARDWARE-CONFIGURATION.NIX
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
# users = {
# marty = ./nixos/modules/home.nix;
# };
};
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
# PREVIOUSLY HARDWARE-CONFIGURATION.NIX
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [
"xhci_pci"
"ahci"
"usb_storage"
"sd_mod"
"rtsx_pci_sdmmc"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/757b8bfc-0b5d-4ec1-9ab7-7876848ae411";
fsType = "ext4";
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/757b8bfc-0b5d-4ec1-9ab7-7876848ae411";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/C8A8-A568";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
swapDevices =
[ { device = "/dev/disk/by-uuid/a1838708-fb00-4ecb-8010-432d06182591"; }
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/C8A8-A568";
fsType = "vfat";
options = [
"fmask=0077"
"dmask=0077"
];
};
swapDevices = [
{ device = "/dev/disk/by-uuid/a1838708-fb00-4ecb-8010-432d06182591"; }
];
# 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

40
marty-pc.nix
View file

@ -2,6 +2,7 @@
config,
lib,
pkgs,
modulesPath,
...
}:
@ -17,6 +18,45 @@
};
};
};
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users = {
marty = ./nixos/modules/home.nix;
};
};
# PREVIOUSLY HARDWARE-CONFIGURATION.NIX
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [
"nvme"
"xhci_pci"
"ahci"
"usbhid"
"usb_storage"
"sd_mod"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" = {
device = "/dev/disk/by-uuid/a26cdc8b-abc9-47cf-ad33-c81e56e56d22";
fsType = "ext4";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/C9B2-7254";
fsType = "vfat";
options = [
"fmask=0077"
"dmask=0077"
];
};
fileSystems = {
"/mnt/SSD" = {
device = "/dev/disk/by-uuid/af5282f0-0e02-4532-902f-97509af70d11";

40
marty-server.nix
View file

@ -2,6 +2,7 @@
config,
lib,
pkgs,
modulesPath,
...
}:
@ -18,6 +19,45 @@
};
};
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users = {
marty = ./nixos/modules/home.nix;
};
};
# PREVIOUSLY HARDWARE-CONFIGURATION.NIX
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [
"xhci_pci"
"ahci"
"nvme"
"usbhid"
"usb_storage"
"sd_mod"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
fileSystems."/" = {
device = "/dev/disk/by-uuid/a804bdf0-194c-4fe4-a451-64620d3d293d";
fsType = "ext4";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/44A5-B01F";
fsType = "vfat";
options = [
"fmask=0077"
"dmask=0077"
];
};
fileSystems = {
"/mnt/Data" = {
device = "/dev/disk/by-uuid/20eaea9c-6924-40c6-a784-cd5018d8fabb";

12
modules/home.nix Normal file
View file

@ -0,0 +1,12 @@
{
config,
pkgs,
...
}:
{
home.username = "marty";
import = [
./development/import_development.nix
];
}

0
modules/window_manager/waybar.nix → modules/window_manager/bar.nix
View file

5
modules/window_manager/import_wm.nix
View file

@ -7,7 +7,8 @@
{
imports = [
./hyprland.nix
./waybar.nix
./window_manager.nix
./launcher.nix
./bar.nix
];
}

9
modules/window_manager/launcher.nix Normal file
View file

@ -0,0 +1,9 @@
{ config, pkgs, ... }:
{
environment = {
systemPackages = with pkgs; [
rofi
];
};
}

0
modules/window_manager/hyprland.nix → modules/window_manager/window_manager.nix
View file

1
system/terminal.nix
View file

@ -4,7 +4,6 @@
environment = {
systemPackages = with pkgs; [
kitty
rofi
];
};
}

7
user/marty.nix
View file

@ -1,4 +1,9 @@
{ config, pkgs, ... }:
{
config,
pkgs,
inputs,
...
}:
{
users.users.marty = {