diff --git a/flake.lock b/flake.lock index c3adb17..7e504a0 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1734366194, - "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", + "lastModified": 1733572789, + "narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=", "owner": "nix-community", "repo": "home-manager", - "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", + "rev": "c7ffc9727d115e433fd884a62dc164b587ff651d", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1734864618, - "narHash": "sha256-8SCTJhDH1fdNGGFhuGStIqbO7vwUKQokgQu6nQlQagY=", + "lastModified": 1733863840, + "narHash": "sha256-OO/yx700wpyKjFmsNlxep57pUIVCA1OlfEN1qUrxgCY=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "13be795cac27df7044a425c0b2de3a42b10ddb18", + "rev": "eb6f90693f91a7ce082c0c2c78627049265bc599", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1734954597, - "narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=", + "lastModified": 1733861262, + "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "def1d472c832d77885f174089b0d34854b007198", + "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5", "type": "github" }, "original": { @@ -54,11 +54,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734875076, - "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=", + "lastModified": 1733550349, + "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1807c2b91223227ad5599d7067a61665c52d1295", + "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34", "type": "github" }, "original": { @@ -70,11 +70,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { diff --git a/hosts/crocoite/hardware-configuration.nix b/hosts/crocoite/hardware-configuration.nix index 99cf29f..273c87e 100644 --- a/hosts/crocoite/hardware-configuration.nix +++ b/hosts/crocoite/hardware-configuration.nix @@ -35,8 +35,7 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - #boot.kernelPackages = pkgs.linuxPackages_latest; - boot.kernelPackages = pkgs.linuxPackages_zen; + boot.kernelPackages = pkgs.linuxPackages_latest; #boot.blacklistedKernelModules = [ "acpi-cpufreq" ]; boot.kernelParams = [ diff --git a/modules/accessibility.nix b/modules/accessibility.nix deleted file mode 100644 index 3347018..0000000 --- a/modules/accessibility.nix +++ /dev/null @@ -1,3 +0,0 @@ -{...}: { - services.speechd.enable = true; -} diff --git a/modules/default.nix b/modules/default.nix index ef6fbfe..1e0352a 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,11 +1,9 @@ {...}: { imports = [ #./plymouth.nix - ./accessibility.nix ./customisation.nix ./environment.nix ./locale.nix ./networking.nix - ./firewall.nix ]; } diff --git a/modules/firewall.nix b/modules/firewall.nix deleted file mode 100644 index a8bca38..0000000 --- a/modules/firewall.nix +++ /dev/null @@ -1,7 +0,0 @@ -{...}: { - # 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; -} diff --git a/modules/networking.nix b/modules/networking.nix index b710d0a..c11e001 100644 --- a/modules/networking.nix +++ b/modules/networking.nix @@ -5,20 +5,20 @@ # Enable networking networking.networkmanager.enable = true; - #networking.networkmanager.wifi.backend = "iwd"; + networking.networkmanager.wifi.backend = "iwd"; systemd.network.wait-online.enable = false; boot.initrd.systemd.network.wait-online.enable = false; - #networking.wireless.iwd.enable = true; - #networking.wireless.iwd.settings = { - # IPv6 = { - # Enabled = true; - # }; - # Settings = { - # AutoConnect = true; - # }; - #}; + networking.wireless.iwd.enable = true; + networking.wireless.iwd.settings = { + IPv6 = { + Enabled = true; + }; + Settings = { + AutoConnect = true; + }; + }; # 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 # still possible to use this option, but it's recommended to use it in conjunction @@ -28,6 +28,11 @@ # networking.interfaces.enp2s0f0.useDHCP = lib.mkDefault true; # networking.interfaces.enp5s0.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; [ networkmanagerapplet diff --git a/modules/software/audio_video.nix b/modules/software/audio_video.nix index 49df916..ca73e58 100644 --- a/modules/software/audio_video.nix +++ b/modules/software/audio_video.nix @@ -50,12 +50,10 @@ }; environment.systemPackages = with pkgs; [ helvum - pwvucontrol - lxqt.pavucontrol-qt - qpwgraph easyeffects - non + pwvucontrol + lxqt.pavucontrol-qt roc-toolkit ]; diff --git a/modules/software/software.nix b/modules/software/software.nix index a1c62bf..d567312 100644 --- a/modules/software/software.nix +++ b/modules/software/software.nix @@ -46,7 +46,6 @@ file unzip tmux - fzf ripgrep qemu home-manager @@ -60,7 +59,6 @@ nuclear mpv zathura - libreoffice #feh nomacs #unstable.obsidian diff --git a/modules/wm_and_de/components/dbus.nix b/modules/wm_and_de/components/dbus.nix deleted file mode 100644 index f8aa5f1..0000000 --- a/modules/wm_and_de/components/dbus.nix +++ /dev/null @@ -1,6 +0,0 @@ -{...}: { - services.dbus = { - implementation = "broker"; - apparmor = "enabled"; - }; -} diff --git a/modules/wm_and_de/default.nix b/modules/wm_and_de/default.nix index 226c715..b02afc2 100644 --- a/modules/wm_and_de/default.nix +++ b/modules/wm_and_de/default.nix @@ -1,6 +1,5 @@ {...}: { imports = [ ./hyprland.nix - ./components/dbus.nix ]; }