mirror of
https://github.com/Swarsel/.dotfiles.git
synced 2025-12-06 17:17:22 +01:00
fix: minor fixes
sync: nftables force disabled default wallpaper remove non-existent darwin import
This commit is contained in:
parent
0f8051cf4a
commit
bd3e18169f
6 changed files with 12 additions and 40 deletions
|
|
@ -1443,8 +1443,8 @@ This machine mainly acts as an external sync helper. It manages the following th
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
|
||||||
inputs.sops-nix.nixosModules.sops
|
inputs.sops-nix.nixosModules.sops
|
||||||
|
|
||||||
"${profilesPath}/nixos/server"
|
"${profilesPath}/nixos/server"
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
|
|
||||||
|
|
@ -1487,6 +1487,7 @@ This machine mainly acts as an external sync helper. It manages the following th
|
||||||
zramSwap.enable = false;
|
zramSwap.enable = false;
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
|
nftables.enable = lib.mkForce false;
|
||||||
firewall.allowedTCPPorts = [ 8384 22000 ];
|
firewall.allowedTCPPorts = [ 8384 22000 ];
|
||||||
firewall.allowedUDPPorts = [ 21027 22000 ];
|
firewall.allowedUDPPorts = [ 21027 22000 ];
|
||||||
hostName = "sync";
|
hostName = "sync";
|
||||||
|
|
@ -3729,12 +3730,12 @@ lib.swarselsystems.mkModules moduleNames "nixos"
|
||||||
This lets me set the wallpaper that I want to use. Duplicated with home-manager options because mixing system and user level configuration is not a good idea.
|
This lets me set the wallpaper that I want to use. Duplicated with home-manager options because mixing system and user level configuration is not a good idea.
|
||||||
|
|
||||||
#+begin_src nix :tangle modules/nixos/wallpaper.nix
|
#+begin_src nix :tangle modules/nixos/wallpaper.nix
|
||||||
{ lib, ... }:
|
{ self, lib, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
options.swarselsystems.wallpaper = lib.mkOption {
|
options.swarselsystems.wallpaper = lib.mkOption {
|
||||||
type = lib.types.path;
|
type = lib.types.path;
|
||||||
default = "";
|
default = "${self}/wallpaper/lenovowp.png";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -5799,7 +5800,7 @@ Normally, doing that also resets the lecture that happens on the first use of =s
|
||||||
# So if it doesn't run, the btrfs system effectively acts like a normal system
|
# So if it doesn't run, the btrfs system effectively acts like a normal system
|
||||||
# Taken from https://github.com/NotAShelf/nyx/blob/2a8273ed3f11a4b4ca027a68405d9eb35eba567b/modules/core/common/system/impermanence/default.nix
|
# Taken from https://github.com/NotAShelf/nyx/blob/2a8273ed3f11a4b4ca027a68405d9eb35eba567b/modules/core/common/system/impermanence/default.nix
|
||||||
|
|
||||||
boot.initrd.systemd.enable = true;
|
boot.initrd.systemd.enable = lib.mkIf config.swarselsystems.isImpermanence true;
|
||||||
|
|
||||||
boot.initrd.systemd.services.rollback = lib.mkIf config.swarselsystems.isImpermanence {
|
boot.initrd.systemd.services.rollback = lib.mkIf config.swarselsystems.isImpermanence {
|
||||||
description = "Rollback BTRFS root subvolume to a pristine state";
|
description = "Rollback BTRFS root subvolume to a pristine state";
|
||||||
|
|
@ -5976,20 +5977,6 @@ This allows me to use screen sharing on Wayland. The implementation is a bit cru
|
||||||
}
|
}
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
**** safeeyes
|
|
||||||
:PROPERTIES:
|
|
||||||
:CUSTOM_ID: h:d33c93f5-0ac8-44e5-8756-02dc0e6975e4
|
|
||||||
:END:
|
|
||||||
|
|
||||||
A friend of mine used this service and I used to make fun of him. But I have to admit this is actually a nice program. It forces you to look away from the screen from time to time, reducing eye strain.
|
|
||||||
|
|
||||||
#+begin_src nix :tangle profiles/nixos/common/safeeyes.nix
|
|
||||||
_:
|
|
||||||
{
|
|
||||||
services.safeeyes.enable = true;
|
|
||||||
}
|
|
||||||
#+end_src
|
|
||||||
|
|
||||||
**** Podmam (distrobox)
|
**** Podmam (distrobox)
|
||||||
:PROPERTIES:
|
:PROPERTIES:
|
||||||
:CUSTOM_ID: h:1bef3914-a258-4585-b232-e0fbe9e7a9b5
|
:CUSTOM_ID: h:1bef3914-a258-4585-b232-e0fbe9e7a9b5
|
||||||
|
|
@ -7845,14 +7832,8 @@ It serves both a Greader API at https://signpost.swarsel.win/api/greader.php, as
|
||||||
This section sets up all the imports that are used in the home-manager section.
|
This section sets up all the imports that are used in the home-manager section.
|
||||||
|
|
||||||
#+begin_src nix :tangle profiles/darwin/nixos/default.nix
|
#+begin_src nix :tangle profiles/darwin/nixos/default.nix
|
||||||
{ self, ... }:
|
_:
|
||||||
let
|
|
||||||
profilesPath = "${self}/profiles";
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
imports = [
|
|
||||||
"${profilesPath}/nixos/home-manager.nix"
|
|
||||||
];
|
|
||||||
|
|
||||||
nix.settings.experimental-features = "nix-command flakes";
|
nix.settings.experimental-features = "nix-command flakes";
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,8 @@ let
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
|
||||||
inputs.sops-nix.nixosModules.sops
|
inputs.sops-nix.nixosModules.sops
|
||||||
|
|
||||||
"${profilesPath}/nixos/server"
|
"${profilesPath}/nixos/server"
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
|
|
||||||
|
|
@ -48,6 +48,7 @@ in
|
||||||
zramSwap.enable = false;
|
zramSwap.enable = false;
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
|
nftables.enable = lib.mkForce false;
|
||||||
firewall.allowedTCPPorts = [ 8384 22000 ];
|
firewall.allowedTCPPorts = [ 8384 22000 ];
|
||||||
firewall.allowedUDPPorts = [ 21027 22000 ];
|
firewall.allowedUDPPorts = [ 21027 22000 ];
|
||||||
hostName = "sync";
|
hostName = "sync";
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
{ lib, ... }:
|
{ self, lib, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
options.swarselsystems.wallpaper = lib.mkOption {
|
options.swarselsystems.wallpaper = lib.mkOption {
|
||||||
type = lib.types.path;
|
type = lib.types.path;
|
||||||
default = "";
|
default = "${self}/wallpaper/lenovowp.png";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,5 @@
|
||||||
{ self, ... }:
|
_:
|
||||||
let
|
|
||||||
profilesPath = "${self}/profiles";
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
imports = [
|
|
||||||
"${profilesPath}/nixos/home-manager.nix"
|
|
||||||
];
|
|
||||||
|
|
||||||
nix.settings.experimental-features = "nix-command flakes";
|
nix.settings.experimental-features = "nix-command flakes";
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ in
|
||||||
# So if it doesn't run, the btrfs system effectively acts like a normal system
|
# So if it doesn't run, the btrfs system effectively acts like a normal system
|
||||||
# Taken from https://github.com/NotAShelf/nyx/blob/2a8273ed3f11a4b4ca027a68405d9eb35eba567b/modules/core/common/system/impermanence/default.nix
|
# Taken from https://github.com/NotAShelf/nyx/blob/2a8273ed3f11a4b4ca027a68405d9eb35eba567b/modules/core/common/system/impermanence/default.nix
|
||||||
|
|
||||||
boot.initrd.systemd.enable = true;
|
boot.initrd.systemd.enable = lib.mkIf config.swarselsystems.isImpermanence true;
|
||||||
|
|
||||||
boot.initrd.systemd.services.rollback = lib.mkIf config.swarselsystems.isImpermanence {
|
boot.initrd.systemd.services.rollback = lib.mkIf config.swarselsystems.isImpermanence {
|
||||||
description = "Rollback BTRFS root subvolume to a pristine state";
|
description = "Rollback BTRFS root subvolume to a pristine state";
|
||||||
|
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
_:
|
|
||||||
{
|
|
||||||
services.safeeyes.enable = true;
|
|
||||||
}
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue