diff --git a/flake.nix b/flake.nix index 9d4bc51..7872d56 100644 --- a/flake.nix +++ b/flake.nix @@ -49,6 +49,9 @@ unstable-packages nur.overlay ]; + # stylix compains if image is not set... + stylix.autoEnable = false; + stylix.image = ./yuyukowallpaper1809.png; }) home-manager-unstable.nixosModules.home-manager agenix.nixosModules.default @@ -58,6 +61,7 @@ specialArgs = specialArgs // { inherit inputs outputs; }; }; in { + packages.${system} = import ./pkgs { pkgs = nixpkgs-unstable.legacyPackages.${system}; }; overlays = import ./overlays.nix { inherit inputs; }; nixosConfigurations = { diff --git a/home-manager/zsh.nix b/home-manager/zsh.nix index 52caa40..aa082e7 100644 --- a/home-manager/zsh.nix +++ b/home-manager/zsh.nix @@ -18,6 +18,7 @@ updateFancy = "nh os switch"; updateOffline = "sudo nixos-rebuild switch --option substitute false"; goto = "cd $(find ~/projects -maxdepth 2 -type d | ${pkgs.fzf}/bin/fzf)"; + dev= "nix-shell --run zsh"; }; oh-my-zsh = { enable = true; diff --git a/modules/graphical/stylix.nix b/modules/graphical/stylix.nix index 2c35bbf..8841301 100644 --- a/modules/graphical/stylix.nix +++ b/modules/graphical/stylix.nix @@ -6,7 +6,7 @@ in { enable = mkEnableOption "Enables stylix"; image = mkOption { type = types.path; - default = ./yuyukowallpaper1809.png; + default = ../../yuyukowallpaper1809.png; description = '' The wallpaper to use. ''; @@ -34,6 +34,7 @@ in { let nerdfonts = pkgs.nerdfonts.override { fonts = [ "Hack" "Noto" ]; }; in mkIf cfg.enable { stylix = { + autoEnable = true; polarity = "dark"; image = cfg.image; override = cfg.override; diff --git a/modules/services/nginx.nix b/modules/services/nginx.nix index d641cfa..78b7b38 100644 --- a/modules/services/nginx.nix +++ b/modules/services/nginx.nix @@ -55,7 +55,7 @@ in # "192.168.0.6" # "localhost" ]; - root = pkgs.website; + root = pkgs.kop-website; forceSSL = cfg.https; enableACME = cfg.https; quic = cfg.https; diff --git a/pkgs/default.nix b/pkgs/default.nix index dcf23b7..0fe1874 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,6 +1,8 @@ -{pkgs, ...}: rec { +{ pkgs, ... }: rec { tetrio = pkgs.callPackage ./tetrio-desktop/package.nix { }; - hub = pkgs.callPackage ./hub/default.nix { }; + kop-hub = pkgs.callPackage ./hub/default.nix { }; ente-frontend = pkgs.callPackage ./ente-frontend/default.nix { }; - website = pkgs.callPackage ./website/default.nix { inherit hub ente-frontend; }; + kop-website = + pkgs.callPackage ./website/default.nix { inherit kop-hub ente-frontend; }; + kop-monitor = pkgs.callPackage ./monitor/default.nix { }; } diff --git a/pkgs/monitor/default.nix b/pkgs/monitor/default.nix new file mode 100644 index 0000000..9748564 --- /dev/null +++ b/pkgs/monitor/default.nix @@ -0,0 +1,20 @@ +{ rustPlatform +, lib +, pkgs +, ... +}: +rustPlatform.buildRustPackage { + pname = "kop-monitor"; + version = "1.0.0"; + + src = fetchGit { + url = "git@github.com:kropatz/monitor.git"; + ref = "master"; + rev = "0e460dd24f73e060acf9f16e84b45aea97781151"; + }; + + nativeBuildInputs = with pkgs; [ pkg-config ]; + buildInputs = with pkgs; [ openssl ]; + + cargoHash = "sha256-/bpxo5LUrdMJBzI6N4Dr+f7/pH6fE+fayzZW3CZ/lwA="; +} diff --git a/pkgs/website/default.nix b/pkgs/website/default.nix index 53930bb..68e8056 100644 --- a/pkgs/website/default.nix +++ b/pkgs/website/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildNpmPackage, fetchFromGitHub, hub, ente-frontend }: +{ stdenv, lib, buildNpmPackage, fetchFromGitHub, kop-hub, ente-frontend }: stdenv.mkDerivation (finalAttrs: { pname = "kopatz-website"; @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' mkdir -p $out/tracker-site - cp -r ${hub}/* $out + cp -r ${kop-hub}/* $out cp -r ${ente-frontend}/* $out/tracker-site ''; }) diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix index 553e7ce..db529b8 100644 --- a/systems/pc/configuration.nix +++ b/systems/pc/configuration.nix @@ -2,17 +2,26 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, lib, ... }: -{ - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ../../modules/flatpak.nix - ../../modules/gpg.nix - ../../modules/kernel.nix # use latest kernel - ../../modules/services/syncthing.nix - ../../modules/support/ntfs.nix - ]; +{ config, pkgs, lib, ... }: { + imports = [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ../../modules/flatpak.nix + ../../modules/gpg.nix + ../../modules/kernel.nix # use latest kernel + ../../modules/services/syncthing.nix + ../../modules/support/ntfs.nix + ]; + + #systemd.services.failtest = { + # enable = true; + # description = "Fail Test Service"; + # wantedBy = [ "multi-user.target" ]; + + # serviceConfig = { + # Type = "simple"; + # ExecStart = "${pkgs.coreutils}/bin/false"; + # }; + #}; custom = { tmpfs.enable = true; @@ -38,9 +47,7 @@ # enable = true; # server = [ "192.168.0.10" ]; #}; - misc = { - docker.enable = true; - }; + misc = { docker.enable = true; }; hardware = { nvidia.enable = true; firmware.enable = true; @@ -97,7 +104,7 @@ networking.networkmanager.enable = true; boot.initrd.systemd.network.wait-online.enable = false; systemd.network.wait-online.enable = false; - + services.nscd.enableNsncd = false; #disable firewall when doing ipv6 vm stuff #networking.firewall.enable = lib.mkForce false; @@ -136,18 +143,18 @@ # Allow unfree packages nixpkgs.config.allowUnfree = true; - security.pki.certificates = [ '' ------BEGIN CERTIFICATE----- -MIIBjTCCATKgAwIBAgIRAMVH2+JHZ3wm2fLUlKjTYDswCgYIKoZIzj0EAwIwJDEM -MAoGA1UEChMDS29wMRQwEgYDVQQDEwtLb3AgUm9vdCBDQTAeFw0yMzEyMDgxNDUx -MTZaFw0zMzEyMDUxNDUxMTZaMCQxDDAKBgNVBAoTA0tvcDEUMBIGA1UEAxMLS29w -IFJvb3QgQ0EwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATdZBOkNynShXipzhuX -f6dUByD3chNupNWsagYC5AlPRJT9fAeHEIK/bxWkFwRtLBDopWvBu9lHahBgpHc7 -y7rTo0UwQzAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBATAdBgNV -HQ4EFgQU9AVtwipW5HDBLfZRH1KZCnIKCfowCgYIKoZIzj0EAwIDSQAwRgIhAMHj -AipNdhQKIYPvMt/h1uW4xP3NTkitnmshM09+rIasAiEAlSalGddXDkqJBHhPD+Fr -gpuVkfVkA8gQCXNs5F9TnxA= ------END CERTIFICATE----- + security.pki.certificates = ['' + -----BEGIN CERTIFICATE----- + MIIBjTCCATKgAwIBAgIRAMVH2+JHZ3wm2fLUlKjTYDswCgYIKoZIzj0EAwIwJDEM + MAoGA1UEChMDS29wMRQwEgYDVQQDEwtLb3AgUm9vdCBDQTAeFw0yMzEyMDgxNDUx + MTZaFw0zMzEyMDUxNDUxMTZaMCQxDDAKBgNVBAoTA0tvcDEUMBIGA1UEAxMLS29w + IFJvb3QgQ0EwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATdZBOkNynShXipzhuX + f6dUByD3chNupNWsagYC5AlPRJT9fAeHEIK/bxWkFwRtLBDopWvBu9lHahBgpHc7 + y7rTo0UwQzAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBATAdBgNV + HQ4EFgQU9AVtwipW5HDBLfZRH1KZCnIKCfowCgYIKoZIzj0EAwIDSQAwRgIhAMHj + AipNdhQKIYPvMt/h1uW4xP3NTkitnmshM09+rIasAiEAlSalGddXDkqJBHhPD+Fr + gpuVkfVkA8gQCXNs5F9TnxA= + -----END CERTIFICATE----- '']; # This value determines the NixOS release from which the default diff --git a/modules/graphical/yuyukowallpaper1809.png b/yuyukowallpaper1809.png similarity index 100% rename from modules/graphical/yuyukowallpaper1809.png rename to yuyukowallpaper1809.png