diff options
Diffstat (limited to 'os')
| -rw-r--r-- | os/core/storage.nix | 23 | ||||
| -rw-r--r-- | os/srv/files.nix | 15 | ||||
| -rw-r--r-- | os/srv/gaming.nix | 3 | ||||
| -rw-r--r-- | os/srv/kdeconnect.nix | 2 | ||||
| -rw-r--r-- | os/srv/monero.nix | 55 | ||||
| -rw-r--r-- | os/srv/srv.nix | 4 | ||||
| -rw-r--r-- | os/srv/virtualization.nix (renamed from os/srv/kvm.nix) | 14 | ||||
| -rw-r--r-- | os/srv/zzz.nix | 19 | ||||
| -rw-r--r-- | os/wm/niri.nix | 2 |
9 files changed, 86 insertions, 51 deletions
diff --git a/os/core/storage.nix b/os/core/storage.nix index fde9399..59f0093 100644 --- a/os/core/storage.nix +++ b/os/core/storage.nix @@ -5,32 +5,15 @@ in { options.os.core.storage = { enable = lib.mkEnableOption "enables storage management"; - - cleanDates = lib.mkOption { - type = lib.types.str; - default = "weekly"; - description = "how often to clean the system of old generations"; - }; }; config = lib.mkIf cfg.enable { nix.settings.auto-optimise-store = true; - - programs.nh = { - enable = true; - clean = { - enable = true; - dates = "${toString cfg.cleanDates}"; - extraArgs = "--keep 5"; - }; - }; - + programs.nh.enable = true; services.fstrim.enable = true; - services.btrfs.autoScrub = { - enable = true; - fileSystems = [ "/" ]; + enable = true; + fileSystems = [ "/" ]; }; - boot.tmp = { useTmpfs = true; tmpfsSize = "50%"; diff --git a/os/srv/files.nix b/os/srv/files.nix index 2e8faff..b4130b0 100644 --- a/os/srv/files.nix +++ b/os/srv/files.nix @@ -1,10 +1,16 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.os.srv.files; in { options.os.srv.files = { thunar.enable = lib.mkEnableOption "enables the thunar file manager"; + krusader.enable = lib.mkEnableOption "enables krusader for easier file moving using ssh"; utils.enable = lib.mkEnableOption "enables compression and trash utilities"; }; config = lib.mkMerge [ @@ -27,6 +33,13 @@ in environment.systemPackages = with pkgs; [ file-roller ]; }) + (lib.mkIf cfg.krusader.enable { + environment.systemPackages = with pkgs; [ + krusader + kdePackages.kio-extras + ]; + }) + (lib.mkIf cfg.utils.enable { services.gvfs.enable = true; diff --git a/os/srv/gaming.nix b/os/srv/gaming.nix index 9ae0efe..9ac8c88 100644 --- a/os/srv/gaming.nix +++ b/os/srv/gaming.nix @@ -27,10 +27,9 @@ in }; environment.systemPackages = with pkgs; [ + protonplus openmw - protonup-rs heroic - clinfo (prismlauncher.override { additionalLibs = with pkgs; [ ocl-icd diff --git a/os/srv/kdeconnect.nix b/os/srv/kdeconnect.nix index 85bb23e..6bf125c 100644 --- a/os/srv/kdeconnect.nix +++ b/os/srv/kdeconnect.nix @@ -13,7 +13,7 @@ in programs.kdeconnect.enable = true; home-manager.users.${username}.services.kdeconnect = { enable = true; - indicator = true; + # indicator = true; }; }; } diff --git a/os/srv/monero.nix b/os/srv/monero.nix new file mode 100644 index 0000000..e09bc50 --- /dev/null +++ b/os/srv/monero.nix @@ -0,0 +1,55 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.os.srv.monero; + address = "82cAm7hTDr5EPjf9um4zQdYBhH4cxSRFZfzgN9St3jNt1N8ia2Qi6Yj4J5Bwe5aKNBM1fwsrRFkCZUqfHuiAHy11Qy7Z8aF"; +in +{ + options.os.srv.monero = { + enable = lib.mkEnableOption "enables the daemon and wallet"; + mining.enable = lib.mkEnableOption "enables mining monero"; + }; + + config = lib.mkMerge [ + (lib.mkIf cfg.enable { + services.monero = { + enable = true; + prune = true; + dataDir = "/home/monero"; + }; + environment.systemPackages = [ pkgs.monero-cli ]; + }) + (lib.mkIf cfg.mining.enable { + services.xmrig = { + enable = true; + settings = { + autosave = true; + cpu = true; + opencl = true; + pools = [ + { + url = "pool.supportxmr.com:443"; + user = "${address}"; + keepalive = true; + tls = true; + } + { + url = "xmr-eu1.nanopool.org:10343"; + user = "${address}"; + keepalive = true; + tls = true; + } + ]; + }; + }; + boot = { + kernel.sysctl."vm.nr_hugepages" = lib.mkDefault 1280; + initrd.kernelModules = [ "msr" ]; + }; + }) + ]; +} diff --git a/os/srv/srv.nix b/os/srv/srv.nix index d4b3eef..6109361 100644 --- a/os/srv/srv.nix +++ b/os/srv/srv.nix @@ -6,10 +6,10 @@ ./docker.nix ./files.nix ./gaming.nix - ./kvm.nix + ./virtualization.nix ./nix-helper.nix ./ollama.nix ./kdeconnect.nix - ./zzz.nix + ./monero.nix ]; } diff --git a/os/srv/kvm.nix b/os/srv/virtualization.nix index 93a1eed..f32737b 100644 --- a/os/srv/kvm.nix +++ b/os/srv/virtualization.nix @@ -1,18 +1,22 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let - cfg = config.os.srv.kvm; + cfg = config.os.srv.virtualization; in { - options.os.srv.kvm.enable = lib.mkEnableOption "KVM/QEMU virtualization with Virt-Manager"; + options.os.srv.virtualization.enable = + lib.mkEnableOption "KVM/QEMU virtualization with Virt-Manager"; config = lib.mkIf cfg.enable { virtualisation.libvirtd = { enable = true; qemu.package = pkgs.qemu_kvm; qemu.swtpm.enable = true; }; - systemd.services.libvirt-guests.enable = false; - programs.virt-manager.enable = true; boot.initrd.kernelModules = lib.optional (config.os.core.drivers.amd.enable or false) "kvm-amd"; diff --git a/os/srv/zzz.nix b/os/srv/zzz.nix deleted file mode 100644 index cd9a67e..0000000 --- a/os/srv/zzz.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ config, lib, pkgs, ... }: -let - cfg = config.os.srv.zzz; -in -{ - options.os.srv.zzz.enable = lib.mkEnableOption "enables the zzz rpc service"; - config = lib.mkIf cfg.enable { - systemd.user.services.zzz-presence = { - description = "Zenless Zone Zero Discord Rich Presence"; - wantedBy = [ "default.target" ]; - - serviceConfig = { - ExecStart = "${pkgs.python3.withPackages (ps: [ ps.pypresence ])}/bin/python3 /etc/nixos/resources/zzz.py"; - Restart = "always"; - RestartSec = "10"; - }; - }; - }; -} diff --git a/os/wm/niri.nix b/os/wm/niri.nix index 58d27af..587f543 100644 --- a/os/wm/niri.nix +++ b/os/wm/niri.nix @@ -19,7 +19,7 @@ in programs.niri = { enable = true; - package = pkgs.niri-unstable; + # package = pkgs.niri-unstable; }; os.srv.compat.enable = true; |