Compare commits
8 commits
39ddc51895
...
0b703bec9c
Author | SHA1 | Date | |
---|---|---|---|
![]() |
0b703bec9c | ||
![]() |
af911c093c | ||
![]() |
49dd37c04d | ||
![]() |
0c9ee1c606 | ||
![]() |
c8605e5cda | ||
![]() |
5230140f09 | ||
![]() |
9f7d433ed2 | ||
![]() |
6d19a1bdba |
10 changed files with 52 additions and 33 deletions
30
flake.lock
generated
30
flake.lock
generated
|
@ -7,11 +7,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1733572789,
|
"lastModified": 1734366194,
|
||||||
"narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=",
|
"narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "c7ffc9727d115e433fd884a62dc164b587ff651d",
|
"rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -23,11 +23,11 @@
|
||||||
},
|
},
|
||||||
"nix-flatpak": {
|
"nix-flatpak": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1733863840,
|
"lastModified": 1734864618,
|
||||||
"narHash": "sha256-OO/yx700wpyKjFmsNlxep57pUIVCA1OlfEN1qUrxgCY=",
|
"narHash": "sha256-8SCTJhDH1fdNGGFhuGStIqbO7vwUKQokgQu6nQlQagY=",
|
||||||
"owner": "gmodena",
|
"owner": "gmodena",
|
||||||
"repo": "nix-flatpak",
|
"repo": "nix-flatpak",
|
||||||
"rev": "eb6f90693f91a7ce082c0c2c78627049265bc599",
|
"rev": "13be795cac27df7044a425c0b2de3a42b10ddb18",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -38,11 +38,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1733861262,
|
"lastModified": 1734954597,
|
||||||
"narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=",
|
"narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5",
|
"rev": "def1d472c832d77885f174089b0d34854b007198",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -54,11 +54,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1733550349,
|
"lastModified": 1734875076,
|
||||||
"narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=",
|
"narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34",
|
"rev": "1807c2b91223227ad5599d7067a61665c52d1295",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -70,11 +70,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1733759999,
|
"lastModified": 1734649271,
|
||||||
"narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=",
|
"narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56",
|
"rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -35,7 +35,8 @@
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
#boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
|
boot.kernelPackages = pkgs.linuxPackages_zen;
|
||||||
|
|
||||||
#boot.blacklistedKernelModules = [ "acpi-cpufreq" ];
|
#boot.blacklistedKernelModules = [ "acpi-cpufreq" ];
|
||||||
boot.kernelParams = [
|
boot.kernelParams = [
|
||||||
|
|
3
modules/accessibility.nix
Normal file
3
modules/accessibility.nix
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
{...}: {
|
||||||
|
services.speechd.enable = true;
|
||||||
|
}
|
|
@ -1,9 +1,11 @@
|
||||||
{...}: {
|
{...}: {
|
||||||
imports = [
|
imports = [
|
||||||
#./plymouth.nix
|
#./plymouth.nix
|
||||||
|
./accessibility.nix
|
||||||
./customisation.nix
|
./customisation.nix
|
||||||
./environment.nix
|
./environment.nix
|
||||||
./locale.nix
|
./locale.nix
|
||||||
./networking.nix
|
./networking.nix
|
||||||
|
./firewall.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
7
modules/firewall.nix
Normal file
7
modules/firewall.nix
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
{...}: {
|
||||||
|
# Open ports in the firewall.
|
||||||
|
networking.firewall.allowedTCPPorts = [8080 10001 10002];
|
||||||
|
networking.firewall.allowedUDPPorts = [8080 10001 10002];
|
||||||
|
# Or disable the firewall altogether.
|
||||||
|
# networking.firewall.enable = false;
|
||||||
|
}
|
|
@ -5,20 +5,20 @@
|
||||||
|
|
||||||
# Enable networking
|
# Enable networking
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
networking.networkmanager.wifi.backend = "iwd";
|
#networking.networkmanager.wifi.backend = "iwd";
|
||||||
|
|
||||||
systemd.network.wait-online.enable = false;
|
systemd.network.wait-online.enable = false;
|
||||||
boot.initrd.systemd.network.wait-online.enable = false;
|
boot.initrd.systemd.network.wait-online.enable = false;
|
||||||
|
|
||||||
networking.wireless.iwd.enable = true;
|
#networking.wireless.iwd.enable = true;
|
||||||
networking.wireless.iwd.settings = {
|
#networking.wireless.iwd.settings = {
|
||||||
IPv6 = {
|
# IPv6 = {
|
||||||
Enabled = true;
|
# Enabled = true;
|
||||||
};
|
# };
|
||||||
Settings = {
|
# Settings = {
|
||||||
AutoConnect = true;
|
# AutoConnect = true;
|
||||||
};
|
# };
|
||||||
};
|
#};
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
# 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
|
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||||
# still possible to use this option, but it's recommended to use it in conjunction
|
# still possible to use this option, but it's recommended to use it in conjunction
|
||||||
|
@ -28,11 +28,6 @@
|
||||||
# networking.interfaces.enp2s0f0.useDHCP = lib.mkDefault true;
|
# networking.interfaces.enp2s0f0.useDHCP = lib.mkDefault true;
|
||||||
# networking.interfaces.enp5s0.useDHCP = lib.mkDefault true;
|
# networking.interfaces.enp5s0.useDHCP = lib.mkDefault true;
|
||||||
# networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
|
# networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
|
||||||
# Open ports in the firewall.
|
|
||||||
networking.firewall.allowedTCPPorts = [8080 10001 10002];
|
|
||||||
networking.firewall.allowedUDPPorts = [8080 10001 10002];
|
|
||||||
# Or disable the firewall altogether.
|
|
||||||
# networking.firewall.enable = false;
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
networkmanagerapplet
|
networkmanagerapplet
|
||||||
|
|
|
@ -50,11 +50,13 @@
|
||||||
};
|
};
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
helvum
|
helvum
|
||||||
qpwgraph
|
|
||||||
easyeffects
|
|
||||||
pwvucontrol
|
pwvucontrol
|
||||||
lxqt.pavucontrol-qt
|
lxqt.pavucontrol-qt
|
||||||
|
|
||||||
|
qpwgraph
|
||||||
|
easyeffects
|
||||||
|
non
|
||||||
|
|
||||||
roc-toolkit
|
roc-toolkit
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,6 +46,7 @@
|
||||||
file
|
file
|
||||||
unzip
|
unzip
|
||||||
tmux
|
tmux
|
||||||
|
fzf
|
||||||
ripgrep
|
ripgrep
|
||||||
qemu
|
qemu
|
||||||
home-manager
|
home-manager
|
||||||
|
@ -59,6 +60,7 @@
|
||||||
nuclear
|
nuclear
|
||||||
mpv
|
mpv
|
||||||
zathura
|
zathura
|
||||||
|
libreoffice
|
||||||
#feh
|
#feh
|
||||||
nomacs
|
nomacs
|
||||||
#unstable.obsidian
|
#unstable.obsidian
|
||||||
|
|
6
modules/wm_and_de/components/dbus.nix
Normal file
6
modules/wm_and_de/components/dbus.nix
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
{...}: {
|
||||||
|
services.dbus = {
|
||||||
|
implementation = "broker";
|
||||||
|
apparmor = "enabled";
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,5 +1,6 @@
|
||||||
{...}: {
|
{...}: {
|
||||||
imports = [
|
imports = [
|
||||||
./hyprland.nix
|
./hyprland.nix
|
||||||
|
./components/dbus.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue