oqyude/nixos
1
0
Fork 0
mirror of https://github.com/oqyude/nixos.git synced 2026-06-15 22:41:52 +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"; type = "primary";
}; };
imports = imports = [
with inputs; ./hardware/laptop.nix
[ ./hardware/logitech.nix
./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;
};
};
fileSystems = { fileSystems = {
"${config.xlib.dirs.therima-drive}" = { "${config.xlib.dirs.therima-drive}" = {
device = "/dev/disk/by-uuid/C0A2DDEFA2DDEA44"; device = "/dev/disk/by-uuid/C0A2DDEFA2DDEA44";
@@ -63,18 +46,6 @@ let
#"x-systemd.device-timeout=0" #"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 = { boot = {
@@ -189,6 +160,7 @@ in
inputs.nixpkgs.lib.nixosSystem { inputs.nixpkgs.lib.nixosSystem {
modules = [ modules = [
nixosModule nixosModule
inputs.self.nixosModules.default
]; ];
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { specialArgs = {
nixosConfigurations/hosts/mini-laptop.nix
+3 -11
View File
@@ -16,25 +16,17 @@ let
hostname = "lamet"; hostname = "lamet";
}; };
imports = with inputs; [ imports = [
self.homeConfigurations.default.nixosModule inputs.nixos-hardware.nixosModules.chuwi-minibook-x
self.nixosModules.default
nixos-hardware.nixosModules.chuwi-minibook-x
]; ];
home-manager = {
extraSpecialArgs = {
xlib = config.xlib;
};
};
hardware.intel-gpu-tools.enable = true; hardware.intel-gpu-tools.enable = true;
}; };
in in
inputs.nixpkgs.lib.nixosSystem { inputs.nixpkgs.lib.nixosSystem {
modules = with inputs; [ modules = with inputs; [
nixosModule nixosModule
self.nixosModules.default
]; ];
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { specialArgs = {
nixosConfigurations/hosts/mini-pc.nix
-26
View File
@@ -21,20 +21,8 @@ let
./hardware/mini-pc.nix ./hardware/mini-pc.nix
./hardware/logitech.nix ./hardware/logitech.nix
self.nixosModules.default 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 = { sops = {
defaultSopsFile = ./secrets/example.yaml; defaultSopsFile = ./secrets/example.yaml;
age.keyFile = "/var/lib/sops-nix/key.txt"; age.keyFile = "/var/lib/sops-nix/key.txt";
@@ -51,7 +39,6 @@ let
"fmask=0007" "fmask=0007"
"dmask=0007" "dmask=0007"
"nofail" "nofail"
#"x-systemd.device-timeout=0"
]; ];
}; };
"${config.xlib.dirs.vetymae-drive}" = { "${config.xlib.dirs.vetymae-drive}" = {
@@ -64,19 +51,6 @@ let
"fmask=0007" "fmask=0007"
"dmask=0007" "dmask=0007"
"nofail" "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 ./hardware/server.nix
]; ];
home-manager = {
extraSpecialArgs = {
xlib = config.xlib;
};
};
boot = { boot = {
kernelPackages = pkgs.linuxPackages_xanmod_stable; kernelPackages = pkgs.linuxPackages_xanmod_stable;
hardwareScan = true; hardwareScan = true;
@@ -47,7 +41,7 @@ let
fsType = "ext4"; fsType = "ext4";
options = [ options = [
#"nofail" #"nofail"
"x-systemd.device-timeout=0" #"x-systemd.device-timeout=0"
]; ];
}; };
# Archive drive # Archive drive
@@ -56,24 +50,11 @@ let
fsType = "exfat"; fsType = "exfat";
options = [ options = [
"nofail" "nofail"
"x-systemd.device-timeout=0" #"x-systemd.device-timeout=0"
"uid=1000" "uid=1000"
"gid=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 = { services = {
@@ -116,12 +97,10 @@ let
}; };
in in
inputs.nixpkgs.lib.nixosSystem { inputs.nixpkgs.lib.nixosSystem {
modules = with inputs; [ modules = [
nixosModule nixosModule
self.nixosModules.default inputs.self.nixosModules.default
self.homeConfigurations.default.nixosModule
sops-nix.nixosModules.sops
]; ];
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { specialArgs = {
nixosConfigurations/hosts/vds.nix
-8
View File
@@ -20,18 +20,10 @@ let
./disko/vds.nix ./disko/vds.nix
./hardware/vds.nix ./hardware/vds.nix
inputs.disko.nixosModules.disko
inputs.self.nixosModules.default inputs.self.nixosModules.default
inputs.self.homeConfigurations.default.nixosModule
]; ];
home-manager = {
extraSpecialArgs = {
xlib = config.xlib;
};
};
boot = { boot = {
kernelPackages = pkgs.linuxPackages_xanmod_stable; kernelPackages = pkgs.linuxPackages_xanmod_stable;
hardwareScan = true; hardwareScan = true;
nixosConfigurations/hosts/wsl.nix
+1 -25
View File
@@ -16,33 +16,8 @@ let
imports = [ imports = [
inputs.nixos-wsl.nixosModules.default 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; #zramSwap.enable = true;
services = { services = {
journald = { journald = {
@@ -71,6 +46,7 @@ in
inputs.nixpkgs.lib.nixosSystem { inputs.nixpkgs.lib.nixosSystem {
modules = [ modules = [
nixosModule nixosModule
inputs.self.nixosModules.default
]; ];
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { specialArgs = {
nixosModules/base.nix
+10 -2
View File
@@ -17,9 +17,17 @@
home-manager.nixosModules.home-manager # home-manager module home-manager.nixosModules.home-manager # home-manager module
nix-index-database.nixosModules.nix-index # nix-index module nix-index-database.nixosModules.nix-index # nix-index module
grub2-themes.nixosModules.default # grub2 themes module grub2-themes.nixosModules.default # grub2 themes module
sops-nix.nixosModules.sops sops-nix.nixosModules.sops # sops module
self.homeConfigurations.default.nixosModule self.homeConfigurations.default.nixosModule # default homeConfigurations
disko.nixosModules.disko # disko module
]; ];
home-manager = {
extraSpecialArgs = {
xlib = config.xlib;
};
};
_module.args = { _module.args = {
inputs = inputs; inputs = inputs;
xlib = config.xlib; xlib = config.xlib;
nixosModules/software/beets/default.nix
+15 -2
View File
@@ -2,6 +2,7 @@
config, config,
lib, lib,
pkgs, pkgs,
xlib,
... ...
}: }:
let let
@@ -19,12 +20,12 @@ let
in in
{ {
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"z /mnt/beets 0700 ${config.xlib.device.username} users -" # beets absolute paths "z /mnt/beets 0700 ${xlib.device.username} users -" # beets absolute paths
]; ];
users = { users = {
users = { users = {
"${config.xlib.device.username}" = { "${xlib.device.username}" = {
packages = [ packages = [
beetsEnv beetsEnv
pkgs.mp3gain pkgs.mp3gain
@@ -34,4 +35,16 @@ in
}; };
}; };
}; };
fileSystems."/mnt/beets/music" = {
device = "/home/${xlib.device.username}/Music"; # "${xlib.dirs.vetymae-drive}/Users/User/Music"
options = [
"bind"
"uid=1000"
"gid=1000"
"fmask=0077"
"dmask=0077"
"nofail"
#"x-systemd.device-timeout=0"
];
};
} }