From deab8572cd4a648e12d962cbabb92c4dce798320 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 5 Jan 2024 22:37:54 +0100 Subject: [PATCH] update openrgb and add sftp storage --- flake.lock | 41 +++++++++++++++++++++++++----------- flake.nix | 4 ++++ modules/overlays/default.nix | 5 +++-- systems/kami/default.nix | 9 ++++++-- systems/kami/hardware.nix | 26 +++++++++++++++++++++++ 5 files changed, 69 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index f220db5..1dcf6d4 100644 --- a/flake.lock +++ b/flake.lock @@ -11,11 +11,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1704099878, - "narHash": "sha256-j+UPcv2d3DMkO3Jb3PBqEQ/oJwJzvY6em0azAP1VJg4=", + "lastModified": 1704310048, + "narHash": "sha256-eAxFGlZllel+viidYQsocPckbLp7xQD9jg3+vW5wx9I=", "owner": "rycee", "repo": "nur-expressions", - "rev": "8275e917db7b7cd3f6a29b4b455b29e16eb2eef5", + "rev": "4c479a9ab1b44668c5c0001f6cc447edf31603ef", "type": "gitlab" }, "original": { @@ -164,11 +164,11 @@ ] }, "locked": { - "lastModified": 1704100519, - "narHash": "sha256-SgZC3cxquvwTN07vrYYT9ZkfvuhS5Y1k1F4+AMsuflc=", + "lastModified": 1704311514, + "narHash": "sha256-j6JsfCv31bW7LzV06q2L/27QZ4k1Zq7lEq2AR9R150A=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e91c5df192395753d8e6d55a0352109cb559790", + "rev": "fcbc70a7ee064f2b65dc1fac1717ca2a9813bbe6", "type": "github" }, "original": { @@ -288,11 +288,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1704124233, - "narHash": "sha256-lBHs/yUtkcGgapHRS31oOb5NqvnVrikvktGOW8rK+sE=", + "lastModified": 1704266875, + "narHash": "sha256-luA5SGmeIRZlgLfSLUuR3eacS63q2bJ0Yywqak5lj3E=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f752581d6723a10da7dfe843e917a3b5e4d8115a", + "rev": "8e34f33464d77bea2d5cf7dc1066647b1ad2b324", "type": "github" }, "original": { @@ -367,6 +367,22 @@ "type": "github" } }, + "openrgb": { + "flake": false, + "locked": { + "lastModified": 1704295142, + "narHash": "sha256-FiaSbPQ007utdtrlP6f6WHZPXQfRBpcRjVfxvuo9C3Q=", + "owner": "CalcProgrammer1", + "repo": "OpenRGB", + "rev": "c54a268e1991e206f0db9fa7da695e90e6480a7e", + "type": "gitlab" + }, + "original": { + "owner": "CalcProgrammer1", + "repo": "OpenRGB", + "type": "gitlab" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -461,11 +477,11 @@ ] }, "locked": { - "lastModified": 1704194907, - "narHash": "sha256-auDvhr7o7z0axOlwBsHSx6np9eJNvpg2Nn5QW4oNGcU=", + "lastModified": 1704314598, + "narHash": "sha256-R1IPxMk7GnhkitkSjCqxFmIknsfAL6TCvmLZfOwxvaA=", "owner": "PrismLauncher", "repo": "PrismLauncher", - "rev": "0cf9b6537b055e85759a0b0ecb7d06338cb00478", + "rev": "57a589367f719d59748a0546e1bdc8b86e832d1f", "type": "github" }, "original": { @@ -490,6 +506,7 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", "nixpkgs-lib": "nixpkgs-lib", + "openrgb": "openrgb", "pre-commit-hooks": "pre-commit-hooks_2", "prism-game-options-patch": "prism-game-options-patch", "prismlauncher": "prismlauncher", diff --git a/flake.nix b/flake.nix index 2dccc47..753c253 100644 --- a/flake.nix +++ b/flake.nix @@ -31,6 +31,10 @@ url = "github:vinceliuice/Tela-icon-theme"; flake = false; }; + openrgb = { + url = "gitlab:CalcProgrammer1/OpenRGB"; + flake = false; + }; # Dependencys flake-parts = { diff --git a/modules/overlays/default.nix b/modules/overlays/default.nix index 06306b2..b8a1150 100644 --- a/modules/overlays/default.nix +++ b/modules/overlays/default.nix @@ -19,6 +19,9 @@ in { tela-icon-theme = super.tela-icon-theme.overrideAttrs (_old: { src = self.inputs.tela-icon-theme; }); + openrgb = super.openrgb.overrideAttrs + (_old: { src = self.inputs.openrgb; }); + prismlauncher = super.prismlauncher.overrideAttrs (old: { patches = (old.patches or [ ]) ++ [ self.inputs.prism-game-options-patch @@ -26,8 +29,6 @@ in { ]; }); - #noto-fonts-color-emoji = pkgs.noto-fonts-color-emoji_withExtraFlags; - libadwaita = super.libadwaita.overrideAttrs (old: { patches = (old.patches or [ ]) ++ [ ./adwaita-theming-support.patch ]; diff --git a/systems/kami/default.nix b/systems/kami/default.nix index cdb1e47..f3484ca 100644 --- a/systems/kami/default.nix +++ b/systems/kami/default.nix @@ -37,7 +37,11 @@ }; services = { - hardware.openrgb.enable = true; + hardware.openrgb = { + enable = true; + motherboard = "intel"; + package = pkgs.openrgb; + }; fwupd.enable = true; xserver = { videoDrivers = [ "nvidia" ]; @@ -84,6 +88,8 @@ discord element-desktop mumble + sshfs + # Theming catppuccin-kvantum @@ -95,7 +101,6 @@ programs = { dconf.enable = true; droidcam.enable = true; - sysdig.enable = false; xwayland.enable = true; kdeconnect.enable = true; gamemode.enable = true; diff --git a/systems/kami/hardware.nix b/systems/kami/hardware.nix index 8fd9c03..092e7f4 100644 --- a/systems/kami/hardware.nix +++ b/systems/kami/hardware.nix @@ -53,6 +53,32 @@ fsType = "ntfs"; options = [ "rw" "uid=1000" ]; }; + "/media/backup" = { + device = "u384346@u384346.your-storagebox.de:/"; + fsType = "fuse.sshfs"; + noCheck = true; + options = [ + "IdentityFile=/home/jopejoe1/.ssh/github" + "ServerAliveCountMax=3" + "ServerAliveInterval=15" + "_netdev" + "allow_other" + "default_permissions" + "exec" + "gid=100" + "idmap=user" + "noatime" + "noauto" + "reconnect" + "transform_symlinks" + "uid=1000" + "users" + "x-systemd.after=network-online.target" + "x-systemd.automount" + "x-systemd.mount-timeout=10s" + "x-systemd.requires=network-online.target" + ]; + }; #"/media/zfs" = { # device = "jopejoe1"; # fsType = "zfs";