diff --git a/machines/Oracle-Cloud/default.nix b/machines/Oracle-Cloud/default.nix index fa4d86c..2cbfae0 100644 --- a/machines/Oracle-Cloud/default.nix +++ b/machines/Oracle-Cloud/default.nix @@ -1,7 +1,7 @@ { inputs, lib, ... }: { imports = [ ./hardware-configuration.nix - inputs.self.nixosRoles.desktop + inputs.self.nixosRoles.server ]; deviceSpecific.devInfo = { diff --git a/profiles/applications/kitty.nix b/profiles/applications/kitty.nix index c4afdf0..3e0a174 100644 --- a/profiles/applications/kitty.nix +++ b/profiles/applications/kitty.nix @@ -11,7 +11,7 @@ in with config.deviceSpecific; home-manager.users.alukard = { programs.kitty = { # enable = isLaptop || isDesktop; - enable = enable; + enable = true; font.name = "${thm.fonts.powerline.family} ${thm.fontSizes.small.str}"; # keybindings = '' # ''; diff --git a/profiles/applications/spotify.nix b/profiles/applications/spotify.nix index 5847c50..95e4699 100644 --- a/profiles/applications/spotify.nix +++ b/profiles/applications/spotify.nix @@ -37,7 +37,7 @@ in { }; config = mkMerge [ - (mkIf cfg.enable { + (lib.mkIf cfg.enable { systemd.user.services.spotifyd = { path = [ pkgs.zsh pkgs.pass-nodmenu ]; unitConfig = { diff --git a/profiles/workspace/locale.nix b/profiles/workspace/locale.nix index 4436811..2c927b9 100644 --- a/profiles/workspace/locale.nix +++ b/profiles/workspace/locale.nix @@ -11,9 +11,9 @@ LANG = lib.mkForce "en_GB.UTF-8"; }; - time.timeZone = mkIf (!config.deviceSpecific.isCloud) "Europe/Moscow"; + time.timeZone = lib.mkIf (!config.deviceSpecific.isCloud) "Europe/Moscow"; - location = mkIf (!config.deviceSpecific.isCloud) { + location = lib.mkIf (!config.deviceSpecific.isCloud) { provider = "manual"; latitude = 48.78583; longitude = 44.77973; diff --git a/profiles/workspace/zsh.nix b/profiles/workspace/zsh.nix index 6c0a56a..dc647a3 100644 --- a/profiles/workspace/zsh.nix +++ b/profiles/workspace/zsh.nix @@ -62,7 +62,7 @@ "ltree" = "exa -lhgFT@ --git"; "atree" = "exa -aT"; "latree" = "exa -lahgFT@ --git"; - "gif2webm" = "'(){ ${pkgs.ffmpeg.bin}/bin/ffmpeg -i $1 -c:v libvpx-vp9 -crf 20 -b:v 0 $1.webm ;}'"; + "gif2webm" = "(){ ${pkgs.ffmpeg.bin}/bin/ffmpeg -i $1 -c:v libvpx-vp9 -crf 20 -b:v 0 $1.webm ;}"; }; initExtra = ''