diff --git a/flake.nix b/flake.nix index c19d583..4421290 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,7 @@ outputs = inputs: let system = "x86_64-linux"; - pkgs = import inputs.nixpkgs { inherit system; }; + pkgs = import inputs.nixpkgs {inherit system;}; user = "tristan"; userFullname = "Tristan Beedell"; auto-login = import ./nixos/programs/auto-login.nix; diff --git a/home/desktop/hyprland/default.nix b/home/desktop/hyprland/default.nix index 021f539..9402090 100644 --- a/home/desktop/hyprland/default.nix +++ b/home/desktop/hyprland/default.nix @@ -184,7 +184,7 @@ in { device { name = zsa-technology-labs-moonlander-mark-i - kb_variant = + kb_variant = kb_options = esperanto:qwerty,lv3:ralt_switch } ''; diff --git a/home/programs/xr.nix b/home/programs/xr.nix index 93a9824..4cab3a7 100644 --- a/home/programs/xr.nix +++ b/home/programs/xr.nix @@ -1,4 +1,7 @@ -{pkgs, config, ...}: { +{ + pkgs, + ... +}: { home.packages = with pkgs; [ monado ]; @@ -26,5 +29,4 @@ # } # ''; # }; - } diff --git a/nixos/services/nextcloud.nix b/nixos/services/nextcloud.nix index eb6050e..0417b08 100644 --- a/nixos/services/nextcloud.nix +++ b/nixos/services/nextcloud.nix @@ -68,8 +68,17 @@ in { datadirectory = "/mnt/storage/nextcloud"; }; extraApps = { - inherit (config.services.nextcloud.package.packages.apps) - contacts calendar mail gpoddersync memories notes maps previewgenerator; + inherit + (config.services.nextcloud.package.packages.apps) + contacts + calendar + mail + gpoddersync + memories + notes + maps + previewgenerator + ; oidc_login = pkgs.fetchNextcloudApp { sha256 = "sha256-cN5azlThKPKRVip14yfUNR85of5z+N6NVI7sg6pSGQI="; url = "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v3.0.2/oidc_login.tar.gz"; diff --git a/nixos/workstation.nix b/nixos/workstation.nix index 11c92e4..fd6c9ea 100644 --- a/nixos/workstation.nix +++ b/nixos/workstation.nix @@ -1,12 +1,8 @@ { inputs, - config, pkgs, - lib, ... -}: let - user = config.user; -in { +}: { imports = [ inputs.stylix.nixosModules.stylix ]; @@ -58,6 +54,11 @@ in { hardware.bluetooth.enable = true; services.blueman.enable = true; + networking.stevenblack = { + enable = true; + block = ["porn" "gambling"]; + }; + stylix = { image = ../images/nix-soft.png; base16Scheme = "${pkgs.base16-schemes}/share/themes/onedark.yaml";