From 6d19a1bdbac25b5642e22479f48ba6f6ceedf7b7 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sat, 14 Dec 2024 20:56:37 +0100 Subject: [PATCH 1/8] 297 current 2024-12-14 04:57:05 24.11.20241207.e2605d0 6.12.3 * --- modules/default.nix | 1 + modules/networking.nix | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/default.nix b/modules/default.nix index 1e0352a..54dfa61 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -5,5 +5,6 @@ ./environment.nix ./locale.nix ./networking.nix + ./firewall.nix ]; } diff --git a/modules/networking.nix b/modules/networking.nix index c11e001..d9327f4 100644 --- a/modules/networking.nix +++ b/modules/networking.nix @@ -28,11 +28,6 @@ # 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 From 9f7d433ed285c8323d50540d6523d5d6873f747f Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Wed, 18 Dec 2024 16:23:20 +0100 Subject: [PATCH 2/8] 299 current 2024-12-18 16:23:13 24.11.20241216.3945713 6.12.5 * --- flake.lock | 30 +++++++++++++++--------------- modules/firewall.nix | 7 +++++++ modules/software/software.nix | 1 + 3 files changed, 23 insertions(+), 15 deletions(-) create mode 100644 modules/firewall.nix diff --git a/flake.lock b/flake.lock index 7e504a0..6e2611f 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1733572789, - "narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=", + "lastModified": 1734366194, + "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", "owner": "nix-community", "repo": "home-manager", - "rev": "c7ffc9727d115e433fd884a62dc164b587ff651d", + "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1733863840, - "narHash": "sha256-OO/yx700wpyKjFmsNlxep57pUIVCA1OlfEN1qUrxgCY=", + "lastModified": 1734128415, + "narHash": "sha256-HLwdVNxpuTsLlM3tCkpbQU6yCehdgf3kOS1G2SDlkzY=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "eb6f90693f91a7ce082c0c2c78627049265bc599", + "rev": "8bdc2540da516006d07b04019eb57ae0781a04b3", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733861262, - "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=", + "lastModified": 1734352517, + "narHash": "sha256-mfv+J/vO4nqmIOlq8Y1rRW8hVsGH3M+I2ESMjhuebDs=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5", + "rev": "b12e314726a4226298fe82776b4baeaa7bcf3dcd", "type": "github" }, "original": { @@ -54,11 +54,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733550349, - "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=", + "lastModified": 1734323986, + "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34", + "rev": "394571358ce82dff7411395829aa6a3aad45b907", "type": "github" }, "original": { @@ -70,11 +70,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733759999, - "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { diff --git a/modules/firewall.nix b/modules/firewall.nix new file mode 100644 index 0000000..a8bca38 --- /dev/null +++ b/modules/firewall.nix @@ -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; +} diff --git a/modules/software/software.nix b/modules/software/software.nix index d567312..ff3a1dd 100644 --- a/modules/software/software.nix +++ b/modules/software/software.nix @@ -46,6 +46,7 @@ file unzip tmux + fzf ripgrep qemu home-manager From 5230140f094e49ec4faa08759ca5f77c5d26bbad Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Fri, 20 Dec 2024 00:20:25 +0100 Subject: [PATCH 3/8] 301 current 2024-12-20 00:20:19 24.11.20241216.3945713 6.12.5 * --- flake.lock | 6 +++--- modules/software/audio_video.nix | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 6e2611f..9973db2 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1734119587, - "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { diff --git a/modules/software/audio_video.nix b/modules/software/audio_video.nix index ca73e58..49df916 100644 --- a/modules/software/audio_video.nix +++ b/modules/software/audio_video.nix @@ -50,11 +50,13 @@ }; environment.systemPackages = with pkgs; [ helvum - qpwgraph - easyeffects pwvucontrol lxqt.pavucontrol-qt + qpwgraph + easyeffects + non + roc-toolkit ]; } From c8605e5cda1ae850cfeb48f97af0b8e85c076d81 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Fri, 20 Dec 2024 12:12:29 +0100 Subject: [PATCH 4/8] 302 current 2024-12-20 12:12:19 24.11.20241216.3945713 6.12.2-zen1 * --- hosts/crocoite/hardware-configuration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/crocoite/hardware-configuration.nix b/hosts/crocoite/hardware-configuration.nix index 273c87e..99cf29f 100644 --- a/hosts/crocoite/hardware-configuration.nix +++ b/hosts/crocoite/hardware-configuration.nix @@ -35,7 +35,8 @@ 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_latest; + boot.kernelPackages = pkgs.linuxPackages_zen; #boot.blacklistedKernelModules = [ "acpi-cpufreq" ]; boot.kernelParams = [ From 0c9ee1c6065583f8292c33344349078017733236 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Tue, 24 Dec 2024 12:02:00 +0100 Subject: [PATCH 5/8] enabled basic speech support --- modules/accessibility.nix | 3 +++ modules/default.nix | 1 + 2 files changed, 4 insertions(+) create mode 100644 modules/accessibility.nix diff --git a/modules/accessibility.nix b/modules/accessibility.nix new file mode 100644 index 0000000..b80a9a8 --- /dev/null +++ b/modules/accessibility.nix @@ -0,0 +1,3 @@ +{ ... }: { + services.speechd.enable = true; +} diff --git a/modules/default.nix b/modules/default.nix index 54dfa61..ef6fbfe 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,6 +1,7 @@ {...}: { imports = [ #./plymouth.nix + ./accessibility.nix ./customisation.nix ./environment.nix ./locale.nix From 49dd37c04ddcf6814cd1a7cb1ae09ec56c0a18fc Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Tue, 24 Dec 2024 12:11:01 +0100 Subject: [PATCH 6/8] 304 current 2024-12-24 12:09:06 24.11.20241222.1807c2b 6.12.2-zen1 * --- flake.lock | 24 ++++++++++++------------ modules/accessibility.nix | 2 +- modules/wm_and_de/components/dbus.nix | 6 ++++++ modules/wm_and_de/default.nix | 1 + 4 files changed, 20 insertions(+), 13 deletions(-) create mode 100644 modules/wm_and_de/components/dbus.nix diff --git a/flake.lock b/flake.lock index 9973db2..c3adb17 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1734128415, - "narHash": "sha256-HLwdVNxpuTsLlM3tCkpbQU6yCehdgf3kOS1G2SDlkzY=", + "lastModified": 1734864618, + "narHash": "sha256-8SCTJhDH1fdNGGFhuGStIqbO7vwUKQokgQu6nQlQagY=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "8bdc2540da516006d07b04019eb57ae0781a04b3", + "rev": "13be795cac27df7044a425c0b2de3a42b10ddb18", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1734352517, - "narHash": "sha256-mfv+J/vO4nqmIOlq8Y1rRW8hVsGH3M+I2ESMjhuebDs=", + "lastModified": 1734954597, + "narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b12e314726a4226298fe82776b4baeaa7bcf3dcd", + "rev": "def1d472c832d77885f174089b0d34854b007198", "type": "github" }, "original": { @@ -54,11 +54,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734323986, - "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=", + "lastModified": 1734875076, + "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "394571358ce82dff7411395829aa6a3aad45b907", + "rev": "1807c2b91223227ad5599d7067a61665c52d1295", "type": "github" }, "original": { @@ -70,11 +70,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { diff --git a/modules/accessibility.nix b/modules/accessibility.nix index b80a9a8..3347018 100644 --- a/modules/accessibility.nix +++ b/modules/accessibility.nix @@ -1,3 +1,3 @@ -{ ... }: { +{...}: { services.speechd.enable = true; } diff --git a/modules/wm_and_de/components/dbus.nix b/modules/wm_and_de/components/dbus.nix new file mode 100644 index 0000000..f8aa5f1 --- /dev/null +++ b/modules/wm_and_de/components/dbus.nix @@ -0,0 +1,6 @@ +{...}: { + services.dbus = { + implementation = "broker"; + apparmor = "enabled"; + }; +} diff --git a/modules/wm_and_de/default.nix b/modules/wm_and_de/default.nix index b02afc2..226c715 100644 --- a/modules/wm_and_de/default.nix +++ b/modules/wm_and_de/default.nix @@ -1,5 +1,6 @@ {...}: { imports = [ ./hyprland.nix + ./components/dbus.nix ]; } From af911c093cb531b6f93ed5a42c914df5bfabdc40 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Thu, 26 Dec 2024 23:47:54 +0100 Subject: [PATCH 7/8] 305 current 2024-12-26 23:47:31 24.11.20241222.1807c2b 6.12.2-zen1 * --- modules/software/software.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/software/software.nix b/modules/software/software.nix index ff3a1dd..a1c62bf 100644 --- a/modules/software/software.nix +++ b/modules/software/software.nix @@ -60,6 +60,7 @@ nuclear mpv zathura + libreoffice #feh nomacs #unstable.obsidian From 0b703bec9ca84df518b11f1e278678e7d1852ec5 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sat, 28 Dec 2024 00:22:05 +0100 Subject: [PATCH 8/8] 306 current 2024-12-28 00:21:47 24.11.20241222.1807c2b 6.12.2-zen1 * --- modules/networking.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/networking.nix b/modules/networking.nix index d9327f4..b710d0a 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