oqyude/nixos
1
0
Fork 0
mirror of https://github.com/oqyude/nixos.git synced 2026-06-11 12:40:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

cleaning

Browse Source
This commit is contained in:
Jor Oqyude
2025-08-08 22:08:48 +03:00
parent 5fc35acdca
commit 1a72638911
8 changed files with 38 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixosConfigurations/hosts/laptop.nix
+5 -33
View File
@@ -15,27 +15,10 @@ let
type = "primary";
};
imports =
with inputs;
[
./hardware/laptop.nix
./hardware/logitech.nix
self.nixosModules.default
#nixos-hardware.nixosModules.asus-fa506ic
self.nixosModules.software.wine
self.nixosModules.software.beets
self.nixosModules.desktop
sops-nix.nixosModules.sops
]
++ builtins.attrValues inputs.self.nixosModules.extra.self;
home-manager = {
extraSpecialArgs = {
xlib = config.xlib;
};
};
imports = [
./hardware/laptop.nix
./hardware/logitech.nix
];
fileSystems = {
"${config.xlib.dirs.therima-drive}" = {
device = "/dev/disk/by-uuid/C0A2DDEFA2DDEA44";
@@ -63,18 +46,6 @@ let
#"x-systemd.device-timeout=0"
];
};
"/mnt/beets/music" = {
device = "/home/${config.xlib.device.username}/Music"; # "${config.xlib.dirs.vetymae-drive}/Users/User/Music"
options = [
"bind"
#"uid=1000"
#"gid=1000"
"fmask=0077"
"dmask=0077"
"nofail"
#"x-systemd.device-timeout=0"
];
};
};
boot = {
@@ -189,6 +160,7 @@ in
inputs.nixpkgs.lib.nixosSystem {
modules = [
nixosModule
inputs.self.nixosModules.default
];
system = "x86_64-linux";
specialArgs = {
nixosConfigurations/hosts/mini-laptop.nix
+3 -11
View File
@@ -16,25 +16,17 @@ let
hostname = "lamet";
};
imports = with inputs; [
self.homeConfigurations.default.nixosModule
self.nixosModules.default
nixos-hardware.nixosModules.chuwi-minibook-x
imports = [
inputs.nixos-hardware.nixosModules.chuwi-minibook-x
];
home-manager = {
extraSpecialArgs = {
xlib = config.xlib;
};
};
hardware.intel-gpu-tools.enable = true;
};
in
inputs.nixpkgs.lib.nixosSystem {
modules = with inputs; [
nixosModule
self.nixosModules.default
];
system = "x86_64-linux";
specialArgs = {
nixosConfigurations/hosts/mini-pc.nix
-26
View File
@@ -21,20 +21,8 @@ let
./hardware/mini-pc.nix
./hardware/logitech.nix
self.nixosModules.default
# self.nixosModules.software.wine
# self.nixosModules.software.beets
#self.nixosModules.extra.self.fingerprint
# self.homeConfigurations.main.nixosModule
# self.homeConfigurations.root.nixosModule
];
home-manager = {
extraSpecialArgs = {
xlib = config.xlib;
};
};
sops = {
defaultSopsFile = ./secrets/example.yaml;
age.keyFile = "/var/lib/sops-nix/key.txt";
@@ -51,7 +39,6 @@ let
"fmask=0007"
"dmask=0007"
"nofail"
#"x-systemd.device-timeout=0"
];
};
"${config.xlib.dirs.vetymae-drive}" = {
@@ -64,19 +51,6 @@ let
"fmask=0007"
"dmask=0007"
"nofail"
#"x-systemd.device-timeout=0"
];
};
"/mnt/beets/music" = {
device = "/home/${config.xlib.device.username}/Music"; # "${config.xlib.dirs.vetymae-drive}/Users/User/Music"
options = [
"bind"
#"uid=1000"
#"gid=1000"
"fmask=0077"
"dmask=0077"
"nofail"
#"x-systemd.device-timeout=0"
];
};
};
nixosConfigurations/hosts/server.nix
+4 -25
View File
@@ -17,12 +17,6 @@ let
./hardware/server.nix
];
home-manager = {
extraSpecialArgs = {
xlib = config.xlib;
};
};
boot = {
kernelPackages = pkgs.linuxPackages_xanmod_stable;
hardwareScan = true;
@@ -47,7 +41,7 @@ let
fsType = "ext4";
options = [
#"nofail"
"x-systemd.device-timeout=0"
#"x-systemd.device-timeout=0"
];
};
# Archive drive
@@ -56,24 +50,11 @@ let
fsType = "exfat";
options = [
"nofail"
"x-systemd.device-timeout=0"
#"x-systemd.device-timeout=0"
"uid=1000"
"gid=1000"
];
};
# beets
"/mnt/beets/music" = {
device = "${config.xlib.dirs.server-home}/Music";
options = [
"bind"
"uid=1000"
"gid=1000"
"fmask=0007"
"dmask=0007"
"nofail"
"x-systemd.device-timeout=0"
];
};
};
services = {
@@ -116,12 +97,10 @@ let
};
in
inputs.nixpkgs.lib.nixosSystem {
modules = with inputs; [
modules = [
nixosModule
self.nixosModules.default
self.homeConfigurations.default.nixosModule
sops-nix.nixosModules.sops
inputs.self.nixosModules.default
];
system = "x86_64-linux";
specialArgs = {
nixosConfigurations/hosts/vds.nix
-8
View File
@@ -20,18 +20,10 @@ let
./disko/vds.nix
./hardware/vds.nix
inputs.disko.nixosModules.disko
inputs.self.nixosModules.default
inputs.self.homeConfigurations.default.nixosModule
];
home-manager = {
extraSpecialArgs = {
xlib = config.xlib;
};
};
boot = {
kernelPackages = pkgs.linuxPackages_xanmod_stable;
hardwareScan = true;
nixosConfigurations/hosts/wsl.nix
+1 -25
View File
@@ -16,33 +16,8 @@ let
imports = [
inputs.nixos-wsl.nixosModules.default
inputs.self.homeConfigurations.default.nixosModule
inputs.self.nixosModules.default
];
home-manager = {
extraSpecialArgs = {
xlib = config.xlib;
};
};
fileSystems = {
# beets
"/mnt/beets/music" = {
device = "${config.xlib.dirs.wsl-home}/Music";
options = [
"bind"
"uid=1000"
"gid=1000"
"fmask=0007"
"dmask=0007"
"nofail"
"x-systemd.device-timeout=0"
];
};
};
#zramSwap.enable = true;
services = {
journald = {
@@ -71,6 +46,7 @@ in
inputs.nixpkgs.lib.nixosSystem {
modules = [
nixosModule
inputs.self.nixosModules.default
];
system = "x86_64-linux";
specialArgs = {