Skip to content

Commit c40bf2d

Browse files
debugloopdebugloop
committed
ref: move around nix options
1 parent 1a8cd83 commit c40bf2d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+632
-632
lines changed

‎hosts/hyperion/configuration.nix‎

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{flake, ...}: {
22
imports = [
3-
./boot.nix
3+
./hardware-configuration.nix
44
flake.nixosModules.common
5-
flake.nixosModules.servers
5+
flake.nixosModules.class-server
66
flake.nixosModules.service-caddy
77
flake.nixosModules.service-factorio
88
flake.nixosModules.service-grafana
@@ -12,4 +12,34 @@
1212
flake.nixosModules.service-prometheus
1313
flake.nixosModules.service-restic-rest
1414
];
15+
16+
networking = {
17+
nameservers = [
18+
"46.38.225.230"
19+
"46.38.252.230"
20+
];
21+
useDHCP = false;
22+
interfaces.ens3 = {
23+
ipv4.addresses = [
24+
{
25+
address = "37.120.188.134";
26+
prefixLength = 22;
27+
}
28+
];
29+
ipv6.addresses = [
30+
{
31+
address = "2a03:4000:6:b08a::";
32+
prefixLength = 64;
33+
}
34+
];
35+
};
36+
defaultGateway = {
37+
address = "37.120.188.1";
38+
interface = "ens3";
39+
};
40+
defaultGateway6 = {
41+
address = "fe80::1";
42+
interface = "ens3";
43+
};
44+
};
1545
}

hosts/hyperion/boot.nix renamed to hosts/hyperion/hardware-configuration.nix

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -46,34 +46,4 @@
4646
swapDevices = [
4747
{label = "swap";}
4848
];
49-
50-
networking = {
51-
nameservers = [
52-
"46.38.225.230"
53-
"46.38.252.230"
54-
];
55-
useDHCP = false;
56-
interfaces.ens3 = {
57-
ipv4.addresses = [
58-
{
59-
address = "37.120.188.134";
60-
prefixLength = 22;
61-
}
62-
];
63-
ipv6.addresses = [
64-
{
65-
address = "2a03:4000:6:b08a::";
66-
prefixLength = 64;
67-
}
68-
];
69-
};
70-
defaultGateway = {
71-
address = "37.120.188.1";
72-
interface = "ens3";
73-
};
74-
defaultGateway6 = {
75-
address = "fe80::1";
76-
interface = "ens3";
77-
};
78-
};
7949
}

‎hosts/hyperion/users/danieln/home-configuration.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{flake, ...}: {
22
imports = [
3-
flake.homeModules.shared
4-
flake.homeModules.headless
3+
flake.homeModules.common
4+
flake.homeModules.class-server
55
];
66
}

‎hosts/lusus/configuration.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{flake, ...}: {
22
imports = [
3+
./hardware-configuration.nix
34
flake.nixosModules.common
4-
flake.nixosModules.laptops
5-
./boot.nix
5+
flake.nixosModules.class-laptop
66
];
77
}

hosts/lusus/boot.nix renamed to hosts/lusus/hardware-configuration.nix

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,6 @@
1212
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
1313
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
1414

15-
fileSystems = {
16-
"/nix" = {
17-
device = "/dev/disk/by-uuid/2bbe58f6-c736-4207-8646-05b07fd024f4";
18-
fsType = "xfs";
19-
};
20-
21-
"/boot" = {
22-
device = "/dev/disk/by-uuid/D7EE-6599";
23-
fsType = "vfat";
24-
};
25-
};
26-
2715
boot = {
2816
initrd = {
2917
availableKernelModules = ["xhci_pci" "thunderbolt" "vmd" "nvme" "usb_storage" "sd_mod"];
@@ -45,5 +33,17 @@
4533
tmp.useTmpfs = true;
4634
};
4735

36+
fileSystems = {
37+
"/nix" = {
38+
device = "/dev/disk/by-uuid/2bbe58f6-c736-4207-8646-05b07fd024f4";
39+
fsType = "xfs";
40+
};
41+
42+
"/boot" = {
43+
device = "/dev/disk/by-uuid/D7EE-6599";
44+
fsType = "vfat";
45+
};
46+
};
47+
4848
swapDevices = [];
4949
}

‎hosts/lusus/users/danieln/home-configuration.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
...
55
}: {
66
imports = [
7-
flake.homeModules.shared
8-
flake.homeModules.graphical
7+
flake.homeModules.common
8+
flake.homeModules.class-laptop
99
inputs.gridx.home-module
1010
];
1111
}

‎hosts/simmons/configuration.nix‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{flake, ...}: {
22
imports = [
3+
./hardware-configuration.nix
34
flake.nixosModules.common
4-
flake.nixosModules.laptops
5-
./backup.nix
6-
./boot.nix
7-
./steam.nix
5+
flake.nixosModules.class-laptop
6+
flake.nixosModules.has-backup
87
];
98

109
programs = {

hosts/simmons/boot.nix renamed to hosts/simmons/hardware-configuration.nix

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,37 +8,17 @@
88
imports = [
99
(modulesPath + "/installer/scan/not-detected.nix")
1010
];
11+
1112
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
1213
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
1314

14-
fileSystems = {
15-
"/nix" = {
16-
device = "/dev/disk/by-uuid/f3396211-db7a-4d64-86f9-9b5fb36de182";
17-
fsType = "xfs";
18-
};
19-
20-
"/boot" = {
21-
device = "/dev/disk/by-uuid/F436-A8DB";
22-
fsType = "vfat";
23-
};
24-
};
25-
2615
boot = {
2716
initrd = {
2817
availableKernelModules = ["nvme" "xhci_pci" "usb_storage" "sd_mod"];
2918
kernelModules = ["usb_storage" "amdgpu" "i2c-dev"];
3019
luks.devices.crypt = {
3120
device = "/dev/disk/by-uuid/4eb11486-bcd4-46aa-857c-ff6545dcd90e";
3221
allowDiscards = true;
33-
/*
34-
fallbackToPassword = true;
35-
*/
36-
/*
37-
keyFileSize = 4096;
38-
*/
39-
/*
40-
keyFile = "/dev/disk/by-id/usb-Intenso_Micro_Line_FA4A8CC6-0:0";
41-
*/
4222
};
4323
};
4424
loader = {
@@ -54,5 +34,17 @@
5434
tmp.useTmpfs = true;
5535
};
5636

37+
fileSystems = {
38+
"/nix" = {
39+
device = "/dev/disk/by-uuid/f3396211-db7a-4d64-86f9-9b5fb36de182";
40+
fsType = "xfs";
41+
};
42+
43+
"/boot" = {
44+
device = "/dev/disk/by-uuid/F436-A8DB";
45+
fsType = "vfat";
46+
};
47+
};
48+
5749
swapDevices = [];
5850
}

‎hosts/simmons/users/danieln/home-configuration.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{flake, ...}: {
22
imports = [
3-
flake.homeModules.shared
4-
flake.homeModules.graphical
3+
flake.homeModules.common
4+
flake.homeModules.class-laptop
55
];
66
}

‎modules/home/class-laptop/applications.nix‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
{
2+
pkgs,
3+
config,
4+
...
5+
}: {
6+
home = {
7+
sessionVariables = {
8+
DEFAULT_BROWSER = "${pkgs.firefox}/bin/firefox";
9+
MOZ_ENABLE_WAYLAND = "1";
10+
};
11+
packages = with pkgs; [
12+
abiword
13+
gimp
14+
gnumeric
15+
google-chrome
16+
inkscape
17+
qview
18+
spotify
19+
xfce.thunar
20+
xfce.thunar-archive-plugin
21+
xfce.thunar-volman
22+
wireshark
23+
zathura
24+
teamspeak_client
25+
transmission_4-gtk
26+
audacity
27+
];
28+
};
29+
30+
programs = {
31+
firefox.enable = true;
32+
mpv.enable = true;
33+
wofi = {
34+
enable = true;
35+
settings = {
36+
run-always_parse_args = true;
37+
};
38+
style = ''
39+
window {
40+
border: 0px;
41+
border-radius: 2em;
42+
font-family: monospace;
43+
font-size: 15px;
44+
}
45+
46+
#outer-box {
47+
margin: 0px;
48+
color: #${config.colors.foreground};
49+
background: transparent;
50+
}
51+
52+
#scroll {
53+
background-color: #${config.colors.background};
54+
}
55+
56+
#input {
57+
border: 0px;
58+
margin: 0px;
59+
border-radius: 10px 10px 0px 0px;
60+
padding: 10px;
61+
font-size: 22px;
62+
background-color: #${config.colors.light_bg};
63+
}
64+
65+
#text {
66+
padding: 2px 2px 2px 10px;
67+
}
68+
69+
#entry:selected {
70+
background-color: #${config.colors.blue};
71+
}
72+
'';
73+
};
74+
};
75+
}

0 commit comments

Comments
 (0)